diff --git a/.github/workflows/ios.testflight.yml b/.github/workflows/ios.testflight.yml
index b8fac04b6..fdfc31b4c 100644
--- a/.github/workflows/ios.testflight.yml
+++ b/.github/workflows/ios.testflight.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Select Xcode 26
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.0"
+          xcode-version: "26"
       - name: Export version from package.json
         run:
           echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
diff --git a/.github/workflows/mobile.release.prod.yml b/.github/workflows/mobile.release.prod.yml
index eb662a7c2..57a683169 100644
--- a/.github/workflows/mobile.release.prod.yml
+++ b/.github/workflows/mobile.release.prod.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Select Xcode 26
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "26.0"
+          xcode-version: "26"
       - name: Export version from package.json
         run:
           echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
diff --git a/.yarn/cache/@lexical-clipboard-npm-0.38.1-d8b1f4e445-d56bd0b5db.zip b/.yarn/cache/@lexical-clipboard-npm-0.38.1-d8b1f4e445-d56bd0b5db.zip
deleted file mode 100644
index d7e84e20c..000000000
Binary files a/.yarn/cache/@lexical-clipboard-npm-0.38.1-d8b1f4e445-d56bd0b5db.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-clipboard-npm-0.43.0-ae34976253-9b404ea0e9.zip b/.yarn/cache/@lexical-clipboard-npm-0.43.0-ae34976253-9b404ea0e9.zip
new file mode 100644
index 000000000..d27d5364c
Binary files /dev/null and b/.yarn/cache/@lexical-clipboard-npm-0.43.0-ae34976253-9b404ea0e9.zip differ
diff --git a/.yarn/cache/@lexical-code-core-npm-0.43.0-fa460b0d8f-a63d105158.zip b/.yarn/cache/@lexical-code-core-npm-0.43.0-fa460b0d8f-a63d105158.zip
new file mode 100644
index 000000000..85b7c89e1
Binary files /dev/null and b/.yarn/cache/@lexical-code-core-npm-0.43.0-fa460b0d8f-a63d105158.zip differ
diff --git a/.yarn/cache/@lexical-code-npm-0.38.1-bcca5107b9-7d2273bb05.zip b/.yarn/cache/@lexical-code-npm-0.38.1-bcca5107b9-7d2273bb05.zip
deleted file mode 100644
index 0061b26e2..000000000
Binary files a/.yarn/cache/@lexical-code-npm-0.38.1-bcca5107b9-7d2273bb05.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-code-npm-0.43.0-3412bcee0b-f756ff54db.zip b/.yarn/cache/@lexical-code-npm-0.43.0-3412bcee0b-f756ff54db.zip
new file mode 100644
index 000000000..48b39dd3b
Binary files /dev/null and b/.yarn/cache/@lexical-code-npm-0.43.0-3412bcee0b-f756ff54db.zip differ
diff --git a/.yarn/cache/@lexical-code-prism-npm-0.43.0-60cc0bbea2-c8fcbd2541.zip b/.yarn/cache/@lexical-code-prism-npm-0.43.0-60cc0bbea2-c8fcbd2541.zip
new file mode 100644
index 000000000..dcd0cb769
Binary files /dev/null and b/.yarn/cache/@lexical-code-prism-npm-0.43.0-60cc0bbea2-c8fcbd2541.zip differ
diff --git a/.yarn/cache/@lexical-devtools-core-npm-0.38.1-5706254649-00ed9e4c9b.zip b/.yarn/cache/@lexical-devtools-core-npm-0.38.1-5706254649-00ed9e4c9b.zip
deleted file mode 100644
index 862ac6b01..000000000
Binary files a/.yarn/cache/@lexical-devtools-core-npm-0.38.1-5706254649-00ed9e4c9b.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-devtools-core-npm-0.43.0-f9610c73bb-0728d7bc4e.zip b/.yarn/cache/@lexical-devtools-core-npm-0.43.0-f9610c73bb-0728d7bc4e.zip
new file mode 100644
index 000000000..ab0a07f29
Binary files /dev/null and b/.yarn/cache/@lexical-devtools-core-npm-0.43.0-f9610c73bb-0728d7bc4e.zip differ
diff --git a/.yarn/cache/@lexical-dragon-npm-0.38.1-483ccfe64f-1771dc711d.zip b/.yarn/cache/@lexical-dragon-npm-0.43.0-a297a8c327-0d1578c21f.zip
similarity index 93%
rename from .yarn/cache/@lexical-dragon-npm-0.38.1-483ccfe64f-1771dc711d.zip
rename to .yarn/cache/@lexical-dragon-npm-0.43.0-a297a8c327-0d1578c21f.zip
index 8bc68b6bc..b1316bb56 100644
Binary files a/.yarn/cache/@lexical-dragon-npm-0.38.1-483ccfe64f-1771dc711d.zip and b/.yarn/cache/@lexical-dragon-npm-0.43.0-a297a8c327-0d1578c21f.zip differ
diff --git a/.yarn/cache/@lexical-extension-npm-0.38.1-68b14b30a1-36a2d22ee5.zip b/.yarn/cache/@lexical-extension-npm-0.38.1-68b14b30a1-36a2d22ee5.zip
deleted file mode 100644
index f93a18bc7..000000000
Binary files a/.yarn/cache/@lexical-extension-npm-0.38.1-68b14b30a1-36a2d22ee5.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-extension-npm-0.43.0-964e94ae06-0097934286.zip b/.yarn/cache/@lexical-extension-npm-0.43.0-964e94ae06-0097934286.zip
new file mode 100644
index 000000000..5bb9abeea
Binary files /dev/null and b/.yarn/cache/@lexical-extension-npm-0.43.0-964e94ae06-0097934286.zip differ
diff --git a/.yarn/cache/@lexical-hashtag-npm-0.38.1-0b8ffe2b43-4976559218.zip b/.yarn/cache/@lexical-hashtag-npm-0.43.0-a065db279d-2762215fd8.zip
similarity index 56%
rename from .yarn/cache/@lexical-hashtag-npm-0.38.1-0b8ffe2b43-4976559218.zip
rename to .yarn/cache/@lexical-hashtag-npm-0.43.0-a065db279d-2762215fd8.zip
index 97d8890c3..57cad1813 100644
Binary files a/.yarn/cache/@lexical-hashtag-npm-0.38.1-0b8ffe2b43-4976559218.zip and b/.yarn/cache/@lexical-hashtag-npm-0.43.0-a065db279d-2762215fd8.zip differ
diff --git a/.yarn/cache/@lexical-headless-npm-0.38.1-c95092faa6-994a1e3750.zip b/.yarn/cache/@lexical-headless-npm-0.43.0-56c4e37762-87fca41717.zip
similarity index 58%
rename from .yarn/cache/@lexical-headless-npm-0.38.1-c95092faa6-994a1e3750.zip
rename to .yarn/cache/@lexical-headless-npm-0.43.0-56c4e37762-87fca41717.zip
index ed595a7a1..620cc0873 100644
Binary files a/.yarn/cache/@lexical-headless-npm-0.38.1-c95092faa6-994a1e3750.zip and b/.yarn/cache/@lexical-headless-npm-0.43.0-56c4e37762-87fca41717.zip differ
diff --git a/.yarn/cache/@lexical-history-npm-0.38.1-f57702de2b-12fe92f722.zip b/.yarn/cache/@lexical-history-npm-0.38.1-f57702de2b-12fe92f722.zip
deleted file mode 100644
index 5053db0c4..000000000
Binary files a/.yarn/cache/@lexical-history-npm-0.38.1-f57702de2b-12fe92f722.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-history-npm-0.43.0-7ee50eb7ca-13ebbf8ddd.zip b/.yarn/cache/@lexical-history-npm-0.43.0-7ee50eb7ca-13ebbf8ddd.zip
new file mode 100644
index 000000000..3339749c7
Binary files /dev/null and b/.yarn/cache/@lexical-history-npm-0.43.0-7ee50eb7ca-13ebbf8ddd.zip differ
diff --git a/.yarn/cache/@lexical-html-npm-0.38.1-bcdd5e6b7a-effeae00d2.zip b/.yarn/cache/@lexical-html-npm-0.43.0-48e3433ea7-d62a738fff.zip
similarity index 91%
rename from .yarn/cache/@lexical-html-npm-0.38.1-bcdd5e6b7a-effeae00d2.zip
rename to .yarn/cache/@lexical-html-npm-0.43.0-48e3433ea7-d62a738fff.zip
index eeed0a100..d7e6c870d 100644
Binary files a/.yarn/cache/@lexical-html-npm-0.38.1-bcdd5e6b7a-effeae00d2.zip and b/.yarn/cache/@lexical-html-npm-0.43.0-48e3433ea7-d62a738fff.zip differ
diff --git a/.yarn/cache/@lexical-link-npm-0.38.1-0dfa5a6ba1-18ffad2fe8.zip b/.yarn/cache/@lexical-link-npm-0.38.1-0dfa5a6ba1-18ffad2fe8.zip
deleted file mode 100644
index 2719c4dcc..000000000
Binary files a/.yarn/cache/@lexical-link-npm-0.38.1-0dfa5a6ba1-18ffad2fe8.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-link-npm-0.43.0-23774ea266-ff6db3c073.zip b/.yarn/cache/@lexical-link-npm-0.43.0-23774ea266-ff6db3c073.zip
new file mode 100644
index 000000000..61f1fd85f
Binary files /dev/null and b/.yarn/cache/@lexical-link-npm-0.43.0-23774ea266-ff6db3c073.zip differ
diff --git a/.yarn/cache/@lexical-list-npm-0.38.1-c17b749323-d2b288d3a4.zip b/.yarn/cache/@lexical-list-npm-0.38.1-c17b749323-d2b288d3a4.zip
deleted file mode 100644
index f04f5b382..000000000
Binary files a/.yarn/cache/@lexical-list-npm-0.38.1-c17b749323-d2b288d3a4.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-list-npm-0.43.0-be43938741-00193c83c2.zip b/.yarn/cache/@lexical-list-npm-0.43.0-be43938741-00193c83c2.zip
new file mode 100644
index 000000000..bc0dc15c7
Binary files /dev/null and b/.yarn/cache/@lexical-list-npm-0.43.0-be43938741-00193c83c2.zip differ
diff --git a/.yarn/cache/@lexical-mark-npm-0.38.1-be98b22665-3ec0f37e9a.zip b/.yarn/cache/@lexical-mark-npm-0.38.1-be98b22665-3ec0f37e9a.zip
deleted file mode 100644
index d815b507a..000000000
Binary files a/.yarn/cache/@lexical-mark-npm-0.38.1-be98b22665-3ec0f37e9a.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-mark-npm-0.43.0-f0235bef36-d3beaa250f.zip b/.yarn/cache/@lexical-mark-npm-0.43.0-f0235bef36-d3beaa250f.zip
new file mode 100644
index 000000000..d3f3e9c6d
Binary files /dev/null and b/.yarn/cache/@lexical-mark-npm-0.43.0-f0235bef36-d3beaa250f.zip differ
diff --git a/.yarn/cache/@lexical-markdown-npm-0.38.1-56dd7e2c50-9aab4eb6e9.zip b/.yarn/cache/@lexical-markdown-npm-0.38.1-56dd7e2c50-9aab4eb6e9.zip
deleted file mode 100644
index 2d3908392..000000000
Binary files a/.yarn/cache/@lexical-markdown-npm-0.38.1-56dd7e2c50-9aab4eb6e9.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-markdown-npm-0.43.0-426a72db47-2dbcbf2989.zip b/.yarn/cache/@lexical-markdown-npm-0.43.0-426a72db47-2dbcbf2989.zip
new file mode 100644
index 000000000..d7b7f6580
Binary files /dev/null and b/.yarn/cache/@lexical-markdown-npm-0.43.0-426a72db47-2dbcbf2989.zip differ
diff --git a/.yarn/cache/@lexical-offset-npm-0.38.1-e5622a3bc4-bf397bc3db.zip b/.yarn/cache/@lexical-offset-npm-0.43.0-c5b9f6c804-b4a11fd783.zip
similarity index 92%
rename from .yarn/cache/@lexical-offset-npm-0.38.1-e5622a3bc4-bf397bc3db.zip
rename to .yarn/cache/@lexical-offset-npm-0.43.0-c5b9f6c804-b4a11fd783.zip
index b507ee231..f774fbee5 100644
Binary files a/.yarn/cache/@lexical-offset-npm-0.38.1-e5622a3bc4-bf397bc3db.zip and b/.yarn/cache/@lexical-offset-npm-0.43.0-c5b9f6c804-b4a11fd783.zip differ
diff --git a/.yarn/cache/@lexical-overflow-npm-0.38.1-e0de8c7a60-3812795f83.zip b/.yarn/cache/@lexical-overflow-npm-0.38.1-e0de8c7a60-3812795f83.zip
deleted file mode 100644
index 73fbdcc07..000000000
Binary files a/.yarn/cache/@lexical-overflow-npm-0.38.1-e0de8c7a60-3812795f83.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-overflow-npm-0.43.0-5b4b967c61-4ac442c4af.zip b/.yarn/cache/@lexical-overflow-npm-0.43.0-5b4b967c61-4ac442c4af.zip
new file mode 100644
index 000000000..7518e6613
Binary files /dev/null and b/.yarn/cache/@lexical-overflow-npm-0.43.0-5b4b967c61-4ac442c4af.zip differ
diff --git a/.yarn/cache/@lexical-plain-text-npm-0.38.1-5dd2b5b300-4e2d79ced9.zip b/.yarn/cache/@lexical-plain-text-npm-0.38.1-5dd2b5b300-4e2d79ced9.zip
deleted file mode 100644
index b8d3b6323..000000000
Binary files a/.yarn/cache/@lexical-plain-text-npm-0.38.1-5dd2b5b300-4e2d79ced9.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-plain-text-npm-0.43.0-570131dbe1-855460a77a.zip b/.yarn/cache/@lexical-plain-text-npm-0.43.0-570131dbe1-855460a77a.zip
new file mode 100644
index 000000000..5c69bb10a
Binary files /dev/null and b/.yarn/cache/@lexical-plain-text-npm-0.43.0-570131dbe1-855460a77a.zip differ
diff --git a/.yarn/cache/@lexical-react-npm-0.38.1-7926fed74c-a9488dc3f2.zip b/.yarn/cache/@lexical-react-npm-0.38.1-7926fed74c-a9488dc3f2.zip
deleted file mode 100644
index e6beb1ec0..000000000
Binary files a/.yarn/cache/@lexical-react-npm-0.38.1-7926fed74c-a9488dc3f2.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-react-npm-0.43.0-560698beb3-ea9fd24fbc.zip b/.yarn/cache/@lexical-react-npm-0.43.0-560698beb3-ea9fd24fbc.zip
new file mode 100644
index 000000000..58cce633a
Binary files /dev/null and b/.yarn/cache/@lexical-react-npm-0.43.0-560698beb3-ea9fd24fbc.zip differ
diff --git a/.yarn/cache/@lexical-rich-text-npm-0.38.1-7afcc3c269-b8d2218d5a.zip b/.yarn/cache/@lexical-rich-text-npm-0.38.1-7afcc3c269-b8d2218d5a.zip
deleted file mode 100644
index 9445ccf6c..000000000
Binary files a/.yarn/cache/@lexical-rich-text-npm-0.38.1-7afcc3c269-b8d2218d5a.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-rich-text-npm-0.43.0-b9c388a84c-89b5c3ef33.zip b/.yarn/cache/@lexical-rich-text-npm-0.43.0-b9c388a84c-89b5c3ef33.zip
new file mode 100644
index 000000000..486b47190
Binary files /dev/null and b/.yarn/cache/@lexical-rich-text-npm-0.43.0-b9c388a84c-89b5c3ef33.zip differ
diff --git a/.yarn/cache/@lexical-selection-npm-0.38.1-1ebdbc83db-7e585e9149.zip b/.yarn/cache/@lexical-selection-npm-0.38.1-1ebdbc83db-7e585e9149.zip
deleted file mode 100644
index 2c210b212..000000000
Binary files a/.yarn/cache/@lexical-selection-npm-0.38.1-1ebdbc83db-7e585e9149.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-selection-npm-0.43.0-980812d4c4-20a0896ffe.zip b/.yarn/cache/@lexical-selection-npm-0.43.0-980812d4c4-20a0896ffe.zip
new file mode 100644
index 000000000..0c852042e
Binary files /dev/null and b/.yarn/cache/@lexical-selection-npm-0.43.0-980812d4c4-20a0896ffe.zip differ
diff --git a/.yarn/cache/@lexical-table-npm-0.38.1-6dd61da93e-9ea4a6bee5.zip b/.yarn/cache/@lexical-table-npm-0.38.1-6dd61da93e-9ea4a6bee5.zip
deleted file mode 100644
index 2c9e4e22a..000000000
Binary files a/.yarn/cache/@lexical-table-npm-0.38.1-6dd61da93e-9ea4a6bee5.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-table-npm-0.43.0-7dfaa8c3a5-0b5a658978.zip b/.yarn/cache/@lexical-table-npm-0.43.0-7dfaa8c3a5-0b5a658978.zip
new file mode 100644
index 000000000..93f34c545
Binary files /dev/null and b/.yarn/cache/@lexical-table-npm-0.43.0-7dfaa8c3a5-0b5a658978.zip differ
diff --git a/.yarn/cache/@lexical-text-npm-0.38.1-dfcd229c93-abb9ff9045.zip b/.yarn/cache/@lexical-text-npm-0.38.1-dfcd229c93-abb9ff9045.zip
deleted file mode 100644
index d58a88475..000000000
Binary files a/.yarn/cache/@lexical-text-npm-0.38.1-dfcd229c93-abb9ff9045.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-text-npm-0.43.0-129e0e395c-d767454053.zip b/.yarn/cache/@lexical-text-npm-0.43.0-129e0e395c-d767454053.zip
new file mode 100644
index 000000000..194b1514a
Binary files /dev/null and b/.yarn/cache/@lexical-text-npm-0.43.0-129e0e395c-d767454053.zip differ
diff --git a/.yarn/cache/@lexical-utils-npm-0.38.1-71c1450f0f-121c1f2d4a.zip b/.yarn/cache/@lexical-utils-npm-0.38.1-71c1450f0f-121c1f2d4a.zip
deleted file mode 100644
index e022fa91c..000000000
Binary files a/.yarn/cache/@lexical-utils-npm-0.38.1-71c1450f0f-121c1f2d4a.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-utils-npm-0.43.0-65a3f77e53-d16c043582.zip b/.yarn/cache/@lexical-utils-npm-0.43.0-65a3f77e53-d16c043582.zip
new file mode 100644
index 000000000..d88dadd69
Binary files /dev/null and b/.yarn/cache/@lexical-utils-npm-0.43.0-65a3f77e53-d16c043582.zip differ
diff --git a/.yarn/cache/@lexical-yjs-npm-0.38.1-0040cc11a9-fb9ab146ba.zip b/.yarn/cache/@lexical-yjs-npm-0.38.1-0040cc11a9-fb9ab146ba.zip
deleted file mode 100644
index 33a278f7a..000000000
Binary files a/.yarn/cache/@lexical-yjs-npm-0.38.1-0040cc11a9-fb9ab146ba.zip and /dev/null differ
diff --git a/.yarn/cache/@lexical-yjs-npm-0.43.0-d94172a7ca-b28f15eed2.zip b/.yarn/cache/@lexical-yjs-npm-0.43.0-d94172a7ca-b28f15eed2.zip
new file mode 100644
index 000000000..0087c15fc
Binary files /dev/null and b/.yarn/cache/@lexical-yjs-npm-0.43.0-d94172a7ca-b28f15eed2.zip differ
diff --git a/.yarn/cache/@noble-ciphers-npm-1.3.0-73a7db337f-19722c3547.zip b/.yarn/cache/@noble-ciphers-npm-1.3.0-73a7db337f-19722c3547.zip
new file mode 100644
index 000000000..f788f1d69
Binary files /dev/null and b/.yarn/cache/@noble-ciphers-npm-1.3.0-73a7db337f-19722c3547.zip differ
diff --git a/.yarn/cache/@noble-hashes-npm-1.8.0-a397449e64-c94e98b941.zip b/.yarn/cache/@noble-hashes-npm-1.8.0-a397449e64-c94e98b941.zip
new file mode 100644
index 000000000..43023c476
Binary files /dev/null and b/.yarn/cache/@noble-hashes-npm-1.8.0-a397449e64-c94e98b941.zip differ
diff --git a/.yarn/cache/@preact-signals-core-npm-1.12.1-a218932129-55719713dc.zip b/.yarn/cache/@preact-signals-core-npm-1.12.1-a218932129-55719713dc.zip
deleted file mode 100644
index 9e9a8dd22..000000000
Binary files a/.yarn/cache/@preact-signals-core-npm-1.12.1-a218932129-55719713dc.zip and /dev/null differ
diff --git a/.yarn/cache/@preact-signals-core-npm-1.14.1-5a87932a62-796c718f4d.zip b/.yarn/cache/@preact-signals-core-npm-1.14.1-5a87932a62-796c718f4d.zip
new file mode 100644
index 000000000..cf5eaee65
Binary files /dev/null and b/.yarn/cache/@preact-signals-core-npm-1.14.1-5a87932a62-796c718f4d.zip differ
diff --git a/.yarn/cache/@react-pdf-fns-npm-3.1.2-5b68a05f5c-4e8cdd32f2.zip b/.yarn/cache/@react-pdf-fns-npm-3.1.2-5b68a05f5c-4e8cdd32f2.zip
deleted file mode 100644
index 755e83d5d..000000000
Binary files a/.yarn/cache/@react-pdf-fns-npm-3.1.2-5b68a05f5c-4e8cdd32f2.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-fns-npm-3.1.3-c3350c5dc0-0cd27ef6cd.zip b/.yarn/cache/@react-pdf-fns-npm-3.1.3-c3350c5dc0-0cd27ef6cd.zip
new file mode 100644
index 000000000..8bc638880
Binary files /dev/null and b/.yarn/cache/@react-pdf-fns-npm-3.1.3-c3350c5dc0-0cd27ef6cd.zip differ
diff --git a/.yarn/cache/@react-pdf-font-npm-4.0.3-a46a328086-933e451381.zip b/.yarn/cache/@react-pdf-font-npm-4.0.3-a46a328086-933e451381.zip
deleted file mode 100644
index ffd8bc2bc..000000000
Binary files a/.yarn/cache/@react-pdf-font-npm-4.0.3-a46a328086-933e451381.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-font-npm-4.0.8-9024a8179e-8343c363ea.zip b/.yarn/cache/@react-pdf-font-npm-4.0.8-9024a8179e-8343c363ea.zip
new file mode 100644
index 000000000..752bf76b6
Binary files /dev/null and b/.yarn/cache/@react-pdf-font-npm-4.0.8-9024a8179e-8343c363ea.zip differ
diff --git a/.yarn/cache/@react-pdf-image-npm-3.0.3-9bc75136a5-893ebef74d.zip b/.yarn/cache/@react-pdf-image-npm-3.0.3-9bc75136a5-893ebef74d.zip
deleted file mode 100644
index 830b611aa..000000000
Binary files a/.yarn/cache/@react-pdf-image-npm-3.0.3-9bc75136a5-893ebef74d.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-image-npm-3.1.0-0bd9bba15e-7054b84ada.zip b/.yarn/cache/@react-pdf-image-npm-3.1.0-0bd9bba15e-7054b84ada.zip
new file mode 100644
index 000000000..be406e262
Binary files /dev/null and b/.yarn/cache/@react-pdf-image-npm-3.1.0-0bd9bba15e-7054b84ada.zip differ
diff --git a/.yarn/cache/@react-pdf-layout-npm-4.4.1-8639686b1e-5d7baa7f92.zip b/.yarn/cache/@react-pdf-layout-npm-4.4.1-8639686b1e-5d7baa7f92.zip
deleted file mode 100644
index 6626ca0dd..000000000
Binary files a/.yarn/cache/@react-pdf-layout-npm-4.4.1-8639686b1e-5d7baa7f92.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-layout-npm-4.6.1-b12fdb71f4-83ed94e0d0.zip b/.yarn/cache/@react-pdf-layout-npm-4.6.1-b12fdb71f4-83ed94e0d0.zip
new file mode 100644
index 000000000..2c8d3e239
Binary files /dev/null and b/.yarn/cache/@react-pdf-layout-npm-4.6.1-b12fdb71f4-83ed94e0d0.zip differ
diff --git a/.yarn/cache/@react-pdf-pdfkit-npm-4.0.4-c8d40f5e0b-706cf5bc03.zip b/.yarn/cache/@react-pdf-pdfkit-npm-4.0.4-c8d40f5e0b-706cf5bc03.zip
deleted file mode 100644
index 17615810d..000000000
Binary files a/.yarn/cache/@react-pdf-pdfkit-npm-4.0.4-c8d40f5e0b-706cf5bc03.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-pdfkit-npm-5.1.1-b05712b991-157af7e765.zip b/.yarn/cache/@react-pdf-pdfkit-npm-5.1.1-b05712b991-157af7e765.zip
new file mode 100644
index 000000000..9cd81eeea
Binary files /dev/null and b/.yarn/cache/@react-pdf-pdfkit-npm-5.1.1-b05712b991-157af7e765.zip differ
diff --git a/.yarn/cache/@react-pdf-png-js-npm-3.0.0-17565fff9e-90c1612d75.zip b/.yarn/cache/@react-pdf-png-js-npm-3.0.0-17565fff9e-90c1612d75.zip
deleted file mode 100644
index ffcd4083a..000000000
Binary files a/.yarn/cache/@react-pdf-png-js-npm-3.0.0-17565fff9e-90c1612d75.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-primitives-npm-4.1.1-80eed5afd4-adadff1996.zip b/.yarn/cache/@react-pdf-primitives-npm-4.1.1-80eed5afd4-adadff1996.zip
deleted file mode 100644
index ee5f1e0a8..000000000
Binary files a/.yarn/cache/@react-pdf-primitives-npm-4.1.1-80eed5afd4-adadff1996.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-primitives-npm-4.3.0-75975d0ee7-391f48e09a.zip b/.yarn/cache/@react-pdf-primitives-npm-4.3.0-75975d0ee7-391f48e09a.zip
new file mode 100644
index 000000000..f9b0923a8
Binary files /dev/null and b/.yarn/cache/@react-pdf-primitives-npm-4.3.0-75975d0ee7-391f48e09a.zip differ
diff --git a/.yarn/cache/@react-pdf-reconciler-npm-1.1.4-0a87628369-d920898a1c.zip b/.yarn/cache/@react-pdf-reconciler-npm-1.1.4-0a87628369-d920898a1c.zip
deleted file mode 100644
index cc19ec267..000000000
Binary files a/.yarn/cache/@react-pdf-reconciler-npm-1.1.4-0a87628369-d920898a1c.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-reconciler-npm-2.0.0-00957b9834-249df947f0.zip b/.yarn/cache/@react-pdf-reconciler-npm-2.0.0-00957b9834-249df947f0.zip
new file mode 100644
index 000000000..19a79bdb5
Binary files /dev/null and b/.yarn/cache/@react-pdf-reconciler-npm-2.0.0-00957b9834-249df947f0.zip differ
diff --git a/.yarn/cache/@react-pdf-render-npm-4.3.1-27f48b54c0-2dfea722c1.zip b/.yarn/cache/@react-pdf-render-npm-4.3.1-27f48b54c0-2dfea722c1.zip
deleted file mode 100644
index bb655d452..000000000
Binary files a/.yarn/cache/@react-pdf-render-npm-4.3.1-27f48b54c0-2dfea722c1.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-render-npm-4.5.1-d592ded218-2ece333774.zip b/.yarn/cache/@react-pdf-render-npm-4.5.1-d592ded218-2ece333774.zip
new file mode 100644
index 000000000..a9d2dd6ee
Binary files /dev/null and b/.yarn/cache/@react-pdf-render-npm-4.5.1-d592ded218-2ece333774.zip differ
diff --git a/.yarn/cache/@react-pdf-renderer-npm-4.3.1-2c58b5a4d3-0e9e2d9b30.zip b/.yarn/cache/@react-pdf-renderer-npm-4.3.1-2c58b5a4d3-0e9e2d9b30.zip
deleted file mode 100644
index 77b8cebeb..000000000
Binary files a/.yarn/cache/@react-pdf-renderer-npm-4.3.1-2c58b5a4d3-0e9e2d9b30.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-renderer-npm-4.5.1-ab299db753-55046bcba4.zip b/.yarn/cache/@react-pdf-renderer-npm-4.5.1-ab299db753-55046bcba4.zip
new file mode 100644
index 000000000..9b43108d1
Binary files /dev/null and b/.yarn/cache/@react-pdf-renderer-npm-4.5.1-ab299db753-55046bcba4.zip differ
diff --git a/.yarn/cache/@react-pdf-stylesheet-npm-6.1.1-de82babf5a-129d5e01ec.zip b/.yarn/cache/@react-pdf-stylesheet-npm-6.1.1-de82babf5a-129d5e01ec.zip
deleted file mode 100644
index 2dfd21969..000000000
Binary files a/.yarn/cache/@react-pdf-stylesheet-npm-6.1.1-de82babf5a-129d5e01ec.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-stylesheet-npm-6.2.1-a76dfb3da3-b5fdedf290.zip b/.yarn/cache/@react-pdf-stylesheet-npm-6.2.1-a76dfb3da3-b5fdedf290.zip
new file mode 100644
index 000000000..1d88d544a
Binary files /dev/null and b/.yarn/cache/@react-pdf-stylesheet-npm-6.2.1-a76dfb3da3-b5fdedf290.zip differ
diff --git a/.yarn/cache/@react-pdf-svg-npm-1.1.0-5a97c07518-23c3052ee0.zip b/.yarn/cache/@react-pdf-svg-npm-1.1.0-5a97c07518-23c3052ee0.zip
new file mode 100644
index 000000000..9d28ade8e
Binary files /dev/null and b/.yarn/cache/@react-pdf-svg-npm-1.1.0-5a97c07518-23c3052ee0.zip differ
diff --git a/.yarn/cache/@react-pdf-textkit-npm-6.0.0-ad8481d0d8-5bc087ad2d.zip b/.yarn/cache/@react-pdf-textkit-npm-6.0.0-ad8481d0d8-5bc087ad2d.zip
deleted file mode 100644
index e72524cf5..000000000
Binary files a/.yarn/cache/@react-pdf-textkit-npm-6.0.0-ad8481d0d8-5bc087ad2d.zip and /dev/null differ
diff --git a/.yarn/cache/@react-pdf-textkit-npm-6.3.0-1e829976be-d95f16dce9.zip b/.yarn/cache/@react-pdf-textkit-npm-6.3.0-1e829976be-d95f16dce9.zip
new file mode 100644
index 000000000..3df5dcb44
Binary files /dev/null and b/.yarn/cache/@react-pdf-textkit-npm-6.3.0-1e829976be-d95f16dce9.zip differ
diff --git a/.yarn/cache/@react-pdf-types-npm-2.11.1-8af15ddcd5-54ede09415.zip b/.yarn/cache/@react-pdf-types-npm-2.11.1-8af15ddcd5-54ede09415.zip
new file mode 100644
index 000000000..6ae1ecb44
Binary files /dev/null and b/.yarn/cache/@react-pdf-types-npm-2.11.1-8af15ddcd5-54ede09415.zip differ
diff --git a/.yarn/cache/@react-pdf-types-npm-2.9.1-67f97a020a-99b8dbc64e.zip b/.yarn/cache/@react-pdf-types-npm-2.9.1-67f97a020a-99b8dbc64e.zip
deleted file mode 100644
index 052fe677e..000000000
Binary files a/.yarn/cache/@react-pdf-types-npm-2.9.1-67f97a020a-99b8dbc64e.zip and /dev/null differ
diff --git a/.yarn/cache/@types-node-npm-20.19.23-9e5fa45fa9-1f213fa438.zip b/.yarn/cache/@types-node-npm-20.19.23-9e5fa45fa9-1f213fa438.zip
deleted file mode 100644
index 6cc73f03c..000000000
Binary files a/.yarn/cache/@types-node-npm-20.19.23-9e5fa45fa9-1f213fa438.zip and /dev/null differ
diff --git a/.yarn/cache/@types-node-npm-25.6.0-429799b5e8-98945eb599.zip b/.yarn/cache/@types-node-npm-25.6.0-429799b5e8-98945eb599.zip
new file mode 100644
index 000000000..7a68c56c3
Binary files /dev/null and b/.yarn/cache/@types-node-npm-25.6.0-429799b5e8-98945eb599.zip differ
diff --git a/.yarn/cache/@types-ws-npm-8.18.1-61dc106ff0-0331b14cde.zip b/.yarn/cache/@types-ws-npm-8.18.1-61dc106ff0-0331b14cde.zip
new file mode 100644
index 000000000..bc43fa751
Binary files /dev/null and b/.yarn/cache/@types-ws-npm-8.18.1-61dc106ff0-0331b14cde.zip differ
diff --git a/.yarn/cache/color-name-npm-2.1.0-0d5dd61305-eb014f71d8.zip b/.yarn/cache/color-name-npm-2.1.0-0d5dd61305-eb014f71d8.zip
new file mode 100644
index 000000000..4cce5c728
Binary files /dev/null and b/.yarn/cache/color-name-npm-2.1.0-0d5dd61305-eb014f71d8.zip differ
diff --git a/.yarn/cache/color-string-npm-2.1.4-e5adac6a35-f9caa29d52.zip b/.yarn/cache/color-string-npm-2.1.4-e5adac6a35-f9caa29d52.zip
new file mode 100644
index 000000000..f46ba983d
Binary files /dev/null and b/.yarn/cache/color-string-npm-2.1.4-e5adac6a35-f9caa29d52.zip differ
diff --git a/.yarn/cache/crypto-js-npm-4.2.0-d6f7744e63-f051666dbc.zip b/.yarn/cache/crypto-js-npm-4.2.0-d6f7744e63-f051666dbc.zip
deleted file mode 100644
index 87d2ed498..000000000
Binary files a/.yarn/cache/crypto-js-npm-4.2.0-d6f7744e63-f051666dbc.zip and /dev/null differ
diff --git a/.yarn/cache/entities-npm-7.0.1-61f8ba3430-5ee49e52e6.zip b/.yarn/cache/entities-npm-7.0.1-61f8ba3430-5ee49e52e6.zip
new file mode 100644
index 000000000..ae7941661
Binary files /dev/null and b/.yarn/cache/entities-npm-7.0.1-61f8ba3430-5ee49e52e6.zip differ
diff --git a/.yarn/cache/fflate-npm-0.8.3-35acaff861-a2a417e8fb.zip b/.yarn/cache/fflate-npm-0.8.3-35acaff861-a2a417e8fb.zip
new file mode 100644
index 000000000..1bc0a8e5d
Binary files /dev/null and b/.yarn/cache/fflate-npm-0.8.3-35acaff861-a2a417e8fb.zip differ
diff --git a/.yarn/cache/happy-dom-npm-20.0.8-9d375c4358-4d1131542c.zip b/.yarn/cache/happy-dom-npm-20.0.8-9d375c4358-4d1131542c.zip
deleted file mode 100644
index 25f3b0193..000000000
Binary files a/.yarn/cache/happy-dom-npm-20.0.8-9d375c4358-4d1131542c.zip and /dev/null differ
diff --git a/.yarn/cache/happy-dom-npm-20.9.0-480a4fb09e-6cc02c95c2.zip b/.yarn/cache/happy-dom-npm-20.9.0-480a4fb09e-6cc02c95c2.zip
new file mode 100644
index 000000000..adc2f9ba6
Binary files /dev/null and b/.yarn/cache/happy-dom-npm-20.9.0-480a4fb09e-6cc02c95c2.zip differ
diff --git a/.yarn/cache/js-md5-npm-0.8.3-c353e27117-b8578232d8.zip b/.yarn/cache/js-md5-npm-0.8.3-c353e27117-b8578232d8.zip
new file mode 100644
index 000000000..d4542e3b0
Binary files /dev/null and b/.yarn/cache/js-md5-npm-0.8.3-c353e27117-b8578232d8.zip differ
diff --git a/.yarn/cache/lexical-npm-0.38.1-adf999e94e-af080ba244.zip b/.yarn/cache/lexical-npm-0.38.1-adf999e94e-af080ba244.zip
deleted file mode 100644
index a0e8b3cf2..000000000
Binary files a/.yarn/cache/lexical-npm-0.38.1-adf999e94e-af080ba244.zip and /dev/null differ
diff --git a/.yarn/cache/lexical-npm-0.43.0-dec146ba14-0cb9b22669.zip b/.yarn/cache/lexical-npm-0.43.0-dec146ba14-0cb9b22669.zip
new file mode 100644
index 000000000..b620000aa
Binary files /dev/null and b/.yarn/cache/lexical-npm-0.43.0-dec146ba14-0cb9b22669.zip differ
diff --git a/.yarn/cache/png-js-npm-2.0.0-2a60ae96e2-a880131c0c.zip b/.yarn/cache/png-js-npm-2.0.0-2a60ae96e2-a880131c0c.zip
new file mode 100644
index 000000000..c8a611713
Binary files /dev/null and b/.yarn/cache/png-js-npm-2.0.0-2a60ae96e2-a880131c0c.zip differ
diff --git a/.yarn/cache/undici-types-npm-7.19.2-93c792b6dd-f721026160.zip b/.yarn/cache/undici-types-npm-7.19.2-93c792b6dd-f721026160.zip
new file mode 100644
index 000000000..2c81742da
Binary files /dev/null and b/.yarn/cache/undici-types-npm-7.19.2-93c792b6dd-f721026160.zip differ
diff --git a/.yarn/cache/ws-npm-8.20.0-b8684d1fe3-2b31d24a53.zip b/.yarn/cache/ws-npm-8.20.0-b8684d1fe3-2b31d24a53.zip
new file mode 100644
index 000000000..910664830
Binary files /dev/null and b/.yarn/cache/ws-npm-8.20.0-b8684d1fe3-2b31d24a53.zip differ
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 95a48500e..74714671a 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.26.97](https://github.com/standardnotes/app/compare/@standardnotes/api@1.26.96...@standardnotes/api@1.26.97) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.26.96](https://github.com/standardnotes/app/compare/@standardnotes/api@1.26.95...@standardnotes/api@1.26.96) (2025-12-18)
 
 ### Bug Fixes
diff --git a/packages/api/package.json b/packages/api/package.json
index 1a2f186cb..05fe68df7 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.26.96",
+  "version": "1.26.97",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
diff --git a/packages/clipper/CHANGELOG.md b/packages/clipper/CHANGELOG.md
index 53a2bea76..da1d3b851 100644
--- a/packages/clipper/CHANGELOG.md
+++ b/packages/clipper/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.588](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.587...@standardnotes/clipper@1.1.588) (2026-06-05)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.587](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.586...@standardnotes/clipper@1.1.587) (2026-05-27)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.586](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.585...@standardnotes/clipper@1.1.586) (2026-04-29)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.585](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.584...@standardnotes/clipper@1.1.585) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
+## [1.1.584](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.583...@standardnotes/clipper@1.1.584) (2026-04-23)
+
+**Note:** Version bump only for package @standardnotes/clipper
+
 ## [1.1.583](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.582...@standardnotes/clipper@1.1.583) (2026-04-07)
 
 **Note:** Version bump only for package @standardnotes/clipper
diff --git a/packages/clipper/package.json b/packages/clipper/package.json
index 426b95d84..c8f1f01de 100644
--- a/packages/clipper/package.json
+++ b/packages/clipper/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/clipper",
   "description": "Web clipper browser extension for Standard Notes",
-  "version": "1.1.583",
+  "version": "1.1.588",
   "private": true,
   "scripts": {
     "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",
diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
index 2e7e849ee..15f180f46 100644
--- a/packages/desktop/CHANGELOG.md
+++ b/packages/desktop/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.110.193](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.201.28...@standardnotes/desktop@3.110.193) (2026-06-05)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.192](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.201.27...@standardnotes/desktop@3.110.192) (2026-05-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.191](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.201.26...@standardnotes/desktop@3.110.191) (2026-04-29)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.190](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.201.25...@standardnotes/desktop@3.110.190) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.110.189](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.201.24...@standardnotes/desktop@3.110.189) (2026-04-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.110.188](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.201.23...@standardnotes/desktop@3.110.188) (2026-04-07)
 
 **Note:** Version bump only for package @standardnotes/desktop
diff --git a/packages/desktop/app/javascripts/Main/Packages/PackageManager.ts b/packages/desktop/app/javascripts/Main/Packages/PackageManager.ts
index d38b7aefe..9908dc93c 100644
--- a/packages/desktop/app/javascripts/Main/Packages/PackageManager.ts
+++ b/packages/desktop/app/javascripts/Main/Packages/PackageManager.ts
@@ -386,8 +386,31 @@ async function installComponent(
   }
 }
 
+function validatePackageIdentifier(identifier: string) {
+  if (!identifier) {
+    throw new Error('Package identifier must not be empty')
+  }
+
+  if (identifier.includes('/') || identifier.includes('\\') || identifier === '.' || identifier === '..') {
+    throw new Error(`Invalid package identifier: ${identifier}`)
+  }
+}
+
+function assertPathWithinExtensions(absolutePath: string) {
+  const extensionsRoot = path.resolve(Paths.userDataDir, Paths.extensionsDirRelative)
+  const resolvedPath = path.resolve(absolutePath)
+  const relativeToExtensions = path.relative(extensionsRoot, resolvedPath)
+
+  if (relativeToExtensions.startsWith('..') || path.isAbsolute(relativeToExtensions)) {
+    throw new Error(`Path escapes extensions directory: ${absolutePath}`)
+  }
+}
+
 function pathsForComponent(component: Pick<Component, 'content'>) {
-  const relativePath = path.join(Paths.extensionsDirRelative, component.content!.package_info.identifier)
+  const identifier = component.content!.package_info.identifier
+  validatePackageIdentifier(identifier)
+
+  const relativePath = path.join(Paths.extensionsDirRelative, identifier)
   const absolutePath = path.join(Paths.userDataDir, relativePath)
   const downloadPath = path.join(Paths.tempDir, AppName, 'downloads', component.content!.name + '.zip')
 
@@ -404,7 +427,9 @@ async function uninstallComponent(mapping: MappingFileHandler, uuid: string) {
     /** No mapping for component */
     return
   }
-  const result = await new FilesManager().deleteDir(path.join(Paths.userDataDir, componentMapping.location))
+  const absolutePath = path.join(Paths.userDataDir, componentMapping.location)
+  assertPathWithinExtensions(absolutePath)
+  const result = await new FilesManager().deleteDir(absolutePath)
   if (!result.isFailed()) {
     mapping.remove(uuid)
   }
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 9e8234db7..406bb6b4f 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.110.188",
+  "version": "3.110.193",
   "license": "AGPL-3.0",
   "author": "Standard Notes.",
   "private": true,
diff --git a/packages/desktop/test/packageManager.spec.ts b/packages/desktop/test/packageManager.spec.ts
index 3103129a4..d0cc37460 100644
--- a/packages/desktop/test/packageManager.spec.ts
+++ b/packages/desktop/test/packageManager.spec.ts
@@ -143,6 +143,71 @@ test("doesn't download anything when two install/uninstall tasks are queued", as
   t.is(downloadFileCallCount, 1)
 })
 
+test('does not uninstall paths outside extensions from poisoned mapping', async (t) => {
+  await packageManager.syncComponents([fakeComponent()])
+  await new Promise((resolve) => setTimeout(resolve, 200))
+
+  const escapeDir = path.join(tmpDir.path, 'escape')
+  const markerPath = path.join(escapeDir, 'marker.txt')
+  await ensureDirectoryExists(escapeDir)
+  await fs.writeFile(markerPath, 'keep')
+
+  const poisonedLocations = [path.join('Extensions', '..', 'escape'), path.join('..', 'escape')]
+
+  for (const location of poisonedLocations) {
+    await fs.writeFile(
+      path.join(contentDir, 'mapping.json'),
+      JSON.stringify({
+        [uuid]: { location, version },
+      }),
+    )
+
+    await packageManager.syncComponents([fakeComponent({ deleted: true })])
+    await new Promise((resolve) => setTimeout(resolve, 200))
+
+    t.true(await fs.stat(markerPath).then(() => true), `marker preserved for location ${location}`)
+    t.deepEqual(await readJSONFile(path.join(contentDir, 'mapping.json')), {
+      [uuid]: { location, version },
+    })
+  }
+
+  t.true(await fs.stat(path.join(contentDir, identifier)).then(() => true))
+})
+
+test('rejects path traversal in package identifier', async (t) => {
+  const traversalIdentifiers = ['../escape', 'foo/../../escape', '..', '.', 'foo/bar']
+  const extensionsParent = path.dirname(contentDir)
+
+  for (const badIdentifier of traversalIdentifiers) {
+    const before = await fs.readdir(contentDir)
+    const parentBefore = await fs.readdir(extensionsParent)
+
+    downloadFileCallCount = 0
+    await packageManager.syncComponents([
+      {
+        ...fakeComponent({ modifier: badIdentifier }),
+        content: {
+          ...fakeComponent().content,
+          name: `Bad ${badIdentifier}`,
+          package_info: {
+            ...fakeComponent().content.package_info,
+            identifier: badIdentifier,
+          },
+        },
+      },
+    ])
+    await new Promise((resolve) => setTimeout(resolve, 200))
+
+    t.is(downloadFileCallCount, 0, `should not download for identifier ${badIdentifier}`)
+    t.deepEqual(await fs.readdir(contentDir), before, `extensions dir unchanged for ${badIdentifier}`)
+    t.deepEqual(
+      await fs.readdir(extensionsParent),
+      parentBefore,
+      `no directory escape for ${badIdentifier}`,
+    )
+  }
+})
+
 test("Relies on download_url's version field to store the version number", async (t) => {
   await packageManager.syncComponents([fakeComponent()])
   await new Promise((resolve) => setTimeout(resolve, 200))
diff --git a/packages/encryption/CHANGELOG.md b/packages/encryption/CHANGELOG.md
index 749f74bf3..3c13924d1 100644
--- a/packages/encryption/CHANGELOG.md
+++ b/packages/encryption/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.113](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.112...@standardnotes/encryption@1.21.113) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.21.112](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.111...@standardnotes/encryption@1.21.112) (2025-11-06)
 
 **Note:** Version bump only for package @standardnotes/encryption
diff --git a/packages/encryption/package.json b/packages/encryption/package.json
index 88f9d8289..f7c14dd68 100644
--- a/packages/encryption/package.json
+++ b/packages/encryption/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.21.112",
+  "version": "1.21.113",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
diff --git a/packages/filepicker/CHANGELOG.md b/packages/filepicker/CHANGELOG.md
index 3422f5646..0e430bf92 100644
--- a/packages/filepicker/CHANGELOG.md
+++ b/packages/filepicker/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.28.134](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.133...@standardnotes/filepicker@1.28.134) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 ## [1.28.133](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.132...@standardnotes/filepicker@1.28.133) (2025-12-18)
 
 **Note:** Version bump only for package @standardnotes/filepicker
diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json
index b01fb9db4..8aee3b3fd 100644
--- a/packages/filepicker/package.json
+++ b/packages/filepicker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.28.133",
+  "version": "1.28.134",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
diff --git a/packages/files/CHANGELOG.md b/packages/files/CHANGELOG.md
index 8e9dddbb1..13b020870 100644
--- a/packages/files/CHANGELOG.md
+++ b/packages/files/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.17](https://github.com/standardnotes/app/compare/@standardnotes/files@1.20.16...@standardnotes/files@1.20.17) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/files
+
 ## [1.20.16](https://github.com/standardnotes/app/compare/@standardnotes/files@1.20.15...@standardnotes/files@1.20.16) (2025-12-18)
 
 ### Bug Fixes
diff --git a/packages/files/package.json b/packages/files/package.json
index 3b7cd8589..02d5a6bc6 100644
--- a/packages/files/package.json
+++ b/packages/files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.20.16",
+  "version": "1.20.17",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
index 6f34b7708..bf842dc31 100644
--- a/packages/mobile/CHANGELOG.md
+++ b/packages/mobile/CHANGELOG.md
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.58.255](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.254...@standardnotes/mobile@3.58.255) (2026-06-05)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.254](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.253...@standardnotes/mobile@3.58.254) (2026-05-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.253](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.252...@standardnotes/mobile@3.58.253) (2026-04-29)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.252](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.251...@standardnotes/mobile@3.58.252) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.251](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.250...@standardnotes/mobile@3.58.251) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.250](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.249...@standardnotes/mobile@3.58.250) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.58.249](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.248...@standardnotes/mobile@3.58.249) (2026-04-23)
+
+### Bug Fixes
+
+* Adds dynamic type support for iOS ([#3005](https://github.com/standardnotes/app/issues/3005)) ([6261fd8](https://github.com/standardnotes/app/commit/6261fd8241b36be0e73dd84b39d31059d6077c16))
+
 ## [3.58.248](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.58.247...@standardnotes/mobile@3.58.248) (2026-04-07)
 
 **Note:** Version bump only for package @standardnotes/mobile
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index 814324a19..5fd93616e 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -73,7 +73,7 @@ def enableProguardInReleaseBuilds = false
 def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 def appVersionCode = project.hasProperty('versionCode') ? Integer.valueOf(project.property('versionCode')) : 1
-def appVersionName = project.hasProperty('versionName') ? project.property('versionName') : "1.0"
+def appVersionName = project.hasProperty('versionName') ? project.property('versionName') : "1.0.0"
 
 android {
     ndkVersion rootProject.ext.ndkVersion
diff --git a/packages/mobile/fastlane/Fastfile b/packages/mobile/fastlane/Fastfile
index 97f99aee9..7d5f48aee 100755
--- a/packages/mobile/fastlane/Fastfile
+++ b/packages/mobile/fastlane/Fastfile
@@ -15,7 +15,6 @@ platform :ios do
   end
 
   def build_ios(scheme)
-    xcversion(version: "26.0")
     increment_version_number(
       version_number: ENV['PACKAGE_VERSION'],
       xcodeproj: 'ios/StandardNotes.xcodeproj'
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index b43d7f380..d0f03866b 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.58.248",
+  "version": "3.58.255",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0",
diff --git a/packages/mobile/src/MobileWebAppContainer.tsx b/packages/mobile/src/MobileWebAppContainer.tsx
index c0373fcc8..c36bcac19 100644
--- a/packages/mobile/src/MobileWebAppContainer.tsx
+++ b/packages/mobile/src/MobileWebAppContainer.tsx
@@ -2,7 +2,7 @@
 
 import { ApplicationEvent, ReactNativeToWebEvent } from '@standardnotes/snjs'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Button, Dimensions, Keyboard, KeyboardEvent, Platform, Text, View } from 'react-native'
+import { AppState, Button, Dimensions, Keyboard, KeyboardEvent, Platform, Text, View } from 'react-native'
 import VersionInfo from 'react-native-version-info'
 import { WebView, WebViewMessageEvent } from 'react-native-webview'
 import { OnShouldStartLoadWithRequest, WebViewNativeConfig } from 'react-native-webview/lib/WebViewTypes'
@@ -52,6 +52,18 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
   const useFlexLayout = Platform.OS === 'ios' || androidVersion < 35
   const [webViewContainerHeight, setWebViewContainerHeight] = useState(screenHeight)
 
+  const applyDynamicTypeFontScale = useCallback((fontScale?: number) => {
+    if (Platform.OS !== 'ios') {
+      return
+    }
+
+    const scale = fontScale ?? Dimensions.get('window').fontScale
+    webViewRef.current?.injectJavaScript(`
+      document.documentElement.style.fontSize = 'calc(1rem * ${scale})';
+      true;
+    `)
+  }, [])
+
   useEffect(() => {
     const removeStateServiceListener = stateService.addEventObserver((event: ReactNativeToWebEvent) => {
       webViewRef.current?.postMessage(JSON.stringify({ reactNativeEvent: event, messageType: 'event' }))
@@ -150,6 +162,27 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
     }
   }, [webViewRef, stateService, device, androidBackHandlerService, colorSchemeService, insets.bottom, screenHeight])
 
+  useEffect(() => {
+    if (Platform.OS !== 'ios') {
+      return
+    }
+
+    const dimensionsListener = Dimensions.addEventListener('change', ({ window }) => {
+      applyDynamicTypeFontScale(window.fontScale)
+    })
+
+    const appStateListener = AppState.addEventListener('change', (state) => {
+      if (state === 'active') {
+        applyDynamicTypeFontScale()
+      }
+    })
+
+    return () => {
+      dimensionsListener.remove()
+      appStateListener.remove()
+    }
+  }, [applyDynamicTypeFontScale])
+
   useEffect(() => {
     return notifee.onForegroundEvent(({ type, detail }) => {
       if (type !== EventType.ACTION_PRESS) {
@@ -305,6 +338,7 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
     }
     if (message === 'appLoaded') {
       setDidLoadEnd(true)
+      applyDynamicTypeFontScale()
       return
     }
     try {
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 1cd4b2dfd..c3ea71912 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.58.3](https://github.com/standardnotes/app/compare/@standardnotes/models@1.58.2...@standardnotes/models@1.58.3) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/models
+
 ## [1.58.2](https://github.com/standardnotes/app/compare/@standardnotes/models@1.58.1...@standardnotes/models@1.58.2) (2025-11-06)
 
 **Note:** Version bump only for package @standardnotes/models
diff --git a/packages/models/package.json b/packages/models/package.json
index 4107b9b54..52f959e2e 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.58.2",
+  "version": "1.58.3",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts b/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
index 0f265ec87..37d64dce7 100644
--- a/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
+++ b/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
@@ -38,18 +38,33 @@ export function itemMatchesQuery(
   searchQuery: SearchQuery,
   collection: ReferenceLookupCollection,
 ): boolean {
-  const shouldCheckForSomeTagMatches = searchQuery.shouldCheckForSomeTagMatches ?? true
-  const itemTags = collection.elementsReferencingElement(itemToMatch, ContentType.TYPES.Tag) as SNTag[]
-  const someTagsMatches =
-    shouldCheckForSomeTagMatches &&
-    itemTags.some((tag) => matchResultForStringQuery(tag, searchQuery.query) !== MatchResult.None)
+  const { query, includeProtectedNoteText, shouldCheckForSomeTagMatches = true, noteTitleOnly = false } = searchQuery
 
-  if (itemToMatch.protected && !searchQuery.includeProtectedNoteText) {
-    const match = matchResultForStringQuery(itemToMatch, searchQuery.query)
-    return match === MatchResult.Title || match === MatchResult.TitleAndText || someTagsMatches
+  if (query.length === 0) {
+    return true
   }
 
-  return matchResultForStringQuery(itemToMatch, searchQuery.query) !== MatchResult.None || someTagsMatches
+  const itemMatch = matchResultForStringQuery(itemToMatch, query)
+
+  if (noteTitleOnly) {
+    return itemMatch === MatchResult.Title
+  }
+
+  if (shouldCheckForSomeTagMatches) {
+    const itemTags = collection.elementsReferencingElement(itemToMatch, ContentType.TYPES.Tag) as SNTag[]
+    const tagMatches = itemTags.map((tag) => matchResultForStringQuery(tag, query))
+    const someTagsMatches = tagMatches.some((match) => match !== MatchResult.None)
+
+    if (someTagsMatches) {
+      return true
+    }
+  }
+
+  if (itemToMatch.protected && !includeProtectedNoteText) {
+    return itemMatch === MatchResult.Title || itemMatch === MatchResult.TitleAndText
+  }
+
+  return itemMatch !== MatchResult.None
 }
 
 function matchResultForStringQuery(item: SearchableItem, searchString: string): MatchResult {
diff --git a/packages/models/src/Domain/Runtime/Display/Search/Types.ts b/packages/models/src/Domain/Runtime/Display/Search/Types.ts
index e574abcaa..fffab2e73 100644
--- a/packages/models/src/Domain/Runtime/Display/Search/Types.ts
+++ b/packages/models/src/Domain/Runtime/Display/Search/Types.ts
@@ -6,6 +6,7 @@ export type SearchQuery = {
   query: string
   includeProtectedNoteText: boolean
   shouldCheckForSomeTagMatches?: boolean
+  noteTitleOnly?: boolean
 }
 
 export interface ReferenceLookupCollection {
diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md
index d4642d5ed..49d8b27ab 100644
--- a/packages/releases/CHANGELOG.md
+++ b/packages/releases/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.895](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.894...@standardnotes/releases@1.4.895) (2026-06-05)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.894](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.893...@standardnotes/releases@1.4.894) (2026-05-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.893](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.892...@standardnotes/releases@1.4.893) (2026-04-29)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.892](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.891...@standardnotes/releases@1.4.892) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.891](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.890...@standardnotes/releases@1.4.891) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.890](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.889...@standardnotes/releases@1.4.890) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.889](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.888...@standardnotes/releases@1.4.889) (2026-04-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.888](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.887...@standardnotes/releases@1.4.888) (2026-04-07)
 
 **Note:** Version bump only for package @standardnotes/releases
diff --git a/packages/releases/package.json b/packages/releases/package.json
index 6a0c3e770..f9e75880e 100644
--- a/packages/releases/package.json
+++ b/packages/releases/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.4.888",
+  "version": "1.4.895",
   "repository": {
     "type": "git",
     "url": "https://github.com/standardnotes/app",
diff --git a/packages/responses/CHANGELOG.md b/packages/responses/CHANGELOG.md
index dfc94243c..da9649e05 100644
--- a/packages/responses/CHANGELOG.md
+++ b/packages/responses/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.57](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.56...@standardnotes/responses@1.13.57) (2026-04-24)
+
+### Bug Fixes
+
+* Shows info on UI and hides Manage button for shared subs ([#3002](https://github.com/standardnotes/app/issues/3002)) ([073db14](https://github.com/standardnotes/app/commit/073db143144bf88007010e4f44003198b327b4da))
+
 ## [1.13.56](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.55...@standardnotes/responses@1.13.56) (2024-04-10)
 
 **Note:** Version bump only for package @standardnotes/responses
diff --git a/packages/responses/package.json b/packages/responses/package.json
index 0c3f78ced..c85d1ea38 100644
--- a/packages/responses/package.json
+++ b/packages/responses/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/responses",
-  "version": "1.13.56",
+  "version": "1.13.57",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
diff --git a/packages/responses/src/Domain/Temp/Subscription.ts b/packages/responses/src/Domain/Temp/Subscription.ts
index e749413a9..269499378 100644
--- a/packages/responses/src/Domain/Temp/Subscription.ts
+++ b/packages/responses/src/Domain/Temp/Subscription.ts
@@ -4,4 +4,5 @@ export type Subscription = {
   createdAt: number
   updatedAt: number
   cancelled: boolean
+  subscriptionType?: 'regular' | 'shared'
 }
diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md
index 2636d2efc..2f655c6f1 100644
--- a/packages/services/CHANGELOG.md
+++ b/packages/services/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.72.3](https://github.com/standardnotes/app/compare/@standardnotes/services@1.72.2...@standardnotes/services@1.72.3) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/services
+
 ## [1.72.2](https://github.com/standardnotes/app/compare/@standardnotes/services@1.72.1...@standardnotes/services@1.72.2) (2025-12-18)
 
 ### Bug Fixes
diff --git a/packages/services/package.json b/packages/services/package.json
index 8806a8fd8..5cce938df 100644
--- a/packages/services/package.json
+++ b/packages/services/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/services",
-  "version": "1.72.2",
+  "version": "1.72.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
diff --git a/packages/services/src/Domain/InternalFeatures/InternalFeature.ts b/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
index 36a76cd56..861225023 100644
--- a/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
+++ b/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
@@ -1,4 +1,5 @@
 export enum InternalFeature {
   Vaults = 'vaults',
   UniversalSearch = 'universal-search',
+  SearchEnhancements = 'search-enhancements',
 }
diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md
index a7c1dd7a2..703726bd4 100644
--- a/packages/snjs/CHANGELOG.md
+++ b/packages/snjs/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.211.7](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.211.6...@standardnotes/snjs@2.211.7) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.211.6](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.211.5...@standardnotes/snjs@2.211.6) (2026-04-23)
+
+### Reverts
+
+* Revert "chore: split snjs session tests and increase token ttl [snjs docker only] (#3001)" ([cc1f16c](https://github.com/standardnotes/app/commit/cc1f16c70e6ccfc5d43c0d4e7af6c65d5fd51104)), closes [#3001](https://github.com/standardnotes/app/issues/3001)
+
 ## [2.211.5](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.211.4...@standardnotes/snjs@2.211.5) (2026-04-07)
 
 **Note:** Version bump only for package @standardnotes/snjs
diff --git a/packages/snjs/mocha/recovery.test.js b/packages/snjs/mocha/recovery.test.js
index b81b4dd7b..0b09ca6e3 100644
--- a/packages/snjs/mocha/recovery.test.js
+++ b/packages/snjs/mocha/recovery.test.js
@@ -26,21 +26,25 @@ describe('account recovery', function () {
   })
 
   it('should get the same recovery code at each consecutive call', async () => {
-    let recoveryCodesSetting = await application.settings.getSetting(SettingName.create(SettingName.NAMES.RecoveryCodes).getValue())
+    const recoveryCodesSettingName = SettingName.create(SettingName.NAMES.RecoveryCodes).getValue()
+    const rootKey = await application.encryption.computeRootKey(context.password, await application.encryption.getRootKeyParams())
+    const serverPassword = rootKey.serverPassword
+
+    let recoveryCodesSetting = await application.settings.getSetting(recoveryCodesSettingName, serverPassword)
     expect(recoveryCodesSetting).to.equal(undefined)
 
-    const generatedRecoveryCodesAfterFirstCall = await application.getRecoveryCodes.execute()
+    const generatedRecoveryCodesAfterFirstCall = await application.getRecoveryCodes.execute({ password: context.password })
     expect(generatedRecoveryCodesAfterFirstCall.getValue().length).to.equal(49)
 
-    recoveryCodesSetting = await application.settings.getSetting(SettingName.create(SettingName.NAMES.RecoveryCodes).getValue())
+    recoveryCodesSetting = await application.settings.getSetting(recoveryCodesSettingName, serverPassword)
     expect(recoveryCodesSetting).to.equal(generatedRecoveryCodesAfterFirstCall.getValue())
 
-    const fetchedRecoveryCodesOnTheSecondCall = await application.getRecoveryCodes.execute()
+    const fetchedRecoveryCodesOnTheSecondCall = await application.getRecoveryCodes.execute({ password: context.password })
     expect(generatedRecoveryCodesAfterFirstCall.getValue()).to.equal(fetchedRecoveryCodesOnTheSecondCall.getValue())
   })
 
   it('should allow to sign in with recovery code', async () => {
-    const generatedRecoveryCodes = await application.getRecoveryCodes.execute()
+    const generatedRecoveryCodes = await application.getRecoveryCodes.execute({ password: context.password })
 
     application = await context.signout()
 
@@ -56,7 +60,7 @@ describe('account recovery', function () {
   })
 
   it('should automatically generate new recovery code after recovery sign in', async () => {
-    const generatedRecoveryCodes = await application.getRecoveryCodes.execute()
+    const generatedRecoveryCodes = await application.getRecoveryCodes.execute({ password: context.password })
 
     application = await context.signout()
 
@@ -66,7 +70,7 @@ describe('account recovery', function () {
       password: context.password,
     })
 
-    const recoveryCodesAfterRecoverySignIn = await application.getRecoveryCodes.execute()
+    const recoveryCodesAfterRecoverySignIn = await application.getRecoveryCodes.execute({ password: context.password })
     expect(recoveryCodesAfterRecoverySignIn.getValue()).not.to.equal(generatedRecoveryCodes.getValue())
   })
 
@@ -78,7 +82,7 @@ describe('account recovery', function () {
 
     expect(await application.mfa.isMfaActivated()).to.equal(true)
 
-    const generatedRecoveryCodes = await application.getRecoveryCodes.execute()
+    const generatedRecoveryCodes = await application.getRecoveryCodes.execute({ password: context.password })
 
     application = await context.signout()
 
@@ -92,7 +96,7 @@ describe('account recovery', function () {
   })
 
   it('should not allow to sign in with recovery code and invalid credentials', async () => {
-    const generatedRecoveryCodes = await application.getRecoveryCodes.execute()
+    const generatedRecoveryCodes = await application.getRecoveryCodes.execute({ password: context.password })
 
     application = await context.signout()
 
@@ -108,7 +112,7 @@ describe('account recovery', function () {
   })
 
   it('should not allow to sign in with invalid recovery code', async () => {
-    await application.getRecoveryCodes.execute()
+    await application.getRecoveryCodes.execute({ password: context.password })
 
     application = await context.signout()
 
diff --git a/packages/snjs/mocha/session.test.js b/packages/snjs/mocha/session.test.js
index 3ca733e19..f23d3228a 100644
--- a/packages/snjs/mocha/session.test.js
+++ b/packages/snjs/mocha/session.test.js
@@ -3,6 +3,8 @@ import WebDeviceInterface from './lib/web_device_interface.js'
 
 chai.use(chaiAsPromised)
 const expect = chai.expect
+const urlSearchParams = new URLSearchParams(window.location.search)
+const skipSessionCooldownTests = urlSearchParams.get('skipSessionCooldownTests') === 'true'
 
 describe('server session', function () {
   this.timeout(Factory.TenSecondTimeout)
@@ -481,7 +483,9 @@ describe('server session', function () {
     await refreshPromise
   })
 
-  it('should tell the client to refresh the token if one is used during the cooldown period after a refresh', async function () {
+  ;(skipSessionCooldownTests ? it.skip : it)(
+    'should tell the client to refresh the token if one is used during the cooldown period after a refresh',
+    async function () {
     await Factory.registerUserToApplication({
       application: application,
       email: email,
@@ -508,9 +512,12 @@ describe('server session', function () {
 
     application.http.setSession = originalSetSessionFn
     application.http.refreshSessionCallback = originalRefreshSessionCallbackFn
-  })
+    },
+  )
 
-  it('if session renewal response is dropped, next sync with server should return a 498 and successfully renew the session', async function () {
+  ;(skipSessionCooldownTests ? it.skip : it)(
+    'if session renewal response is dropped, next sync with server should return a 498 and successfully renew the session',
+    async function () {
     await Factory.registerUserToApplication({
       application: application,
       email: email,
@@ -529,8 +536,9 @@ describe('server session', function () {
     await application.sync.sync(syncOptions)
     await application.sync.sync(syncOptions)
 
-    expect(refreshSpy.callCount).to.equal(2)
-  })
+      expect(refreshSpy.callCount).to.equal(2)
+    },
+  )
 
   it('notes should be synced as expected after refreshing a session', async function () {
     await Factory.registerUserToApplication({
diff --git a/packages/snjs/mocha/sync_tests/online.test.js b/packages/snjs/mocha/sync_tests/online.test.js
index 86c20a097..66d29bb36 100644
--- a/packages/snjs/mocha/sync_tests/online.test.js
+++ b/packages/snjs/mocha/sync_tests/online.test.js
@@ -452,7 +452,7 @@ describe('online syncing', function () {
     }
 
     expect(safeGuard.isSyncCallsThresholdReachedThisMinute()).to.equal(true)
-    expect(syncCount).to.equal(200)
+    expect(syncCount).to.be.at.least(200)
   })
 
   it('items that are never synced and deleted should not be uploaded to server', async function () {
diff --git a/packages/snjs/package.json b/packages/snjs/package.json
index 7836e924c..5eb2f8968 100644
--- a/packages/snjs/package.json
+++ b/packages/snjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.211.5",
+  "version": "2.211.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/standardnotes/app",
diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md
index 11350c9e2..c2fceac63 100644
--- a/packages/ui-services/CHANGELOG.md
+++ b/packages/ui-services/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.39.5](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.39.4...@standardnotes/ui-services@1.39.5) (2026-06-05)
+
+### Bug Fixes
+
+* Fixes checkboxes parsed as bullet items when importing Evernote notes ([f488518](https://github.com/standardnotes/app/commit/f4885188ad7a289b16f95eeea56de2bed56dfb95))
+* Fixes empty lines doubled when importing Evernote notes ([b4faa20](https://github.com/standardnotes/app/commit/b4faa20ac1089187d2655dc132f8252893a51a9f))
+* Fixes highlight text style lost when importing Evernote notes ([a62f496](https://github.com/standardnotes/app/commit/a62f496ee6ca588876b616261c479f6499b4ec19))
+
+## [1.39.4](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.39.3...@standardnotes/ui-services@1.39.4) (2026-04-24)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.39.3](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.39.2...@standardnotes/ui-services@1.39.3) (2026-04-23)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.39.2](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.39.1...@standardnotes/ui-services@1.39.2) (2025-12-18)
 
 **Note:** Version bump only for package @standardnotes/ui-services
diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json
index 97add7948..aa0400c39 100644
--- a/packages/ui-services/package.json
+++ b/packages/ui-services/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.39.2",
+  "version": "1.39.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
diff --git a/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts b/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts
index 47d39f9e8..1cecbac2b 100644
--- a/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts
+++ b/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts
@@ -5,7 +5,7 @@
 import { ContentType } from '@standardnotes/domain-core'
 import { SNNote, SNTag } from '@standardnotes/models'
 import { EvernoteConverter, EvernoteResource } from './EvernoteConverter'
-import { createTestResourceElement, enex } from './testData'
+import { checkboxEnex, createTestResourceElement, emptyLineEnex, enTodoEnex, enex, highlightEnex } from './testData'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { GenerateUuid } from '@standardnotes/services'
 import { Converter } from '../Converter'
@@ -109,7 +109,43 @@ describe('EvernoteConverter', () => {
     )
   })
 
+  it('should convert Evernote checkbox lists to super format', async () => {
+    const converter = new EvernoteConverter(generateUuid)
+
+    const { successful } = await converter.convert(checkboxEnex as unknown as File, {
+      ...dependencies,
+      canUseSuper: true,
+    })
+
+    expect((successful?.[0] as SNNote).content.text).toContain('__lexicallisttype="check"')
+    expect((successful?.[0] as SNNote).content.text).toContain('aria-checked="true"')
+    expect((successful?.[0] as SNNote).content.text).toContain('aria-checked="false"')
+  })
+
+  it('should convert Evernote checkbox lists to plaintext checkboxes without super', async () => {
+    const converter = new EvernoteConverter(generateUuid)
+
+    const { successful } = await converter.convert(checkboxEnex as unknown as File, dependencies)
+
+    expect((successful?.[0] as SNNote).content.text).toBe('- [x] Line 1\n- [ ] Line 2\n')
+  })
+
+  it('should convert en-todo tags to super checklist format', async () => {
+    const converter = new EvernoteConverter(generateUuid)
+
+    const { successful } = await converter.convert(enTodoEnex as unknown as File, {
+      ...dependencies,
+      canUseSuper: true,
+    })
+
+    expect((successful?.[0] as SNNote).content.text).toContain('__lexicallisttype="check"')
+    expect((successful?.[0] as SNNote).content.text).toContain('Checked item')
+    expect((successful?.[0] as SNNote).content.text).toContain('Unchecked item')
+  })
+
   it('should convert lists to super format if applicable', () => {
+    const converter = new EvernoteConverter(generateUuid)
+    const noteElement = document.createElement('en-note')
     const unorderedList1 = document.createElement('ul')
     unorderedList1.style.setProperty('--en-todo', 'true')
     const listItem1 = document.createElement('li')
@@ -120,11 +156,10 @@ describe('EvernoteConverter', () => {
     unorderedList1.appendChild(listItem2)
 
     const unorderedList2 = document.createElement('ul')
+    noteElement.appendChild(unorderedList1)
+    noteElement.appendChild(unorderedList2)
 
-    const array = [unorderedList1, unorderedList2]
-
-    const converter = new EvernoteConverter(generateUuid)
-    converter.convertListsToSuperFormatIfApplicable(array)
+    converter.convertEvernoteChecklists(noteElement, true)
 
     expect(unorderedList1.getAttribute('__lexicallisttype')).toBe('check')
     expect(listItem1.getAttribute('aria-checked')).toBe('true')
@@ -132,6 +167,49 @@ describe('EvernoteConverter', () => {
     expect(unorderedList2.getAttribute('__lexicallisttype')).toBeFalsy()
   })
 
+  it('should preserve single empty lines from Evernote br-only divs', async () => {
+    const converter = new EvernoteConverter(generateUuid)
+
+    const { successful } = await converter.convert(emptyLineEnex as unknown as File, dependencies)
+
+    expect((successful?.[0] as SNNote).content.text).toBe('line1\n\nline2')
+  })
+
+  it('should convert highlight spans to mark elements', () => {
+    const converter = new EvernoteConverter(generateUuid)
+    const root = document.createElement('div')
+    root.innerHTML =
+      '<span style="--en-highlight:yellow;background-color: #ffef9e;">Line 2</span><span>plain</span>'
+
+    converter.convertHighlightSpansToMarks(root)
+
+    expect(root.querySelector('span')?.textContent).toBe('plain')
+    expect(root.querySelector('mark')?.textContent).toBe('Line 2')
+  })
+
+  it('should convert highlight spans to mark elements before Super import', async () => {
+    const converter = new EvernoteConverter(generateUuid)
+
+    const { successful } = await converter.convert(highlightEnex as unknown as File, {
+      ...dependencies,
+      canUseSuper: true,
+    })
+
+    expect((successful?.[0] as SNNote).content.text).toContain('<mark')
+    expect((successful?.[0] as SNNote).content.text).not.toMatch(/<span[^>]*--en-highlight/)
+  })
+
+  it('should convert Evernote br-only divs to empty paragraphs for Super', async () => {
+    const converter = new EvernoteConverter(generateUuid)
+
+    const { successful } = await converter.convert(emptyLineEnex as unknown as File, {
+      ...dependencies,
+      canUseSuper: true,
+    })
+
+    expect((successful?.[0] as SNNote).content.text).toBe('<p>line1</p><p></p><p>line2</p>')
+  })
+
   it('should replace media elements with resources', async () => {
     const resources: EvernoteResource[] = [
       {
diff --git a/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.ts b/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.ts
index f19fc7b14..4f46633ce 100644
--- a/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.ts
+++ b/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.ts
@@ -8,6 +8,10 @@ import Base64 from 'crypto-js/enc-base64'
 import { Converter, UploadFileFn } from '../Converter'
 import { ConversionResult } from '../ConversionResult'
 import { getBlobFromBase64 } from '../Utils'
+import { isHighlightSpanElement } from '../HighlightSpanImport'
+
+const EVERNOTE_TODO = /--en-todo\s*:\s*true/i
+const EVERNOTE_CHECKED = /--en-checked\s*:\s*true/i
 dayjs.extend(customParseFormat)
 dayjs.extend(utc)
 
@@ -86,14 +90,13 @@ export class EvernoteConverter implements Converter {
 
         const noteElement = content.getElementsByTagName('en-note')[0] as HTMLElement
 
-        const unorderedLists = Array.from(noteElement.getElementsByTagName('ul'))
-
         if (canUseSuper) {
           this.convertTopLevelDivsToParagraphs(noteElement)
-          this.convertListsToSuperFormatIfApplicable(unorderedLists)
           this.convertLeftPaddingToSuperIndent(noteElement)
+          this.convertHighlightSpansToMarks(noteElement)
         }
 
+        this.convertEvernoteChecklists(noteElement, canUseSuper)
         this.removeEmptyAndOrphanListElements(noteElement)
         this.unwrapTopLevelBreaks(noteElement)
 
@@ -242,6 +245,38 @@ export class EvernoteConverter implements Converter {
     } as EvernoteResource
   }
 
+  convertHighlightSpansToMarks(noteElement: HTMLElement) {
+    for (const span of Array.from(noteElement.querySelectorAll('span'))) {
+      if (!isHighlightSpanElement(span)) {
+        continue
+      }
+
+      const mark = document.createElement('mark')
+      const style = span.getAttribute('style')
+      if (style) {
+        mark.setAttribute('style', style)
+      }
+
+      while (span.firstChild) {
+        mark.appendChild(span.firstChild)
+      }
+
+      span.replaceWith(mark)
+    }
+  }
+
+  convertEvernoteChecklists(noteElement: HTMLElement, forSuper: boolean) {
+    for (const ul of Array.from(noteElement.getElementsByTagName('ul'))) {
+      if (isEvernoteTodoList(ul)) {
+        convertEvernoteTodoList(ul, forSuper)
+      }
+    }
+
+    for (const group of getEnTodoBlockGroups(noteElement)) {
+      convertEvernoteEnTodoGroup(group, forSuper)
+    }
+  }
+
   convertTopLevelDivsToParagraphs(noteElement: HTMLElement) {
     noteElement.querySelectorAll('div').forEach((div) => {
       if (div.parentElement === noteElement) {
@@ -250,21 +285,6 @@ export class EvernoteConverter implements Converter {
     })
   }
 
-  convertListsToSuperFormatIfApplicable(unorderedLists: HTMLUListElement[]) {
-    for (const unorderedList of unorderedLists) {
-      if (unorderedList.style.getPropertyValue('--en-todo') !== 'true') {
-        continue
-      }
-
-      unorderedList.setAttribute('__lexicallisttype', 'check')
-
-      const listItems = unorderedList.getElementsByTagName('li')
-      for (const listItem of Array.from(listItems)) {
-        listItem.setAttribute('aria-checked', listItem.style.getPropertyValue('--en-checked'))
-      }
-    }
-  }
-
   convertLeftPaddingToSuperIndent(noteElement: HTMLElement) {
     noteElement.querySelectorAll('p').forEach((element) => {
       const paddingLeft = element.style.paddingLeft
@@ -298,7 +318,7 @@ export class EvernoteConverter implements Converter {
       const children = Array.from(parent.children)
       const isEveryChildBR = children.every((child) => child.tagName === 'BR')
       if (isEveryChildBR) {
-        parent.replaceWith(children[0])
+        parent.replaceChildren()
       }
     })
   }
@@ -388,15 +408,155 @@ export class EvernoteConverter implements Converter {
   }
 
   stripHTML(html: string) {
-    const tmp = document.createElement('html')
-    tmp.innerHTML = html
-    return tmp.textContent || tmp.innerText || ''
+    const doc = new DOMParser().parseFromString(html, 'text/html')
+    return doc.body.textContent || ''
   }
 }
 
 function changeElementTag(element: HTMLElement, newTag: string) {
-  const attributes = Array.prototype.slice.call(element.attributes)
-  element.outerHTML = `<${newTag} ${attributes.map((attr) => attr.name + '="' + attr.value + '"').join(' ')}>${
-    element.innerHTML
-  }</${newTag}>`
+  const doc = element.ownerDocument
+  const parent = element.parentElement
+  if (!parent) {
+    return
+  }
+  const replacement = doc.createElement(newTag)
+  for (const attr of Array.from(element.attributes)) {
+    replacement.setAttribute(attr.name, attr.value)
+  }
+  while (element.firstChild) {
+    replacement.appendChild(element.firstChild)
+  }
+  parent.replaceChild(replacement, element)
+}
+
+function isEvernoteStyleTrue(element: HTMLElement, property: '--en-todo' | '--en-checked'): boolean {
+  const style = element.getAttribute('style') ?? ''
+  const matchesStyleAttribute = property === '--en-todo' ? EVERNOTE_TODO.test(style) : EVERNOTE_CHECKED.test(style)
+
+  return matchesStyleAttribute || element.style.getPropertyValue(property) === 'true'
+}
+
+function isEvernoteTodoList(element: HTMLUListElement): boolean {
+  return isEvernoteStyleTrue(element, '--en-todo')
+}
+
+function isEvernoteChecked(element: HTMLElement): boolean {
+  return isEvernoteStyleTrue(element, '--en-checked')
+}
+
+function formatPlaintextCheckbox(checked: boolean, text: string): string {
+  return `- ${checked ? '[x]' : '[ ]'} ${text}`
+}
+
+function moveEnTodoBlockContent(block: HTMLElement, target: HTMLElement) {
+  const clone = block.cloneNode(true) as HTMLElement
+  const enTodo = clone.querySelector('en-todo')
+
+  if (enTodo) {
+    while (enTodo.firstChild) {
+      target.appendChild(enTodo.firstChild)
+    }
+    enTodo.remove()
+  }
+
+  while (clone.lastChild?.nodeName === 'BR') {
+    clone.removeChild(clone.lastChild)
+  }
+
+  while (clone.firstChild) {
+    target.appendChild(clone.firstChild)
+  }
+}
+
+function getEnTodoBlockGroups(noteElement: HTMLElement): HTMLElement[][] {
+  const groups: HTMLElement[][] = []
+  let currentGroup: HTMLElement[] = []
+
+  for (const child of Array.from(noteElement.children)) {
+    if (!(child instanceof HTMLElement) || (child.tagName !== 'DIV' && child.tagName !== 'P')) {
+      if (currentGroup.length > 0) {
+        groups.push(currentGroup)
+        currentGroup = []
+      }
+      continue
+    }
+
+    if (child.querySelector('en-todo')) {
+      currentGroup.push(child)
+    } else if (currentGroup.length > 0) {
+      groups.push(currentGroup)
+      currentGroup = []
+    }
+  }
+
+  if (currentGroup.length > 0) {
+    groups.push(currentGroup)
+  }
+
+  return groups
+}
+
+function replaceBlockGroup(group: HTMLElement[], replacement: HTMLElement) {
+  group[0].replaceWith(replacement)
+  for (let index = 1; index < group.length; index++) {
+    group[index].remove()
+  }
+}
+
+function convertEvernoteTodoList(ul: HTMLUListElement, forSuper: boolean) {
+  if (forSuper) {
+    ul.setAttribute('__lexicallisttype', 'check')
+    for (const listItem of Array.from(ul.getElementsByTagName('li'))) {
+      listItem.setAttribute('aria-checked', isEvernoteChecked(listItem) ? 'true' : 'false')
+    }
+    return
+  }
+
+  const lines = Array.from(ul.getElementsByTagName('li')).map((listItem) =>
+    formatPlaintextCheckbox(isEvernoteChecked(listItem), listItem.textContent?.trim() ?? ''),
+  )
+  const replacement = document.createElement('div')
+  replacement.textContent = `${lines.join('\n')}\n`
+  ul.replaceWith(replacement)
+}
+
+function convertEvernoteEnTodoGroup(group: HTMLElement[], forSuper: boolean) {
+  if (forSuper) {
+    const ul = document.createElement('ul')
+    ul.setAttribute('__lexicallisttype', 'check')
+
+    for (const block of group) {
+      const enTodo = block.querySelector('en-todo')
+      if (!enTodo) {
+        continue
+      }
+
+      const listItem = document.createElement('li')
+      const checked = enTodo.getAttribute('checked')?.toLowerCase() === 'true'
+      listItem.setAttribute('aria-checked', checked ? 'true' : 'false')
+      moveEnTodoBlockContent(block, listItem)
+      ul.appendChild(listItem)
+    }
+
+    replaceBlockGroup(group, ul)
+    return
+  }
+
+  const lines: string[] = []
+
+  for (const block of group) {
+    const enTodo = block.querySelector('en-todo')
+    if (!enTodo) {
+      continue
+    }
+
+    const textContainer = document.createElement('div')
+    moveEnTodoBlockContent(block, textContainer)
+    const checked = enTodo.getAttribute('checked')?.toLowerCase() === 'true'
+    lines.push(formatPlaintextCheckbox(checked, textContainer.textContent?.trim() ?? ''))
+  }
+
+  const replacement = document.createElement('div')
+  replacement.textContent = `${lines.join('\n')}\n`
+  replaceBlockGroup(group, replacement)
 }
diff --git a/packages/ui-services/src/Import/EvernoteConverter/testData.ts b/packages/ui-services/src/Import/EvernoteConverter/testData.ts
index ffb141189..8d1f6fb30 100644
--- a/packages/ui-services/src/Import/EvernoteConverter/testData.ts
+++ b/packages/ui-services/src/Import/EvernoteConverter/testData.ts
@@ -36,6 +36,61 @@ export const enex = `<?xml version="1.0" encoding="UTF-8"?>
   </note>
 </en-export>`
 
+export const highlightEnex = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20210408T052957Z" application="Evernote" version="10.8.5">
+  <note>
+    <title>Highlight test</title>
+    <created>20210308T051614Z</created>
+    <updated>20210308T051855Z</updated>
+    <content>
+      <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><div>Line 1</div><div><span style="--en-highlight:yellow;background-color: #ffef9e;">Line 2</span></div></en-note>]]>
+    </content>
+  </note>
+</en-export>`
+
+export const checkboxEnex = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export4.dtd">
+<en-export export-date="20221222T043818Z" application="Evernote" version="10.49.4">
+  <note>
+    <title>Checkbox test</title>
+    <created>20221122T043758Z</created>
+    <updated>20221122T043813Z</updated>
+    <content>
+      <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><ul style="--en-todo:true;"><li style="--en-checked:true;"><div>Line 1</div></li><li><div>Line 2</div></li></ul></en-note>]]>
+    </content>
+  </note>
+</en-export>`
+
+export const enTodoEnex = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export2.dtd">
+<en-export export-date="20200622T091735Z" application="Evernote/Windows" version="6.x">
+  <note>
+    <title>En-todo test</title>
+    <content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+<en-note><div><en-todo checked="true"/>Checked item<br/></div><div><en-todo checked="false"/>Unchecked item<br/></div></en-note>]]></content>
+    <created>20200622T091652Z</created>
+    <updated>20200622T091707Z</updated>
+  </note>
+</en-export>`
+
+export const emptyLineEnex = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20210408T052957Z" application="Evernote" version="10.8.5">
+  <note>
+    <title>Empty line test</title>
+    <created>20210308T051614Z</created>
+    <updated>20210308T051855Z</updated>
+    <content>
+      <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><div>line1</div><div><br/></div><div>line2</div></en-note>]]>
+    </content>
+  </note>
+</en-export>`
+
 export function createTestResourceElement(
   shouldHaveMimeType = true,
   shouldHaveSourceUrl = false,
diff --git a/packages/ui-services/src/Import/GoogleKeepConverter/GoogleKeepConverter.ts b/packages/ui-services/src/Import/GoogleKeepConverter/GoogleKeepConverter.ts
index 5f11f5da5..00acfa510 100644
--- a/packages/ui-services/src/Import/GoogleKeepConverter/GoogleKeepConverter.ts
+++ b/packages/ui-services/src/Import/GoogleKeepConverter/GoogleKeepConverter.ts
@@ -74,8 +74,8 @@ export class GoogleKeepConverter implements Converter {
     convertHTMLToSuper: HTMLToSuperConverterFunction,
     canUseSuper: boolean,
   ): Promise<SNNote> {
-    const rootElement = document.createElement('html')
-    rootElement.innerHTML = data
+    const doc = new DOMParser().parseFromString(data, 'text/html')
+    const rootElement = doc.documentElement
 
     const headingElement = rootElement.getElementsByClassName('heading')[0]
     const parsedDate = new Date(headingElement?.textContent || '')
@@ -110,8 +110,9 @@ export class GoogleKeepConverter implements Converter {
     })
 
     if (!canUseSuper) {
-      // Replace <br> with \n so line breaks get recognised
-      contentElement.innerHTML = contentElement.innerHTML.replace(/<br>/g, '\n')
+      Array.from(contentElement.querySelectorAll('br')).forEach((br) => {
+        br.replaceWith(doc.createTextNode('\n'))
+      })
       content = contentElement.textContent
     } else {
       content = convertHTMLToSuper(rootElement.innerHTML, {
diff --git a/packages/ui-services/src/Import/HighlightSpanImport.spec.ts b/packages/ui-services/src/Import/HighlightSpanImport.spec.ts
new file mode 100644
index 000000000..2b942f6b4
--- /dev/null
+++ b/packages/ui-services/src/Import/HighlightSpanImport.spec.ts
@@ -0,0 +1,26 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { isHighlightSpanElement, isHighlightSpanStyle } from './HighlightSpanImport'
+
+describe('HighlightSpanImport', () => {
+  it('detects --en-highlight in style attribute', () => {
+    expect(isHighlightSpanStyle('--en-highlight:yellow;background-color: #ffef9e;')).toBe(true)
+  })
+
+  it('detects -evernote-highlight in style attribute', () => {
+    expect(isHighlightSpanStyle('background-color: rgb(255, 250, 165);-evernote-highlight:true;')).toBe(true)
+  })
+
+  it('does not treat highlight:false as highlighted', () => {
+    expect(isHighlightSpanStyle('--en-highlight:false;')).toBe(false)
+  })
+
+  it('detects highlight spans by element style', () => {
+    const span = document.createElement('span')
+    span.setAttribute('style', '--en-highlight:yellow;background-color: #ffef9e;')
+
+    expect(isHighlightSpanElement(span)).toBe(true)
+  })
+})
diff --git a/packages/ui-services/src/Import/HighlightSpanImport.ts b/packages/ui-services/src/Import/HighlightSpanImport.ts
new file mode 100644
index 000000000..d7f1e86a0
--- /dev/null
+++ b/packages/ui-services/src/Import/HighlightSpanImport.ts
@@ -0,0 +1,24 @@
+const HIGHLIGHT_SPAN_PROPERTY =
+  /(?:--en-highlight|-en-highlight|--evernote-highlight|-evernote-highlight)\s*:\s*([^;]+)/i
+
+export function isHighlightSpanStyle(styleAttribute: string | null | undefined): boolean {
+  if (!styleAttribute) {
+    return false
+  }
+
+  const match = styleAttribute.match(HIGHLIGHT_SPAN_PROPERTY)
+  if (!match) {
+    return false
+  }
+
+  return match[1].trim().toLowerCase() !== 'false'
+}
+
+export function isHighlightSpanElement(element: HTMLElement): boolean {
+  if (isHighlightSpanStyle(element.getAttribute('style'))) {
+    return true
+  }
+
+  const enHighlight = element.style.getPropertyValue('--en-highlight')
+  return enHighlight !== '' && enHighlight.toLowerCase() !== 'false'
+}
diff --git a/packages/ui-services/src/Import/ImportLimits.spec.ts b/packages/ui-services/src/Import/ImportLimits.spec.ts
new file mode 100644
index 000000000..b25b4b0a8
--- /dev/null
+++ b/packages/ui-services/src/Import/ImportLimits.spec.ts
@@ -0,0 +1,15 @@
+import { assertImportFileWithinSizeLimit, MaxImportFileSizeBytes } from './ImportLimits'
+
+describe('ImportLimits', () => {
+  it('rejects files over the configured limit', () => {
+    const file = new File(['x'], 'note.html', { type: 'text/html' })
+    Object.defineProperty(file, 'size', { value: MaxImportFileSizeBytes + 1 })
+    expect(() => assertImportFileWithinSizeLimit(file)).toThrow('Import file is too large')
+  })
+
+  it('allows files at or below max import size', () => {
+    const file = new File(['x'], 'note.html', { type: 'text/html' })
+    Object.defineProperty(file, 'size', { value: MaxImportFileSizeBytes })
+    expect(() => assertImportFileWithinSizeLimit(file)).not.toThrow()
+  })
+})
diff --git a/packages/ui-services/src/Import/ImportLimits.ts b/packages/ui-services/src/Import/ImportLimits.ts
new file mode 100644
index 000000000..bd8d04a30
--- /dev/null
+++ b/packages/ui-services/src/Import/ImportLimits.ts
@@ -0,0 +1,7 @@
+export const MaxImportFileSizeBytes = 50 * 1_000_000
+
+export function assertImportFileWithinSizeLimit(file: File): void {
+  if (file.size > MaxImportFileSizeBytes) {
+    throw new Error('Import file is too large')
+  }
+}
diff --git a/packages/ui-services/src/Import/Importer.ts b/packages/ui-services/src/Import/Importer.ts
index a8af94e8d..9a5c04857 100644
--- a/packages/ui-services/src/Import/Importer.ts
+++ b/packages/ui-services/src/Import/Importer.ts
@@ -12,6 +12,7 @@ import { EvernoteConverter } from './EvernoteConverter/EvernoteConverter'
 import { GoogleKeepConverter } from './GoogleKeepConverter/GoogleKeepConverter'
 import { PlaintextConverter } from './PlaintextConverter/PlaintextConverter'
 import { SimplenoteConverter } from './SimplenoteConverter/SimplenoteConverter'
+import { assertImportFileWithinSizeLimit, MaxImportFileSizeBytes } from './ImportLimits'
 import { readFileAsText } from './Utils'
 import {
   DecryptedItemInterface,
@@ -74,6 +75,9 @@ export class Importer {
   }
 
   detectService = async (file: File): Promise<string | null> => {
+    if (file.size > MaxImportFileSizeBytes) {
+      return null
+    }
     const content = await readFileAsText(file)
 
     const { ext } = parseFileName(file.name)
@@ -232,6 +236,8 @@ export class Importer {
       throw new Error('Importing Super notes requires a subscription')
     }
 
+    assertImportFileWithinSizeLimit(file)
+
     const successful: ConversionResult['successful'] = []
     const errored: ConversionResult['errored'] = []
 
diff --git a/packages/ui-services/src/UseCase/IsNativeAndroid.ts b/packages/ui-services/src/UseCase/IsNativeAndroid.ts
new file mode 100644
index 000000000..4df080713
--- /dev/null
+++ b/packages/ui-services/src/UseCase/IsNativeAndroid.ts
@@ -0,0 +1,13 @@
+import { Result, SyncUseCaseInterface } from '@standardnotes/domain-core'
+import { Environment, Platform } from '@standardnotes/models'
+
+export class IsNativeAndroid implements SyncUseCaseInterface<boolean> {
+  constructor(
+    private environment: Environment,
+    private platform: Platform,
+  ) {}
+
+  execute(): Result<boolean> {
+    return Result.ok(this.environment === Environment.Mobile && this.platform === Platform.Android)
+  }
+}
diff --git a/packages/ui-services/src/WebApplication/WebApplicationInterface.ts b/packages/ui-services/src/WebApplication/WebApplicationInterface.ts
index f2d2bac3d..7cfad3e7b 100644
--- a/packages/ui-services/src/WebApplication/WebApplicationInterface.ts
+++ b/packages/ui-services/src/WebApplication/WebApplicationInterface.ts
@@ -26,6 +26,7 @@ export interface WebApplicationInterface extends ApplicationInterface {
   handleReceivedLinkEvent(item: { link: string; title: string }): Promise<void>
   handleOpenFilePreviewEvent(item: { id: string }): void
   isNativeMobileWeb(): boolean
+  canShowPurchaseFlow(): boolean
   handleAndroidBackButtonPressed(): void
   addAndroidBackHandlerEventListener(listener: () => boolean): (() => void) | undefined
   setAndroidBackHandlerFallbackListener(listener: () => boolean): void
diff --git a/packages/ui-services/src/index.ts b/packages/ui-services/src/index.ts
index ed05b5614..d033f6920 100644
--- a/packages/ui-services/src/index.ts
+++ b/packages/ui-services/src/index.ts
@@ -37,6 +37,7 @@ export * from './UseCase/IsGlobalSpellcheckEnabled'
 export * from './UseCase/IsNativeMobileWeb'
 export * from './UseCase/IsMobileDevice'
 export * from './UseCase/IsNativeIOS'
+export * from './UseCase/IsNativeAndroid'
 export * from './UseCase/GetItemTags'
 
 export * from './Theme/ThemeManager'
diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md
index 8350995ac..e986e43af 100644
--- a/packages/web/CHANGELOG.md
+++ b/packages/web/CHANGELOG.md
@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.201.29](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.28...@standardnotes/web@3.201.29) (2026-06-05)
+
+### Bug Fixes
+
+* Fixes checkboxes parsed as bullet items when importing Evernote notes ([f488518](https://github.com/standardnotes/app/commit/f4885188ad7a289b16f95eeea56de2bed56dfb95))
+* Fixes highlight text style lost when importing Evernote notes ([a62f496](https://github.com/standardnotes/app/commit/a62f496ee6ca588876b616261c479f6499b4ec19))
+
+## [3.201.28](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.27...@standardnotes/web@3.201.28) (2026-05-27)
+
+### Bug Fixes
+
+* Fixes cell padding and bold font within table cells in Super pdf export ([c81589b](https://github.com/standardnotes/app/commit/c81589b945b04b6f2b6842f193495d562c132bc8))
+* Fixes images rendering too small on Super pdf export ([80fa337](https://github.com/standardnotes/app/commit/80fa337afba85bada70b4ddacb6e5ad391978f28))
+* Fixes Super pdf export code block formatting issues ([bd3cf60](https://github.com/standardnotes/app/commit/bd3cf600e7a766c2fd980fbc01924e59664184b8))
+* Fixes Super pdf export headings font sizes and weights ([6daf58c](https://github.com/standardnotes/app/commit/6daf58c92893a6cfa93596a2429ed3e0697222e0))
+* Fixes Super pdf export line height ([e22e6fc](https://github.com/standardnotes/app/commit/e22e6fce7936a9b425f90e7363f274bce3b3b841))
+* Fixes Upgrade button in Settings leading to purchase page ([#3011](https://github.com/standardnotes/app/issues/3011)) ([eda1bfe](https://github.com/standardnotes/app/commit/eda1bfe0bd5b2be762dadf840f49034a2c659816))
+
+## [3.201.27](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.26...@standardnotes/web@3.201.27) (2026-04-29)
+
+### Bug Fixes
+
+* Fixes Super search highlights styling ([#3009](https://github.com/standardnotes/app/issues/3009)) ([a39bb82](https://github.com/standardnotes/app/commit/a39bb824f7b6d4f761abb27df9b7c7ba4818ce14))
+* Switches back to note list on mobile when active note is deleted from a different device ([#3008](https://github.com/standardnotes/app/issues/3008)) ([f4a9481](https://github.com/standardnotes/app/commit/f4a94811848ea19550703d5dcd2b446091bf9536))
+
+## [3.201.26](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.25...@standardnotes/web@3.201.26) (2026-04-24)
+
+### Bug Fixes
+
+* Shows info on UI and hides Manage button for shared subs ([#3002](https://github.com/standardnotes/app/issues/3002)) ([073db14](https://github.com/standardnotes/app/commit/073db143144bf88007010e4f44003198b327b4da))
+
+## [3.201.25](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.24...@standardnotes/web@3.201.25) (2026-04-23)
+
+### Bug Fixes
+
+* Adds dynamic type support for iOS ([#3005](https://github.com/standardnotes/app/issues/3005)) ([6261fd8](https://github.com/standardnotes/app/commit/6261fd8241b36be0e73dd84b39d31059d6077c16))
+* Fixes Super sections drag and drop issues on mobile ([#3003](https://github.com/standardnotes/app/issues/3003)) ([b330890](https://github.com/standardnotes/app/commit/b33089029f5979adf0c8e80a65c29a38945cf899))
+* Prevents unhandled error when attempting to import a blank note ([#3004](https://github.com/standardnotes/app/issues/3004)) ([90ca0c2](https://github.com/standardnotes/app/commit/90ca0c2cfb648d34c97d58b332a10c61daa20fa4))
+
 ## [3.201.24](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.23...@standardnotes/web@3.201.24) (2026-04-07)
 
 **Note:** Version bump only for package @standardnotes/web
diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json
index 11041f358..b99ad0696 100644
--- a/packages/web/CHANGELOG.md.json
+++ b/packages/web/CHANGELOG.md.json
@@ -1,5 +1,93 @@
 {
   "versions": [
+    {
+      "version": "3.201.29",
+      "title": "[3.201.29](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.28...@standardnotes/web@3.201.29) (2026-06-05)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixes checkboxes parsed as bullet items when importing Evernote notes ([f488518](https://github.com/standardnotes/app/commit/f4885188ad7a289b16f95eeea56de2bed56dfb95))\n* Fixes highlight text style lost when importing Evernote notes ([a62f496](https://github.com/standardnotes/app/commit/a62f496ee6ca588876b616261c479f6499b4ec19))",
+      "parsed": {
+        "_": [
+          "Fixes checkboxes parsed as bullet items when importing Evernote notes (f488518)",
+          "Fixes highlight text style lost when importing Evernote notes (a62f496)"
+        ],
+        "Bug Fixes": [
+          "Fixes checkboxes parsed as bullet items when importing Evernote notes (f488518)",
+          "Fixes highlight text style lost when importing Evernote notes (a62f496)"
+        ]
+      }
+    },
+    {
+      "version": "3.201.28",
+      "title": "[3.201.28](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.27...@standardnotes/web@3.201.28) (2026-05-27)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixes cell padding and bold font within table cells in Super pdf export ([c81589b](https://github.com/standardnotes/app/commit/c81589b945b04b6f2b6842f193495d562c132bc8))\n* Fixes images rendering too small on Super pdf export ([80fa337](https://github.com/standardnotes/app/commit/80fa337afba85bada70b4ddacb6e5ad391978f28))\n* Fixes Super pdf export code block formatting issues ([bd3cf60](https://github.com/standardnotes/app/commit/bd3cf600e7a766c2fd980fbc01924e59664184b8))\n* Fixes Super pdf export headings font sizes and weights ([6daf58c](https://github.com/standardnotes/app/commit/6daf58c92893a6cfa93596a2429ed3e0697222e0))\n* Fixes Super pdf export line height ([e22e6fc](https://github.com/standardnotes/app/commit/e22e6fce7936a9b425f90e7363f274bce3b3b841))\n* Fixes Upgrade button in Settings leading to purchase page ([#3011](https://github.com/standardnotes/app/issues/3011)) ([eda1bfe](https://github.com/standardnotes/app/commit/eda1bfe0bd5b2be762dadf840f49034a2c659816))",
+      "parsed": {
+        "_": [
+          "Fixes cell padding and bold font within table cells in Super pdf export (c81589b)",
+          "Fixes images rendering too small on Super pdf export (80fa337)",
+          "Fixes Super pdf export code block formatting issues (bd3cf60)",
+          "Fixes Super pdf export headings font sizes and weights (6daf58c)",
+          "Fixes Super pdf export line height (e22e6fc)",
+          "Fixes Upgrade button in Settings leading to purchase page (#3011) (eda1bfe)"
+        ],
+        "Bug Fixes": [
+          "Fixes cell padding and bold font within table cells in Super pdf export (c81589b)",
+          "Fixes images rendering too small on Super pdf export (80fa337)",
+          "Fixes Super pdf export code block formatting issues (bd3cf60)",
+          "Fixes Super pdf export headings font sizes and weights (6daf58c)",
+          "Fixes Super pdf export line height (e22e6fc)",
+          "Fixes Upgrade button in Settings leading to purchase page (#3011) (eda1bfe)"
+        ]
+      }
+    },
+    {
+      "version": "3.201.27",
+      "title": "[3.201.27](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.26...@standardnotes/web@3.201.27) (2026-04-29)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixes Super search highlights styling ([#3009](https://github.com/standardnotes/app/issues/3009)) ([a39bb82](https://github.com/standardnotes/app/commit/a39bb824f7b6d4f761abb27df9b7c7ba4818ce14))\n* Switches back to note list on mobile when active note is deleted from a different device ([#3008](https://github.com/standardnotes/app/issues/3008)) ([f4a9481](https://github.com/standardnotes/app/commit/f4a94811848ea19550703d5dcd2b446091bf9536))",
+      "parsed": {
+        "_": [
+          "Fixes Super search highlights styling (#3009) (a39bb82)",
+          "Switches back to note list on mobile when active note is deleted from a different device (#3008) (f4a9481)"
+        ],
+        "Bug Fixes": [
+          "Fixes Super search highlights styling (#3009) (a39bb82)",
+          "Switches back to note list on mobile when active note is deleted from a different device (#3008) (f4a9481)"
+        ]
+      }
+    },
+    {
+      "version": "3.201.26",
+      "title": "[3.201.26](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.25...@standardnotes/web@3.201.26) (2026-04-24)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Shows info on UI and hides Manage button for shared subs ([#3002](https://github.com/standardnotes/app/issues/3002)) ([073db14](https://github.com/standardnotes/app/commit/073db143144bf88007010e4f44003198b327b4da))",
+      "parsed": {
+        "_": [
+          "Shows info on UI and hides Manage button for shared subs (#3002) (073db14)"
+        ],
+        "Bug Fixes": [
+          "Shows info on UI and hides Manage button for shared subs (#3002) (073db14)"
+        ]
+      }
+    },
+    {
+      "version": "3.201.25",
+      "title": "[3.201.25](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.24...@standardnotes/web@3.201.25) (2026-04-23)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Adds dynamic type support for iOS ([#3005](https://github.com/standardnotes/app/issues/3005)) ([6261fd8](https://github.com/standardnotes/app/commit/6261fd8241b36be0e73dd84b39d31059d6077c16))\n* Fixes Super sections drag and drop issues on mobile ([#3003](https://github.com/standardnotes/app/issues/3003)) ([b330890](https://github.com/standardnotes/app/commit/b33089029f5979adf0c8e80a65c29a38945cf899))\n* Prevents unhandled error when attempting to import a blank note ([#3004](https://github.com/standardnotes/app/issues/3004)) ([90ca0c2](https://github.com/standardnotes/app/commit/90ca0c2cfb648d34c97d58b332a10c61daa20fa4))",
+      "parsed": {
+        "_": [
+          "Adds dynamic type support for iOS (#3005) (6261fd8)",
+          "Fixes Super sections drag and drop issues on mobile (#3003) (b330890)",
+          "Prevents unhandled error when attempting to import a blank note (#3004) (90ca0c2)"
+        ],
+        "Bug Fixes": [
+          "Adds dynamic type support for iOS (#3005) (6261fd8)",
+          "Fixes Super sections drag and drop issues on mobile (#3003) (b330890)",
+          "Prevents unhandled error when attempting to import a blank note (#3004) (90ca0c2)"
+        ]
+      }
+    },
     {
       "version": "3.201.24",
       "title": "[3.201.24](https://github.com/standardnotes/app/compare/@standardnotes/web@3.201.23...@standardnotes/web@3.201.24) (2026-04-07)",
diff --git a/packages/web/package.json b/packages/web/package.json
index 1c2eea937..8540628d7 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.201.24",
+  "version": "3.201.29",
   "license": "AGPL-3.0",
   "main": "dist/app.js",
   "author": "Standard Notes",
@@ -108,18 +108,19 @@
   },
   "dependencies": {
     "@ariakit/react": "^0.4.18",
-    "@lexical/clipboard": "0.38.1",
-    "@lexical/headless": "0.38.1",
-    "@lexical/link": "0.38.1",
-    "@lexical/list": "0.38.1",
-    "@lexical/react": "0.38.1",
-    "@lexical/rich-text": "0.38.1",
-    "@lexical/utils": "0.38.1",
+    "@lexical/clipboard": "0.43.0",
+    "@lexical/code": "0.43.0",
+    "@lexical/headless": "0.43.0",
+    "@lexical/link": "0.43.0",
+    "@lexical/list": "0.43.0",
+    "@lexical/react": "0.43.0",
+    "@lexical/rich-text": "0.43.0",
+    "@lexical/utils": "0.43.0",
     "@radix-ui/react-slot": "^1.0.1",
-    "@react-pdf/renderer": "^4.3.0",
+    "@react-pdf/renderer": "^4.4.1",
     "comlink": "^4.4.1",
     "fast-diff": "^1.3.0",
-    "lexical": "0.38.1",
+    "lexical": "0.43.0",
     "ttag": "^1.8.12",
     "unicode-script": "^1.2.0"
   }
diff --git a/packages/web/src/javascripts/Application/Dependencies/Types.ts b/packages/web/src/javascripts/Application/Dependencies/Types.ts
index b2ad12352..594dba04e 100644
--- a/packages/web/src/javascripts/Application/Dependencies/Types.ts
+++ b/packages/web/src/javascripts/Application/Dependencies/Types.ts
@@ -48,6 +48,7 @@ export const Web_TYPES = {
   IsGlobalSpellcheckEnabled: Symbol.for('IsGlobalSpellcheckEnabled'),
   IsMobileDevice: Symbol.for('IsMobileDevice'),
   IsNativeIOS: Symbol.for('IsNativeIOS'),
+  IsNativeAndroid: Symbol.for('IsNativeAndroid'),
   IsNativeMobileWeb: Symbol.for('IsNativeMobileWeb'),
   IsTabletOrMobileScreen: Symbol.for('IsTabletOrMobileScreen'),
   LoadPurchaseFlowUrl: Symbol.for('LoadPurchaseFlowUrl'),
diff --git a/packages/web/src/javascripts/Application/Dependencies/WebDependencies.ts b/packages/web/src/javascripts/Application/Dependencies/WebDependencies.ts
index eea0204b4..edf446b8c 100644
--- a/packages/web/src/javascripts/Application/Dependencies/WebDependencies.ts
+++ b/packages/web/src/javascripts/Application/Dependencies/WebDependencies.ts
@@ -7,6 +7,7 @@ import {
   IsGlobalSpellcheckEnabled,
   IsMobileDevice,
   IsNativeIOS,
+  IsNativeAndroid,
   IsNativeMobileWeb,
   KeyboardService,
   PluginsService,
@@ -77,6 +78,10 @@ export class WebDependencies extends DependencyContainer {
       return new IsNativeIOS(application.environment, application.platform)
     })
 
+    this.bind(Web_TYPES.IsNativeAndroid, () => {
+      return new IsNativeAndroid(application.environment, application.platform)
+    })
+
     this.bind(Web_TYPES.OpenSubscriptionDashboard, () => {
       return new OpenSubscriptionDashboard(application, application.legacyApi)
     })
@@ -331,6 +336,7 @@ export class WebDependencies extends DependencyContainer {
         application.mobileDevice,
         this.get<LoadPurchaseFlowUrl>(Web_TYPES.LoadPurchaseFlowUrl),
         this.get<IsNativeIOS>(Web_TYPES.IsNativeIOS),
+        this.get<IsNativeAndroid>(Web_TYPES.IsNativeAndroid),
         application.events,
       )
     })
diff --git a/packages/web/src/javascripts/Application/DevMode.ts b/packages/web/src/javascripts/Application/DevMode.ts
index 3b25a6990..652c91a78 100644
--- a/packages/web/src/javascripts/Application/DevMode.ts
+++ b/packages/web/src/javascripts/Application/DevMode.ts
@@ -5,6 +5,7 @@ export class DevMode {
   constructor(private application: WebApplicationInterface) {
     InternalFeatureService.get().enableFeature(InternalFeature.Vaults)
     InternalFeatureService.get().enableFeature(InternalFeature.UniversalSearch)
+    InternalFeatureService.get().enableFeature(InternalFeature.SearchEnhancements)
   }
 
   /** Valid only when running a mock event publisher on port 3124 */
diff --git a/packages/web/src/javascripts/Application/WebApplication.ts b/packages/web/src/javascripts/Application/WebApplication.ts
index aa27bd5b8..317240738 100644
--- a/packages/web/src/javascripts/Application/WebApplication.ts
+++ b/packages/web/src/javascripts/Application/WebApplication.ts
@@ -37,6 +37,7 @@ import {
   IsGlobalSpellcheckEnabled,
   IsMobileDevice,
   IsNativeIOS,
+  IsNativeAndroid,
   IsNativeMobileWeb,
   KeyboardService,
   PluginsServiceInterface,
@@ -257,12 +258,20 @@ export class WebApplication extends SNApplication implements WebApplicationInter
     return this.deps.get<IsNativeIOS>(Web_TYPES.IsNativeIOS).execute().getValue()
   }
 
+  isNativeAndroid(): boolean {
+    return this.deps.get<IsNativeAndroid>(Web_TYPES.IsNativeAndroid).execute().getValue()
+  }
+
+  canShowPurchaseFlow(): boolean {
+    return !this.isNativeAndroid()
+  }
+
   get isMobileDevice(): boolean {
     return this.deps.get<IsMobileDevice>(Web_TYPES.IsMobileDevice).execute().getValue()
   }
 
   get hideOutboundSubscriptionLinks() {
-    return this.isNativeIOS()
+    return this.isNativeIOS() || this.isNativeAndroid()
   }
 
   get mobileDevice(): MobileDeviceInterface {
diff --git a/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx b/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx
index 0e61145d1..932d7ba7f 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx
@@ -6,6 +6,7 @@ import Icon from '@/Components/Icon/Icon'
 import { useApplication } from '../ApplicationProvider'
 import ServerPicker from './ServerPicker/ServerPicker'
 import { DefaultHost } from '@standardnotes/snjs'
+import { c } from 'ttag'
 
 type Props = {
   disabled?: boolean
@@ -50,7 +51,7 @@ const AdvancedOptions: FunctionComponent<Props> = ({
 
       if (!identifier) {
         if (privateUsername?.length > 0) {
-          application.alerts.alert('Unable to compute private username.').catch(console.error)
+          application.alerts.alert(c('Error').t`Unable to compute private username.`).catch(console.error)
         }
         return
       }
@@ -112,7 +113,7 @@ const AdvancedOptions: FunctionComponent<Props> = ({
         onClick={toggleShowAdvanced}
       >
         <div className="flex items-center">
-          Advanced options
+          {c('Action').t`Advanced options`}
           <Icon type="chevron-down" className="ml-1 text-passive-1" />
         </div>
       </button>
@@ -124,12 +125,17 @@ const AdvancedOptions: FunctionComponent<Props> = ({
             <div className="mb-1 flex items-center justify-between">
               <Checkbox
                 name="private-workspace"
-                label="Private username mode"
+                label={c('Option').t`Private username mode`}
                 checked={isPrivateUsername}
                 disabled={disabled || isRecoveryCodes}
                 onChange={handleIsPrivateUsernameChange}
               />
-              <a href="https://standardnotes.com/help/80" target="_blank" rel="noopener noreferrer" title="Learn more">
+              <a
+                href="https://standardnotes.com/help/80"
+                target="_blank"
+                rel="noopener noreferrer"
+                title={c('Action').t`Learn more`}
+              >
                 <Icon type="info" className="text-neutral" />
               </a>
             </div>
@@ -140,7 +146,7 @@ const AdvancedOptions: FunctionComponent<Props> = ({
                   className={{ container: 'mb-2' }}
                   left={[<Icon type="account-circle" className="text-neutral" />]}
                   type="text"
-                  placeholder="Username"
+                  placeholder={c('Label').t`Username`}
                   value={privateUsername}
                   onChange={handlePrivateUsernameNameChange}
                   disabled={disabled || isRecoveryCodes}
@@ -154,7 +160,7 @@ const AdvancedOptions: FunctionComponent<Props> = ({
               <div className="mb-1 flex items-center justify-between">
                 <Checkbox
                   name="use-strict-signin"
-                  label="Use strict sign-in"
+                  label={c('Option').t`Use strict sign-in`}
                   checked={isStrictSignin}
                   disabled={disabled || isRecoveryCodes}
                   onChange={handleStrictSigninChange}
@@ -163,7 +169,7 @@ const AdvancedOptions: FunctionComponent<Props> = ({
                   href="https://standardnotes.com/help/security"
                   target="_blank"
                   rel="noopener noreferrer"
-                  title="Learn more"
+                  title={c('Action').t`Learn more`}
                 >
                   <Icon type="info" className="text-neutral" />
                 </a>
@@ -174,7 +180,7 @@ const AdvancedOptions: FunctionComponent<Props> = ({
               <div className="mb-1 flex items-center justify-between">
                 <Checkbox
                   name="recovery-codes"
-                  label="Use recovery code"
+                  label={c('Option').t`Use recovery code`}
                   checked={isRecoveryCodes}
                   disabled={disabled}
                   onChange={handleIsRecoveryCodesChange}
@@ -188,7 +194,7 @@ const AdvancedOptions: FunctionComponent<Props> = ({
                   className={{ container: 'mb-2' }}
                   left={[<Icon type="security" className="text-neutral" />]}
                   type="text"
-                  placeholder="Recovery code"
+                  placeholder={c('Label').t`Recovery code`}
                   value={recoveryCodes}
                   onChange={handleRecoveryCodesChange}
                   disabled={disabled}
diff --git a/packages/web/src/javascripts/Components/AccountMenu/ConfirmNoMergeDialog.tsx b/packages/web/src/javascripts/Components/AccountMenu/ConfirmNoMergeDialog.tsx
index 7888be217..e1719a591 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/ConfirmNoMergeDialog.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/ConfirmNoMergeDialog.tsx
@@ -2,6 +2,7 @@ import AlertDialog from '@/Components/AlertDialog/AlertDialog'
 import Button from '@/Components/Button/Button'
 import Icon from '@/Components/Icon/Icon'
 import { FunctionComponent } from 'react'
+import { c } from 'ttag'
 
 type Props = {
   onClose: () => void
@@ -12,7 +13,7 @@ const ConfirmNoMergeDialog: FunctionComponent<Props> = ({ onClose, onConfirm })
   return (
     <AlertDialog closeDialog={onClose}>
       <div className="flex items-center justify-between text-lg font-bold">
-        Delete local data?
+        {c('Title').t`Delete local data?`}
         <button className="rounded p-1 font-bold hover:bg-contrast" onClick={onClose}>
           <Icon type="close" />
         </button>
@@ -20,18 +21,18 @@ const ConfirmNoMergeDialog: FunctionComponent<Props> = ({ onClose, onConfirm })
       <div className="sk-panel-row">
         <div>
           <p className="text-base text-foreground lg:text-sm">
-            You have chosen not to merge your local data. If you proceed, your local notes and tags will be permanently
-            deleted and replaced with data from your account. This action cannot be undone.
+            {c('Info')
+              .t`You have chosen not to merge your local data. If you proceed, your local notes and tags will be permanently deleted and replaced with data from your account. This action cannot be undone.`}
           </p>
           <p className="mt-2 text-base font-semibold text-danger lg:text-sm">
-            Are you sure you want to continue without merging?
+            {c('Info').t`Are you sure you want to continue without merging?`}
           </p>
         </div>
       </div>
       <div className="mt-4 flex justify-end gap-2">
-        <Button onClick={onClose}>Cancel</Button>
+        <Button onClick={onClose}>{c('Action').t`Cancel`}</Button>
         <Button primary colorStyle="danger" onClick={onConfirm}>
-          Delete Local Data and Continue
+          {c('Action').t`Delete Local Data and Continue`}
         </Button>
       </div>
     </AlertDialog>
diff --git a/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx b/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx
index 77ef5cdae..1124f4617 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx
@@ -122,7 +122,7 @@ const ConfirmPassword: FunctionComponent<Props> = ({ setMenuPane, email, passwor
       }
 
       if (password !== confirmPassword) {
-        setError(STRING_NON_MATCHING_PASSWORDS)
+        setError(STRING_NON_MATCHING_PASSWORDS())
         setConfirmPassword('')
         passwordInputRef.current?.focus()
         return
diff --git a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
index 1e5ff8114..6eb132811 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
@@ -47,7 +47,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
         }
       })
       .catch(() => {
-        application.alerts.alert(STRING_GENERIC_SYNC_ERROR).catch(console.error)
+        application.alerts.alert(STRING_GENERIC_SYNC_ERROR()).catch(console.error)
       })
       .finally(() => {
         setIsSyncingInProgress(false)
@@ -69,9 +69,9 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
   }, [application])
 
   const openEmail = useCallback(() => {
-    const subject = 'Standard Notes Feedback'
+    const subject = c('MailtoSubject').t`Standard Notes Feedback`
 
-    const body = `App Version: ${application.version}`
+    const body = c('MailtoBody').t`App Version: ${application.version}`
 
     application.device.openUrl(
       `mailto:help@standardnotes.com?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`,
@@ -103,7 +103,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
   return (
     <>
       <div className="mb-1 mt-1 hidden items-center justify-between px-4 md:flex md:px-3">
-        <div className="text-lg font-bold lg:text-base">Account</div>
+        <div className="text-lg font-bold lg:text-base">{c('Title').t`Account`}</div>
         <div className="flex cursor-pointer" onClick={closeMenu}>
           <Icon type="close" className="text-neutral" />
         </div>
@@ -111,7 +111,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
       {user ? (
         <>
           <div className="mb-3 px-4 text-lg text-foreground md:px-3 lg:text-sm">
-            <div>You're signed in as:</div>
+            <div>{c('Info').t`You're signed in as:`}</div>
             <div className="wrap my-0.5 font-bold">{user.email}</div>
             <span className="text-neutral">{application.getHost.execute().getValue()}</span>
           </div>
@@ -119,13 +119,13 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
             {isSyncingInProgress ? (
               <div className="flex items-center font-semibold text-info">
                 <Spinner className="mr-2 h-5 w-5" />
-                Syncing...
+                {c('Status').t`Syncing...`}
               </div>
             ) : (
               <div className="flex items-start">
                 <Icon type="check-circle" className={`mr-2 text-success ${MenuItemIconSize}`} />
                 <div>
-                  <div className="font-semibold text-success">Last synced:</div>
+                  <div className="font-semibold text-success">{c('Label').t`Last synced:`}</div>
                   <div className="text-text">{lastSyncDate}</div>
                 </div>
               </div>
@@ -161,7 +161,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
           {user ? (
             <MenuItem onClick={openPreferences}>
               <Icon type="user" className={iconClassName} />
-              Account settings
+              {c('Action').t`Account settings`}
             </MenuItem>
           ) : (
             <>
@@ -182,18 +182,18 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
             }}
           >
             <Icon type="archive" className={iconClassName} />
-            Import
+            {c('Action').t`Import`}
           </MenuItem>
           {application.isNativeMobileWeb() && (
             <MenuItem onClick={openEmail}>
               <Icon type="email-filled" className={iconClassName} />
-              Email us
+              {c('Action').t`Email us`}
             </MenuItem>
           )}
           <MenuItem className="justify-between" onClick={openHelp}>
             <div className="flex items-center">
               <Icon type="help" className={iconClassName} />
-              Help &amp; feedback
+              {c('Action').t`Help & feedback`}
             </div>
             <span className="text-neutral">v{application.version}</span>
           </MenuItem>
@@ -205,7 +205,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
                 }}
               >
                 <Icon type="keyboard" className={iconClassName} />
-                Keyboard shortcuts
+                {c('Action').t`Keyboard shortcuts`}
                 {keyboardShortcutsHelpShortcut && (
                   <KeyboardShortcutIndicator shortcut={keyboardShortcutsHelpShortcut} className="ml-auto" />
                 )}
@@ -216,7 +216,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
                 }}
               >
                 <Icon type="info" className={iconClassName} />
-                Command palette
+                {c('Action').t`Command palette`}
                 {commandPaletteShortcut && (
                   <KeyboardShortcutIndicator shortcut={commandPaletteShortcut} className="ml-auto" />
                 )}
@@ -228,7 +228,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({ setMenuPane, closeMenu,
           <MenuSection>
             <MenuItem onClick={signOut}>
               <Icon type="signOut" className={iconClassName} />
-              Sign out workspace
+              {c('Action').t`Sign out workspace`}
             </MenuItem>
           </MenuSection>
         ) : null}
diff --git a/packages/web/src/javascripts/Components/AccountMenu/MergeLocalDataCheckbox.tsx b/packages/web/src/javascripts/Components/AccountMenu/MergeLocalDataCheckbox.tsx
index cd2e10b2c..39e1826af 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/MergeLocalDataCheckbox.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/MergeLocalDataCheckbox.tsx
@@ -1,6 +1,7 @@
 import Icon from '@/Components/Icon/Icon'
 import StyledTooltip from '@/Components/StyledTooltip/StyledTooltip'
 import { ChangeEventHandler, FunctionComponent } from 'react'
+import { c } from 'ttag'
 
 type Props = {
   checked: boolean
@@ -21,9 +22,10 @@ const MergeLocalDataCheckbox: FunctionComponent<Props> = ({ checked, onChange, d
         onChange={onChange}
         disabled={disabled}
       />
-      <span className="text-danger">Merge local data ({notesAndTagsCount} notes and tags)</span>
+      <span className="text-danger">{c('Option').t`Merge local data (${notesAndTagsCount} notes and tags)`}</span>
       <StyledTooltip
-        label="If unchecked, your local notes and tags will be permanently deleted and replaced with data from your account."
+        label={c('Info')
+          .t`If unchecked, your local notes and tags will be permanently deleted and replaced with data from your account.`}
         showOnMobile
         className="!z-modal !max-w-[30ch] whitespace-normal"
       >
diff --git a/packages/web/src/javascripts/Components/AccountMenu/ServerPicker/ServerPicker.tsx b/packages/web/src/javascripts/Components/AccountMenu/ServerPicker/ServerPicker.tsx
index 45f1ba51f..4e91bad8f 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/ServerPicker/ServerPicker.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/ServerPicker/ServerPicker.tsx
@@ -6,6 +6,7 @@ import { useApplication } from '@/Components/ApplicationProvider'
 import { isDesktopApplication } from '@/Utils'
 import RadioButtonGroup from '@/Components/RadioButtonGroup/RadioButtonGroup'
 import { DefaultHost } from '@standardnotes/snjs'
+import { c } from 'ttag'
 
 type Props = {
   className?: string
@@ -49,7 +50,7 @@ const ServerPicker = ({ className }: Props) => {
     } else if (type === 'home server') {
       if (!application.homeServer) {
         application.alerts
-          .alert('Home server is not running. Please open the prefences and home server tab to start it.')
+          .alert(c('Error').t`Home server is not running. Please open the prefences and home server tab to start it.`)
           .catch(console.error)
 
         return
@@ -58,7 +59,7 @@ const ServerPicker = ({ className }: Props) => {
       const homeServerUrl = await application.homeServer.getHomeServerUrl()
       if (!homeServerUrl) {
         application.alerts
-          .alert('Home server is not running. Please open the prefences and home server tab to start it.')
+          .alert(c('Error').t`Home server is not running. Please open the prefences and home server tab to start it.`)
           .catch(console.error)
 
         return
@@ -71,9 +72,9 @@ const ServerPicker = ({ className }: Props) => {
   const options = useMemo(
     () =>
       [
-        { label: 'Default', value: 'standard' },
-        { label: 'Custom', value: 'custom' },
-      ].concat(isDesktopApplication() ? [{ label: 'Home Server', value: 'home server' }] : []) as {
+        { label: c('Option').t`Default`, value: 'standard' },
+        { label: c('Option').t`Custom`, value: 'custom' },
+      ].concat(isDesktopApplication() ? [{ label: c('Option').t`Home Server`, value: 'home server' }] : []) as {
         label: string
         value: ServerType
       }[],
@@ -82,7 +83,7 @@ const ServerPicker = ({ className }: Props) => {
 
   return (
     <div className={`flex h-full flex-grow flex-col px-3 pb-1.5 ${className}`}>
-      <div className="mb-2 flex font-bold">Sync Server</div>
+      <div className="mb-2 flex font-bold">{c('Label').t`Sync Server`}</div>
       <RadioButtonGroup value={currentType} items={options} onChange={selectTab} />
       {currentType === 'custom' && (
         <DecoratedInput
diff --git a/packages/web/src/javascripts/Components/AccountMenu/User.tsx b/packages/web/src/javascripts/Components/AccountMenu/User.tsx
index 47a675eb8..7acd72344 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/User.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/User.tsx
@@ -1,6 +1,7 @@
 import { observer } from 'mobx-react-lite'
 import { User as UserType } from '@standardnotes/snjs'
 import { useApplication } from '../ApplicationProvider'
+import { c } from 'ttag'
 
 const User = () => {
   const application = useApplication()
@@ -12,9 +13,10 @@ const User = () => {
     <div className="sk-panel-section">
       {application.syncStatusController.errorMessage && (
         <div className="sk-notification danger">
-          <div className="sk-notification-title">Sync Unreachable</div>
+          <div className="sk-notification-title">{c('Title').t`Sync Unreachable`}</div>
           <div className="sk-notification-text">
-            Hmm...we can't seem to sync your account. The reason: {application.syncStatusController.errorMessage}
+            {c('Error')
+              .t`Hmm...we can't seem to sync your account. The reason: ${application.syncStatusController.errorMessage}`}
           </div>
           <a
             className="sk-a info-contrast sk-bold sk-panel-row"
@@ -22,7 +24,7 @@ const User = () => {
             rel="noopener"
             target="_blank"
           >
-            Need help?
+            {c('Action').t`Need help?`}
           </a>
         </div>
       )}
diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx
index e601fc897..30d5535f7 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx
@@ -8,6 +8,7 @@ import MenuItem from '@/Components/Menu/MenuItem'
 import WorkspaceMenuItem from './WorkspaceMenuItem'
 import { useApplication } from '@/Components/ApplicationProvider'
 import MenuSection from '@/Components/Menu/MenuSection'
+import { c } from 'ttag'
 
 type Props = {
   mainApplicationGroup: WebApplicationGroup
@@ -42,9 +43,9 @@ const WorkspaceSwitcherMenu: FunctionComponent<Props> = ({
 
   const signoutAll = useCallback(async () => {
     const confirmed = await application.alerts.confirm(
-      'Are you sure you want to sign out of all workspaces on this device?',
+      c('Info').t`Are you sure you want to sign out of all workspaces on this device?`,
       undefined,
-      'Sign out all',
+      c('Action').t`Sign out all`,
       ButtonType.Danger,
     )
     if (!confirmed) {
@@ -86,12 +87,12 @@ const WorkspaceSwitcherMenu: FunctionComponent<Props> = ({
       <MenuSection>
         <MenuItem onClick={addAnotherWorkspace}>
           <Icon type="user-add" className="mr-2 text-neutral" />
-          Add another workspace
+          {c('Action').t`Add another workspace`}
         </MenuItem>
         {!hideWorkspaceOptions && (
           <MenuItem onClick={signoutAll}>
             <Icon type="signOut" className="mr-2 text-neutral" />
-            Sign out all workspaces
+            {c('Action').t`Sign out all workspaces`}
           </MenuItem>
         )}
       </MenuSection>
diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx
index 845b3b7f0..4228eff34 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx
@@ -7,6 +7,7 @@ import WorkspaceSwitcherMenu from './WorkspaceSwitcherMenu'
 import MenuItem from '@/Components/Menu/MenuItem'
 import Popover from '@/Components/Popover/Popover'
 import { MenuItemIconSize } from '@/Constants/TailwindClassNames'
+import { c } from 'ttag'
 
 type Props = {
   mainApplicationGroup: WebApplicationGroup
@@ -25,12 +26,12 @@ const WorkspaceSwitcherOption: FunctionComponent<Props> = ({ mainApplicationGrou
       <MenuItem tabIndex={FOCUSABLE_BUT_NOT_TABBABLE} ref={buttonRef} onClick={toggleMenu} className="justify-between">
         <div className="flex items-center">
           <Icon type="user-switch" className={`mr-2 text-neutral ${MenuItemIconSize}`} />
-          Switch workspace
+          {c('Action').t`Switch workspace`}
         </div>
         <Icon type="chevron-right" className={`text-neutral ${MenuItemIconSize}`} />
       </MenuItem>
       <Popover
-        title="Switch workspace"
+        title={c('Action').t`Switch workspace`}
         align="end"
         anchorElement={buttonRef}
         className="pb-2"
diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
index 1a4aad1cd..d92d2cd76 100644
--- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
+++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
@@ -301,7 +301,7 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
                           {menuItem.uiFeature.featureIdentifier === NativeFeatureIdentifier.TYPES.SuperEditor &&
                             !isSelected(menuItem) &&
                             recommendSuper && (
-                              <Pill className="px-1.5 py-0.5 text-[9px]" style="info">
+                              <Pill className="px-1.5 py-0.5 text-[0.5625rem]" style="info">
                                 Recommended
                               </Pill>
                             )}
diff --git a/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx b/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx
index e2ace706a..daa7cbb1d 100644
--- a/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx
+++ b/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx
@@ -1,3 +1,4 @@
+import { classNames } from '@standardnotes/snjs'
 import { ChangeEventHandler, FunctionComponent } from 'react'
 
 type CheckboxProps = {
@@ -10,9 +11,15 @@ type CheckboxProps = {
 
 const Checkbox: FunctionComponent<CheckboxProps> = ({ name, checked, onChange, disabled, label }) => {
   return (
-    <label htmlFor={name} className="fit-content mb-2 flex items-center text-sm">
+    <label
+      htmlFor={name}
+      className={classNames(
+        'fit-content mb-2 flex items-center text-sm',
+        disabled ? 'cursor-not-allowed' : 'cursor-pointer',
+      )}
+    >
       <input
-        className="mr-2"
+        className={classNames('mr-2', disabled ? 'cursor-not-allowed' : 'cursor-pointer')}
         type="checkbox"
         name={name}
         id={name}
diff --git a/packages/web/src/javascripts/Components/ComponentView/NotEntitledBanner.tsx b/packages/web/src/javascripts/Components/ComponentView/NotEntitledBanner.tsx
index 42569ca35..f4ad97950 100644
--- a/packages/web/src/javascripts/Components/ComponentView/NotEntitledBanner.tsx
+++ b/packages/web/src/javascripts/Components/ComponentView/NotEntitledBanner.tsx
@@ -50,9 +50,11 @@ const NotEntitledBanner: FunctionComponent<Props> = ({ featureStatus, feature })
           </div>
         </div>
         <div className={'right'}>
-          <Button onClick={manageSubscription} primary colorStyle="success" small>
-            Manage subscription
-          </Button>
+          {application.canShowPurchaseFlow() && (
+            <Button onClick={manageSubscription} primary colorStyle="success" small>
+              Manage subscription
+            </Button>
+          )}
         </div>
       </div>
     </div>
diff --git a/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx b/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx
index 3756a0f1a..5d497c28d 100644
--- a/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx
+++ b/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx
@@ -1,5 +1,6 @@
 import { observer } from 'mobx-react-lite'
 import { useCallback, useRef } from 'react'
+import { c } from 'ttag'
 import { STRING_DELETE_ACCOUNT_CONFIRMATION } from '@/Constants/Strings'
 import Button from '@/Components/Button/Button'
 import { WebApplication } from '@/Application/WebApplication'
@@ -25,22 +26,22 @@ const ConfirmDeleteAccountModal = ({ application }: Props) => {
   return (
     <AlertDialog closeDialog={closeDialog}>
       <div className="flex items-center justify-between text-lg font-bold">
-        Delete account?
+        {c('Title').t`Delete account?`}
         <button className="rounded p-1 font-bold hover:bg-contrast" onClick={closeDialog}>
           <Icon type="close" />
         </button>
       </div>
       <div className="sk-panel-row">
         <div>
-          <p className="text-base text-foreground lg:text-sm">{STRING_DELETE_ACCOUNT_CONFIRMATION}</p>
+          <p className="text-base text-foreground lg:text-sm">{STRING_DELETE_ACCOUNT_CONFIRMATION()}</p>
         </div>
       </div>
       <div className="mt-4 flex justify-end gap-2">
         <Button ref={cancelRef} onClick={closeDialog}>
-          Cancel
+          {c('Action').t`Cancel`}
         </Button>
         <Button primary colorStyle="danger" onClick={confirm}>
-          Delete my account for good
+          {c('Action').t`Delete my account for good`}
         </Button>
       </div>
     </AlertDialog>
diff --git a/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx b/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx
index bd75a7a80..fadc31d46 100644
--- a/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx
+++ b/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx
@@ -8,6 +8,7 @@ import Button from '@/Components/Button/Button'
 import Icon from '../Icon/Icon'
 import AlertDialog from '../AlertDialog/AlertDialog'
 import HorizontalSeparator from '../Shared/HorizontalSeparator'
+import { c } from 'ttag'
 
 type Props = {
   application: WebApplication
@@ -37,22 +38,21 @@ const ConfirmSignoutModal: FunctionComponent<Props> = ({ application, applicatio
   return (
     <AlertDialog closeDialog={closeDialog}>
       <div className="flex items-center justify-between text-lg font-bold">
-        Sign out workspace?
+        {c('Title').t`Sign out workspace?`}
         <button className="rounded p-1 font-bold hover:bg-contrast" onClick={closeDialog}>
           <Icon type="close" />
         </button>
       </div>
       <div className="sk-panel-row">
         <div>
-          <p className="text-base text-foreground lg:text-sm">{STRING_SIGN_OUT_CONFIRMATION}</p>
+          <p className="text-base text-foreground lg:text-sm">{STRING_SIGN_OUT_CONFIRMATION()}</p>
           {showWorkspaceWarning && (
             <>
               <br />
               <p className="text-base text-foreground lg:text-sm">
-                <strong>Note: </strong>
-                Because you have other workspaces signed in, this sign out may leave logs and other metadata of your
-                session on this device. For a more robust sign out that performs a hard clear of all app-related data,
-                use the <i>Sign out all workspaces</i> option under <i>Switch workspace</i>.
+                <strong>{c('Label').t`Note:`} </strong>
+                {c('Info')
+                  .t`Because you have other workspaces signed in, this sign out may leave logs and other metadata of your session on this device. For a more robust sign out that performs a hard clear of all app-related data, use the "Sign out all workspaces" option under "Switch workspace".`}
               </p>
             </>
           )}
@@ -66,7 +66,8 @@ const ConfirmSignoutModal: FunctionComponent<Props> = ({ application, applicatio
             <div className="sk-panel-row"></div>
             <div>
               <p className="text-base text-foreground lg:text-sm">
-                Local backups are enabled for this workspace. Review your backup files manually to decide what to keep.
+                {c('Info')
+                  .t`Local backups are enabled for this workspace. Review your backup files manually to decide what to keep.`}
               </p>
               <button
                 className="sk-a mt-2 cursor-pointer rounded p-0 capitalize lg:text-sm"
@@ -74,7 +75,7 @@ const ConfirmSignoutModal: FunctionComponent<Props> = ({ application, applicatio
                   void application.fileBackups?.openAllDirectoriesContainingBackupFiles()
                 }}
               >
-                View backup files
+                {c('Action').t`View backup files`}
               </button>
             </div>
           </div>
@@ -83,10 +84,10 @@ const ConfirmSignoutModal: FunctionComponent<Props> = ({ application, applicatio
 
       <div className="mt-4 flex justify-end gap-2">
         <Button ref={cancelRef} onClick={closeDialog}>
-          Cancel
+          {c('Action').t`Cancel`}
         </Button>
         <Button primary colorStyle="danger" onClick={confirm}>
-          {application.hasAccount() ? 'Sign Out' : 'Delete Workspace'}
+          {application.hasAccount() ? c('Action').t`Sign Out` : c('Action').t`Delete Workspace`}
         </Button>
       </div>
     </AlertDialog>
diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
index c66d0e242..aaea8c3af 100644
--- a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
@@ -332,6 +332,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
                 itemListController={itemListController}
                 searchOptionsController={searchOptionsController}
                 hideOptions={shouldUseTableView}
+                showSearchEnhancements={application.featuresController.isSearchEnhancementsEnabled()}
               />
             )}
             <NoAccountWarning
diff --git a/packages/web/src/javascripts/Components/Footer/Footer.tsx b/packages/web/src/javascripts/Components/Footer/Footer.tsx
index 0bc7195f7..90a4d602b 100644
--- a/packages/web/src/javascripts/Components/Footer/Footer.tsx
+++ b/packages/web/src/javascripts/Components/Footer/Footer.tsx
@@ -287,12 +287,12 @@ class Footer extends AbstractComponent<Props, State> {
   securityUpdateClickHandler = async () => {
     if (
       await confirmDialog({
-        title: STRING_UPGRADE_ACCOUNT_CONFIRM_TITLE,
-        text: STRING_UPGRADE_ACCOUNT_CONFIRM_TEXT,
-        confirmButtonText: STRING_UPGRADE_ACCOUNT_CONFIRM_BUTTON,
+        title: STRING_UPGRADE_ACCOUNT_CONFIRM_TITLE(),
+        text: STRING_UPGRADE_ACCOUNT_CONFIRM_TEXT(),
+        confirmButtonText: STRING_UPGRADE_ACCOUNT_CONFIRM_BUTTON(),
       })
     ) {
-      preventRefreshing(STRING_CONFIRM_APP_QUIT_DURING_UPGRADE, async () => {
+      preventRefreshing(STRING_CONFIRM_APP_QUIT_DURING_UPGRADE(), async () => {
         await this.application.upgradeProtocolVersion()
       }).catch(console.error)
     }
diff --git a/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx b/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx
index 126a5ba5f..39504f163 100644
--- a/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx
+++ b/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx
@@ -18,6 +18,8 @@ const UpgradeNow = ({ application, featuresController, subscriptionContoller }:
   const onClick = useCallback(() => {
     if (hasAccount && application.isNativeIOS()) {
       application.showPremiumModal()
+    } else if (!application.canShowPurchaseFlow() && !hasAccount) {
+      application.showAccountMenu()
     } else {
       void application.openPurchaseFlow()
     }
@@ -27,6 +29,10 @@ const UpgradeNow = ({ application, featuresController, subscriptionContoller }:
     return null
   }
 
+  if (!application.canShowPurchaseFlow() && hasAccount) {
+    return null
+  }
+
   return (
     <div className="flex h-full items-center px-2">
       <button
diff --git a/packages/web/src/javascripts/Components/ImportModal/ImportModal.tsx b/packages/web/src/javascripts/Components/ImportModal/ImportModal.tsx
index 930b00d0f..f79460ef8 100644
--- a/packages/web/src/javascripts/Components/ImportModal/ImportModal.tsx
+++ b/packages/web/src/javascripts/Components/ImportModal/ImportModal.tsx
@@ -13,6 +13,7 @@ import ItemSelectionDropdown from '../ItemSelectionDropdown/ItemSelectionDropdow
 import { ContentType, SNTag } from '@standardnotes/snjs'
 import Button from '../Button/Button'
 import { ClassicFileReader } from '@standardnotes/filepicker'
+import { c } from 'ttag'
 
 const ImportModal = ({ importModalController }: { importModalController: ImportModalController }) => {
   const application = useApplication()
@@ -41,7 +42,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
   const modalActions: ModalAction[] = useMemo(
     () => [
       {
-        label: 'Import',
+        label: c('Action').t`Import`,
         type: 'primary',
         onClick: parseAndImport,
         hidden: !isReadyToImport,
@@ -49,7 +50,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
         disabled: !isReadyToImport || (addImportsToTag && !shouldCreateTag && !existingTagForImports),
       },
       {
-        label: importSuccessOrError ? 'Close' : 'Cancel',
+        label: importSuccessOrError ? c('Action').t`Close` : c('Action').t`Cancel`,
         type: 'cancel',
         onClick: close,
         mobileSlot: 'left',
@@ -77,7 +78,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
 
   return (
     <ModalOverlay isOpen={isVisible} close={close}>
-      <Modal title="Import" close={close} actions={modalActions} className="flex flex-col">
+      <Modal title={c('Title').t`Import`} close={close} actions={modalActions} className="flex flex-col">
         <div className="min-h-0 flex-grow overflow-y-auto px-4 py-4">
           {!files.length && <ImportModalInitialPage setFiles={setFiles} selectFiles={selectFiles} />}
           {files.length > 0 && (
@@ -101,7 +102,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
                   }}
                   small
                 >
-                  Add files
+                  {c('Action').t`Add files`}
                 </Button>
               )}
             </>
@@ -110,7 +111,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
         {files.length > 0 && (
           <div className="flex flex-col gap-3 border-t border-border px-4 py-4 md:gap-2 md:py-3">
             <Switch className="flex items-center gap-2" checked={addImportsToTag} onChange={setAddImportsToTag}>
-              <span className="text-sm">Add all imported notes to tag</span>
+              <span className="text-sm">{c('Label').t`Add all imported notes to tag`}</span>
             </Switch>
             {addImportsToTag && (
               <>
@@ -124,7 +125,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
                       setShouldCreateTag(true)
                     }}
                   />
-                  Create new tag
+                  {c('Label').t`Create new tag`}
                 </label>
                 <div className="flex flex-col gap-2">
                   <div className="flex items-center gap-2">
@@ -138,7 +139,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
                           setShouldCreateTag(false)
                         }}
                       />
-                      Add to existing tag
+                      {c('Label').t`Add to existing tag`}
                     </label>
                     {existingTagForImports && (
                       <LinkedItemBubble
@@ -156,7 +157,7 @@ const ImportModal = ({ importModalController }: { importModalController: ImportM
                     <div className="ml-8 md:ml-6">
                       <ItemSelectionDropdown
                         onSelection={(tag) => setExistingTagForImports(tag as SNTag)}
-                        placeholder="Select tag to add imported notes to..."
+                        placeholder={c('Placeholder').t`Select tag to add imported notes to...`}
                         contentTypes={[ContentType.TYPES.Tag]}
                       />
                     </div>
diff --git a/packages/web/src/javascripts/Components/ImportModal/ImportModalFileItem.tsx b/packages/web/src/javascripts/Components/ImportModal/ImportModalFileItem.tsx
index 6f3f18ad7..cb2f956ee 100644
--- a/packages/web/src/javascripts/Components/ImportModal/ImportModalFileItem.tsx
+++ b/packages/web/src/javascripts/Components/ImportModal/ImportModalFileItem.tsx
@@ -1,10 +1,11 @@
 import { ImportModalController, ImportModalFile } from '@/Components/ImportModal/ImportModalController'
-import { classNames, ContentType, pluralize } from '@standardnotes/snjs'
+import { classNames, ContentType } from '@standardnotes/snjs'
 import { ConversionResult, Importer } from '@standardnotes/ui-services'
 import { observer } from 'mobx-react-lite'
 import { useCallback, useEffect, useState } from 'react'
 import Icon from '../Icon/Icon'
 import { Disclosure, DisclosureContent, DisclosureProvider } from '@ariakit/react'
+import { c, msgid, ngettext } from 'ttag'
 
 const NoteImportTypeColors: Record<string, string> = {
   evernote: 'bg-[#14cc45] text-[#000]',
@@ -49,12 +50,17 @@ const countSuccessfulItemsByGroup = (successful: ConversionResult['successful'])
 }
 
 const ImportErroredAccordion = ({ errored }: { errored: ConversionResult['errored'] }) => {
+  const count = errored.length
   return (
     <DisclosureProvider>
       <Disclosure>
         <div className="flex items-center gap-1">
           <Icon type="warning" className="flex-shrink-0 text-danger" size="small" />
-          Could not import {errored.length} {pluralize(errored.length, 'item', 'items')} (click for details)
+          {ngettext(
+            msgid`Could not import ${count} item (click for details)`,
+            `Could not import ${count} items (click for details)`,
+            count,
+          )}
         </div>
       </Disclosure>
       <DisclosureContent className="w-full overflow-hidden pl-5">
@@ -77,9 +83,9 @@ const ImportFinishedStatus = ({ file }: { file: ImportModalFile }) => {
 
   const { notes, tags, files } = countSuccessfulItemsByGroup(file.successful)
 
-  const notesStatus = notes > 0 ? `${notes} ${pluralize(notes, 'note', 'notes')}` : ''
-  const tagsStatus = tags > 0 ? `${tags} ${pluralize(tags, 'tag', 'tags')}` : ''
-  const filesStatus = files > 0 ? `${files} ${pluralize(files, 'file', 'files')}` : ''
+  const notesStatus = notes > 0 ? ngettext(msgid`${notes} note`, `${notes} notes`, notes) : ''
+  const tagsStatus = tags > 0 ? ngettext(msgid`${tags} tag`, `${tags} tags`, tags) : ''
+  const filesStatus = files > 0 ? ngettext(msgid`${files} file`, `${files} files`, files) : ''
   const status = [notesStatus, tagsStatus, filesStatus].filter(Boolean).join(', ')
 
   return (
@@ -87,7 +93,7 @@ const ImportFinishedStatus = ({ file }: { file: ImportModalFile }) => {
       {file.successful.length > 0 && (
         <div className="flex items-center gap-1">
           <Icon type="check-circle-filled" className="flex-shrink-0 text-success" size="small" />
-          <span>{status} imported</span>
+          <span>{c('Info').t`${status} imported`}</span>
         </div>
       )}
       {file.errored.length > 0 && <ImportErroredAccordion errored={file.errored} />}
@@ -126,9 +132,14 @@ const ImportModalFileItem = ({
   useEffect(() => {
     const detect = async () => {
       setIsDetectingService(true)
-      const detectedService = await importer.detectService(file.file)
-      void setFileService(detectedService)
-      setIsDetectingService(false)
+      try {
+        const detectedService = await importer.detectService(file.file)
+        void setFileService(detectedService)
+      } catch {
+        void setFileService(null)
+      } finally {
+        setIsDetectingService(false)
+      }
     }
     if (file.service === undefined) {
       void detect()
@@ -151,14 +162,16 @@ const ImportModalFileItem = ({
         <div className="flex w-full flex-col overflow-hidden">
           <div>{file.file.name}</div>
           {isDetectingService ? (
-            <div className="text-xs opacity-75">Detecting service...</div>
+            <div className="text-xs opacity-75">{c('Status').t`Detecting service...`}</div>
           ) : (
             <div className={classNames(file.status !== 'finished' && 'line-clamp-3', 'w-full text-xs opacity-75')}>
-              {file.status === 'pending' && file.service && 'Ready to import'}
-              {file.status === 'pending' && !file.service && 'Could not auto-detect service. Please select manually.'}
-              {file.status === 'parsing' && 'Parsing...'}
-              {file.status === 'importing' && 'Importing...'}
-              {file.status === 'uploading-files' && 'Uploading and embedding files...'}
+              {file.status === 'pending' && file.service && c('Status').t`Ready to import`}
+              {file.status === 'pending' &&
+                !file.service &&
+                c('Status').t`Could not auto-detect service. Please select manually.`}
+              {file.status === 'parsing' && c('Status').t`Parsing...`}
+              {file.status === 'importing' && c('Status').t`Importing...`}
+              {file.status === 'uploading-files' && c('Status').t`Uploading and embedding files...`}
               {file.status === 'error' && file.error.message}
               <ImportFinishedStatus file={file} />
             </div>
@@ -192,7 +205,7 @@ const ImportModalFileItem = ({
                   <option value="super">Super</option>
                 </select>
                 <button
-                  aria-label="Choose service"
+                  aria-label={c('AriaLabel').t`Choose service`}
                   type="submit"
                   className="rounded border border-border bg-default p-1.5 hover:bg-contrast"
                 >
@@ -200,7 +213,7 @@ const ImportModalFileItem = ({
                 </button>
               </form>
               <button
-                aria-label="Cancel"
+                aria-label={c('AriaLabel').t`Cancel`}
                 className="ml-2 rounded border border-border bg-default p-1.5 hover:bg-contrast"
                 onClick={() => {
                   setChangingService(false)
@@ -211,7 +224,7 @@ const ImportModalFileItem = ({
             </>
           ) : (
             <button
-              aria-label="Change service"
+              aria-label={c('AriaLabel').t`Change service`}
               className="rounded border border-border bg-default p-1.5 hover:bg-contrast"
               onClick={() => {
                 setChangingService(true)
@@ -221,7 +234,7 @@ const ImportModalFileItem = ({
             </button>
           )}
           <button
-            aria-label="Remove"
+            aria-label={c('AriaLabel').t`Remove`}
             className="ml-2 rounded border border-border bg-default p-1.5 hover:bg-contrast"
             onClick={() => {
               removeFile(file.id)
diff --git a/packages/web/src/javascripts/Components/ImportModal/InitialPage.tsx b/packages/web/src/javascripts/Components/ImportModal/InitialPage.tsx
index 0816a7240..9cbcd5661 100644
--- a/packages/web/src/javascripts/Components/ImportModal/InitialPage.tsx
+++ b/packages/web/src/javascripts/Components/ImportModal/InitialPage.tsx
@@ -5,6 +5,7 @@ import Icon from '../Icon/Icon'
 import { useApplication } from '../ApplicationProvider'
 import { FeatureName } from '@/Controllers/FeatureName'
 import { NativeFeatureIdentifier, FeatureStatus } from '@standardnotes/snjs'
+import { c } from 'ttag'
 
 type Props = {
   setFiles: ImportModalController['setFiles']
@@ -27,10 +28,10 @@ const ImportModalInitialPage = ({ setFiles, selectFiles }: Props) => {
           setFiles(files)
         }}
       >
-        <div className="text-lg font-semibold">Drag and drop files to auto-detect and import</div>
-        <div className="text-sm">Or click to open file picker</div>
+        <div className="text-lg font-semibold">{c('Info').t`Drag and drop files to auto-detect and import`}</div>
+        <div className="text-sm">{c('Info').t`Or click to open file picker`}</div>
       </button>
-      <div className="my-4 w-full text-center">or import from:</div>
+      <div className="my-4 w-full text-center">{c('Info').t`or import from:`}</div>
       <div className="flex flex-wrap items-center justify-center gap-4">
         <Button className="flex items-center !py-2" onClick={() => selectFiles('evernote')}>
           <Icon type="evernote" className="mr-2 text-[#14cc45]" />
@@ -50,7 +51,7 @@ const ImportModalInitialPage = ({ setFiles, selectFiles }: Props) => {
         </Button>
         <Button className="flex items-center !py-2" onClick={() => selectFiles('plaintext')}>
           <Icon type="plain-text" className="mr-2 text-info" />
-          Plaintext / Markdown
+          {c('ImportSource').t`Plaintext / Markdown`}
         </Button>
         <Button className="flex items-center !py-2" onClick={() => selectFiles('html')}>
           <Icon type="rich-text" className="mr-2 text-accessory-tint-2" />
diff --git a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
index 1ec620c8b..2e8954edd 100644
--- a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
+++ b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
@@ -9,7 +9,7 @@ import {
 } from '@ariakit/react'
 import { classNames, DecryptedItem, naturalSort } from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
-import { useDeferredValue, useEffect, useState } from 'react'
+import { useDeferredValue, useEffect, useRef, useState } from 'react'
 import { useApplication } from '../ApplicationProvider'
 import LinkedItemMeta from '../LinkedItems/LinkedItemMeta'
 
@@ -17,6 +17,7 @@ type Props = {
   contentTypes: string[]
   placeholder: string
   onSelection: (item: DecryptedItem) => void
+  excludeUuids?: string[]
   className?: {
     input?: string
     popover?: string
@@ -24,28 +25,46 @@ type Props = {
   comboboxProps?: ComboboxStoreProps
 }
 
-const ItemSelectionDropdown = ({ contentTypes, placeholder, onSelection, comboboxProps, className = {} }: Props) => {
+const ItemSelectionDropdown = ({
+  contentTypes,
+  placeholder,
+  onSelection,
+  excludeUuids = [],
+  comboboxProps,
+  className = {},
+}: Props) => {
   const application = useApplication()
 
   const combobox = useComboboxStore(comboboxProps)
   const value = combobox.useState('value')
   const open = combobox.useState('open')
+  const previousValueRef = useRef(value)
+
   useEffect(() => {
-    if (value.length < 1 && open) {
+    const valueWasCleared = previousValueRef.current.length > 0 && value.length < 1
+
+    if (valueWasCleared && open) {
       combobox.setOpen(false)
     }
-  }, [combobox, open, value.length])
+
+    previousValueRef.current = value
+  }, [combobox, open, value])
 
   const searchQuery = useDeferredValue(value)
   const [items, setItems] = useState<DecryptedItem[]>([])
 
   useEffect(() => {
+    const excludedUuids = new Set(excludeUuids)
     const searchableItems = naturalSort(application.items.getItems(contentTypes), 'title')
     const filteredItems = searchableItems.filter((item) => {
+      if (excludedUuids.has(item.uuid)) {
+        return false
+      }
+
       return doesItemMatchSearchQuery(item, searchQuery, application)
     })
     setItems(filteredItems)
-  }, [searchQuery, application, contentTypes])
+  }, [searchQuery, application, contentTypes, excludeUuids])
 
   return (
     <div>
diff --git a/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx b/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx
index 813e2b82d..abb7ec60a 100644
--- a/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx
+++ b/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx
@@ -30,9 +30,11 @@ const NoSubscriptionBanner = ({
         <h1 className="sk-h3 m-0 text-sm font-semibold">{title}</h1>
       </div>
       <p className="col-start-1 col-end-3 m-0 mt-1 text-sm">{message}</p>
-      <Button primary small className="col-start-1 col-end-3 mt-3 justify-self-start uppercase" onClick={onClick}>
-        Upgrade Features
-      </Button>
+      {application.canShowPurchaseFlow() && (
+        <Button primary small className="col-start-1 col-end-3 mt-3 justify-self-start uppercase" onClick={onClick}>
+          Upgrade Features
+        </Button>
+      )}
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Components/PasswordWizard/FinishStep.tsx b/packages/web/src/javascripts/Components/PasswordWizard/FinishStep.tsx
index 344895503..ed3028c5b 100644
--- a/packages/web/src/javascripts/Components/PasswordWizard/FinishStep.tsx
+++ b/packages/web/src/javascripts/Components/PasswordWizard/FinishStep.tsx
@@ -1,3 +1,4 @@
+import { c } from 'ttag'
 import { CheckmarkCircle } from '../UIElements/CheckmarkCircle'
 
 export const FinishStep = () => {
@@ -8,8 +9,11 @@ export const FinishStep = () => {
           <CheckmarkCircle />
         </div>
         <div className="flex flex-col">
-          <div className="text-base font-bold">Your password has been successfully changed.</div>
-          <p>Ensure you are running the latest version of Standard Notes on all platforms for maximum compatibility.</p>
+          <div className="text-base font-bold">{c('Info').t`Your password has been successfully changed.`}</div>
+          <p>
+            {c('Info')
+              .t`Ensure you are running the latest version of Standard Notes on all platforms for maximum compatibility.`}
+          </p>
         </div>
       </div>
     </div>
diff --git a/packages/web/src/javascripts/Components/PasswordWizard/PasswordStep.tsx b/packages/web/src/javascripts/Components/PasswordWizard/PasswordStep.tsx
index 89bd666c8..9cf1fdf92 100644
--- a/packages/web/src/javascripts/Components/PasswordWizard/PasswordStep.tsx
+++ b/packages/web/src/javascripts/Components/PasswordWizard/PasswordStep.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react'
+import { c } from 'ttag'
 import DecoratedPasswordInput from '../Input/DecoratedPasswordInput'
 
 export const PasswordStep = ({
@@ -33,7 +34,7 @@ export const PasswordStep = ({
     <div className="flex flex-col pb-1.5">
       <form>
         <label htmlFor="password-wiz-current-password" className="mb-1 block">
-          Current Password
+          {c('Label').t`Current Password`}
         </label>
 
         <DecoratedPasswordInput
@@ -47,7 +48,7 @@ export const PasswordStep = ({
         <div className="min-h-2" />
 
         <label htmlFor="password-wiz-new-password" className="mb-1 block">
-          New Password
+          {c('Label').t`New Password`}
         </label>
 
         <DecoratedPasswordInput
@@ -60,7 +61,7 @@ export const PasswordStep = ({
         <div className="min-h-2" />
 
         <label htmlFor="password-wiz-confirm-new-password" className="mb-1 block">
-          Confirm New Password
+          {c('Label').t`Confirm New Password`}
         </label>
 
         <DecoratedPasswordInput
diff --git a/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx b/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx
index 6e0e8328c..05a013e0b 100644
--- a/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx
+++ b/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx
@@ -6,14 +6,21 @@ import Spinner from '../Spinner/Spinner'
 import { PasswordStep } from './PasswordStep'
 import { FinishStep } from './FinishStep'
 import { PreprocessingStep } from './PreprocessingStep'
+import { c } from 'ttag'
 
 interface Props {
   application: WebApplication
   dismissModal: () => void
 }
 
+enum ContinueTitle {
+  Default,
+  Generating,
+  Finish,
+}
+
 type State = {
-  continueTitle: string
+  continueTitle: ContinueTitle
   formData: FormData
   isContinuing?: boolean
   lockContinue?: boolean
@@ -22,10 +29,6 @@ type State = {
   step: Steps
 }
 
-const DEFAULT_CONTINUE_TITLE = 'Continue'
-const GENERATING_CONTINUE_TITLE = 'Generating Keys...'
-const FINISH_CONTINUE_TITLE = 'Finish'
-
 enum Steps {
   PreprocessingStep = 'preprocessing-step',
   PasswordStep = 'password-step',
@@ -46,7 +49,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
 
     const baseState = {
       formData: {},
-      continueTitle: DEFAULT_CONTINUE_TITLE,
+      continueTitle: ContinueTitle.Default,
     }
 
     if (props.application.featuresController.isVaultsEnabled()) {
@@ -82,7 +85,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
   resetContinueState() {
     this.setState({
       showSpinner: false,
-      continueTitle: DEFAULT_CONTINUE_TITLE,
+      continueTitle: ContinueTitle.Default,
       isContinuing: false,
     })
   }
@@ -109,7 +112,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
     this.setState({
       isContinuing: true,
       showSpinner: true,
-      continueTitle: GENERATING_CONTINUE_TITLE,
+      continueTitle: ContinueTitle.Generating,
     })
 
     const valid = await this.validateCurrentPassword()
@@ -127,7 +130,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
     this.setState({
       isContinuing: false,
       showSpinner: false,
-      continueTitle: FINISH_CONTINUE_TITLE,
+      continueTitle: ContinueTitle.Finish,
       step: Steps.FinishStep,
     })
   }
@@ -136,16 +139,18 @@ class PasswordWizard extends AbstractComponent<Props, State> {
     const currentPassword = this.state.formData.currentPassword
     const newPass = this.state.formData.newPassword
     if (!currentPassword || currentPassword.length === 0) {
-      this.application.alerts.alert('Please enter your current password.').catch(console.error)
+      this.application.alerts.alert(c('Error').t`Please enter your current password.`).catch(console.error)
       return false
     }
 
     if (!newPass || newPass.length === 0) {
-      this.application.alerts.alert('Please enter a new password.').catch(console.error)
+      this.application.alerts.alert(c('Error').t`Please enter a new password.`).catch(console.error)
       return false
     }
     if (newPass !== this.state.formData.newPasswordConfirmation) {
-      this.application.alerts.alert('Your new password does not match its confirmation.').catch(console.error)
+      this.application.alerts
+        .alert(c('Error').t`Your new password does not match its confirmation.`)
+        .catch(console.error)
       this.setFormDataState({
         status: undefined,
       }).catch(console.error)
@@ -154,7 +159,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
 
     if (!this.application.sessions.getUser()?.email) {
       this.application.alerts
-        .alert("We don't have your email stored. Please sign out then log back in to fix this issue.")
+        .alert(c('Error').t`We don't have your email stored. Please sign out then log back in to fix this issue.`)
         .catch(console.error)
       this.setFormDataState({
         status: undefined,
@@ -165,7 +170,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
     const success = await this.application.validateAccountPassword(this.state.formData.currentPassword as string)
     if (!success) {
       this.application.alerts
-        .alert('The current password you entered is not correct. Please try again.')
+        .alert(c('Error').t`The current password you entered is not correct. Please try again.`)
         .catch(console.error)
     }
     return success
@@ -180,7 +185,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
     })
 
     await this.setFormDataState({
-      status: 'Processing encryption keys…',
+      status: c('Status').t`Processing encryption keys…`,
     })
 
     const newPassword = this.state.formData.newPassword
@@ -197,13 +202,13 @@ class PasswordWizard extends AbstractComponent<Props, State> {
 
     if (!success) {
       this.setFormDataState({
-        status: 'Unable to process your password. Please try again.',
+        status: c('Status').t`Unable to process your password. Please try again.`,
       }).catch(console.error)
     } else {
       this.setState({
         formData: {
           ...this.state.formData,
-          status: 'Successfully changed password.',
+          status: c('Status').t`Successfully changed password.`,
         },
       })
     }
@@ -212,7 +217,9 @@ class PasswordWizard extends AbstractComponent<Props, State> {
 
   dismiss = () => {
     if (this.state.processing) {
-      this.application.alerts.alert('Cannot close window until pending tasks are complete.').catch(console.error)
+      this.application.alerts
+        .alert(c('Error').t`Cannot close window until pending tasks are complete.`)
+        .catch(console.error)
     } else {
       this.props.dismissModal()
     }
@@ -266,25 +273,37 @@ class PasswordWizard extends AbstractComponent<Props, State> {
     }
   }
 
+  continueLabel(): string {
+    switch (this.state.continueTitle) {
+      case ContinueTitle.Generating:
+        return c('Action').t`Generating Keys...`
+      case ContinueTitle.Finish:
+        return c('Action').t`Finish`
+      case ContinueTitle.Default:
+      default:
+        return c('Action').t`Continue`
+    }
+  }
+
   override render() {
     return (
       <div className="sn-component h-full w-full md:h-auto md:w-auto" id="password-wizard">
         <Modal
-          title={'Change Password'}
+          title={c('Title').t`Change Password`}
           close={this.dismiss}
           actions={[
             {
-              label: 'Cancel',
+              label: c('Action').t`Cancel`,
               onClick: this.dismiss,
               type: 'cancel',
               mobileSlot: 'left',
             },
             {
               label:
-                this.state.continueTitle === GENERATING_CONTINUE_TITLE && isMobileScreen() ? (
+                this.state.continueTitle === ContinueTitle.Generating && isMobileScreen() ? (
                   <Spinner className="h-4 w-4" />
                 ) : (
-                  this.state.continueTitle
+                  this.continueLabel()
                 ),
               onClick: this.nextStep,
               type: 'primary',
diff --git a/packages/web/src/javascripts/Components/PasswordWizard/PreprocessingStep.tsx b/packages/web/src/javascripts/Components/PasswordWizard/PreprocessingStep.tsx
index e61fcde03..7a110e300 100644
--- a/packages/web/src/javascripts/Components/PasswordWizard/PreprocessingStep.tsx
+++ b/packages/web/src/javascripts/Components/PasswordWizard/PreprocessingStep.tsx
@@ -1,6 +1,7 @@
 import Spinner from '../Spinner/Spinner'
 import { useApplication } from '../ApplicationProvider'
 import { useCallback, useEffect, useState } from 'react'
+import { c } from 'ttag'
 
 export const PreprocessingStep = ({
   onContinue,
@@ -76,7 +77,7 @@ export const PreprocessingStep = ({
     return (
       <div className="flex flex-row items-center gap-3">
         <Spinner className="h-3 w-3" />
-        <p className="">Checking for data conflicts...</p>
+        <p className="">{c('Status').t`Checking for data conflicts...`}</p>
       </div>
     )
   }
@@ -88,9 +89,8 @@ export const PreprocessingStep = ({
   return (
     <div className="flex flex-col">
       <p>
-        You have pending vault invites. Changing your password will delete these invites. It is recommended you accept
-        or decline these invites before changing your password. If you choose to continue, these invites will be
-        deleted.
+        {c('Info')
+          .t`You have pending vault invites. Changing your password will delete these invites. It is recommended you accept or decline these invites before changing your password. If you choose to continue, these invites will be deleted.`}
       </p>
     </div>
   )
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
index 7fe9aa7da..2e1dec482 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
@@ -18,6 +18,7 @@ type Props = {
 
 const AccountPreferences = ({ application }: Props) => {
   const isUsingThirdPartyServer = !application.sessions.isSignedIntoFirstPartyServer()
+  const isSharedSubscription = application.subscriptionController.isSharedSubscription
 
   return (
     <PreferencesPane>
@@ -30,7 +31,7 @@ const AccountPreferences = ({ application }: Props) => {
         </>
       )}
       <Subscription />
-      <SubscriptionSharing application={application} />
+      {!isSharedSubscription && <SubscriptionSharing application={application} />}
       {application.hasAccount() && application.featuresController.entitledToFiles && (
         <FilesSection application={application} />
       )}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx
index 91c72d418..feb613cc7 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx
@@ -1,4 +1,5 @@
 import { FunctionComponent, useCallback, useMemo, useState } from 'react'
+import { c } from 'ttag'
 import { WebApplication } from '@/Application/WebApplication'
 import { useBeforeUnload } from '@/Hooks/useBeforeUnload'
 import ChangeEmailForm from './ChangeEmailForm'
@@ -6,9 +7,9 @@ import ChangeEmailSuccess from './ChangeEmailSuccess'
 import Modal, { ModalAction } from '@/Components/Modal/Modal'
 
 enum SubmitButtonTitles {
-  Default = 'Continue',
-  GeneratingKeys = 'Generating Keys...',
-  Finish = 'Finish',
+  Default,
+  GeneratingKeys,
+  Finish,
 }
 
 enum Steps {
@@ -35,7 +36,7 @@ const ChangeEmail: FunctionComponent<Props> = ({ onCloseDialog, application }) =
 
   const validateCurrentPassword = useCallback(async () => {
     if (!currentPassword || currentPassword.length === 0) {
-      applicationAlertService.alert('Please enter your current password.').catch(console.error)
+      applicationAlertService.alert(c('Error').t`Please enter your current password.`).catch(console.error)
 
       return false
     }
@@ -43,7 +44,7 @@ const ChangeEmail: FunctionComponent<Props> = ({ onCloseDialog, application }) =
     const success = await application.validateAccountPassword(currentPassword)
     if (!success) {
       applicationAlertService
-        .alert('The current password you entered is not correct. Please try again.')
+        .alert(c('Error').t`The current password you entered is not correct. Please try again.`)
         .catch(console.error)
 
       return false
@@ -73,7 +74,9 @@ const ChangeEmail: FunctionComponent<Props> = ({ onCloseDialog, application }) =
 
   const dismiss = useCallback(() => {
     if (lockContinue) {
-      applicationAlertService.alert('Cannot close window until pending tasks are complete.').catch(console.error)
+      applicationAlertService
+        .alert(c('Error').t`Cannot close window until pending tasks are complete.`)
+        .catch(console.error)
     } else {
       onCloseDialog()
     }
@@ -115,32 +118,46 @@ const ChangeEmail: FunctionComponent<Props> = ({ onCloseDialog, application }) =
 
   const handleDialogClose = useCallback(() => {
     if (lockContinue) {
-      applicationAlertService.alert('Cannot close window until pending tasks are complete.').catch(console.error)
+      applicationAlertService
+        .alert(c('Error').t`Cannot close window until pending tasks are complete.`)
+        .catch(console.error)
     } else {
       onCloseDialog()
     }
   }, [applicationAlertService, lockContinue, onCloseDialog])
 
+  const submitButtonLabel = useMemo(() => {
+    switch (submitButtonTitle) {
+      case SubmitButtonTitles.GeneratingKeys:
+        return c('Action').t`Generating Keys...`
+      case SubmitButtonTitles.Finish:
+        return c('Action').t`Finish`
+      case SubmitButtonTitles.Default:
+      default:
+        return c('Action').t`Continue`
+    }
+  }, [submitButtonTitle])
+
   const modalActions = useMemo(
     (): ModalAction[] => [
       {
-        label: 'Cancel',
+        label: c('Action').t`Cancel`,
         onClick: handleDialogClose,
         type: 'cancel',
         mobileSlot: 'left',
       },
       {
-        label: submitButtonTitle,
+        label: submitButtonLabel,
         onClick: handleSubmit,
         type: 'primary',
         mobileSlot: 'right',
       },
     ],
-    [handleDialogClose, handleSubmit, submitButtonTitle],
+    [handleDialogClose, handleSubmit, submitButtonLabel],
   )
 
   return (
-    <Modal title="Change Email" close={handleDialogClose} actions={modalActions}>
+    <Modal title={c('Title').t`Change Email`} close={handleDialogClose} actions={modalActions}>
       <div className="px-4.5 py-4">
         {currentStep === Steps.InitialStep && (
           <ChangeEmailForm setNewEmail={setNewEmail} setCurrentPassword={setCurrentPassword} />
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx
index 08b2602f2..aa46b10b9 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailForm.tsx
@@ -1,6 +1,7 @@
 import DecoratedInput from '@/Components/Input/DecoratedInput'
 import DecoratedPasswordInput from '@/Components/Input/DecoratedPasswordInput'
 import { Dispatch, SetStateAction, FunctionComponent } from 'react'
+import { c } from 'ttag'
 
 type Props = {
   setNewEmail: Dispatch<SetStateAction<string>>
@@ -14,7 +15,7 @@ const ChangeEmailForm: FunctionComponent<Props> = ({ setNewEmail, setCurrentPass
     <div className="flex w-full flex-col">
       <div className="mb-3">
         <label className={labelClassName} htmlFor="change-email-email-input">
-          New Email
+          {c('Label').t`New Email`}
         </label>
         <DecoratedInput
           type="email"
@@ -26,7 +27,7 @@ const ChangeEmailForm: FunctionComponent<Props> = ({ setNewEmail, setCurrentPass
       </div>
       <div className="mb-2">
         <label className={labelClassName} htmlFor="change-email-password-input">
-          Current Password
+          {c('Label').t`Current Password`}
         </label>
         <DecoratedPasswordInput
           id="change-email-password-input"
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailSuccess.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailSuccess.tsx
index c06aa8b28..a4d600824 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailSuccess.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmailSuccess.tsx
@@ -1,12 +1,13 @@
 import { FunctionComponent } from 'react'
+import { c } from 'ttag'
 
 const ChangeEmailSuccess: FunctionComponent = () => {
   return (
     <div>
-      <div className={'mb-2 font-bold text-info'}>Your email has been successfully changed.</div>
+      <div className={'mb-2 font-bold text-info'}>{c('Info').t`Your email has been successfully changed.`}</div>
       <p>
-        Please ensure you are running the latest version of Standard Notes on all platforms to ensure maximum
-        compatibility.
+        {c('Info')
+          .t`Please ensure you are running the latest version of Standard Notes on all platforms to ensure maximum compatibility.`}
       </p>
     </div>
   )
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ClearSessionDataView.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ClearSessionDataView.tsx
index 25c7b0128..7e1fa9e68 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ClearSessionDataView.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ClearSessionDataView.tsx
@@ -5,6 +5,7 @@ import { Title, Text } from '../../PreferencesComponents/Content'
 import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
 import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
 import { useApplication } from '@/Components/ApplicationProvider'
+import { c } from 'ttag'
 
 const ClearSessionDataView: FunctionComponent = () => {
   const application = useApplication()
@@ -12,11 +13,12 @@ const ClearSessionDataView: FunctionComponent = () => {
   return (
     <PreferencesGroup>
       <PreferencesSegment>
-        <Title>Clear workspace</Title>
-        <Text className="mb-3">Remove all data related to the current workspace from the application.</Text>
+        <Title>{c('Title').t`Clear workspace`}</Title>
+        <Text className="mb-3">{c('Info')
+          .t`Remove all data related to the current workspace from the application.`}</Text>
         <Button
           colorStyle="danger"
-          label="Clear workspace"
+          label={c('Action').t`Clear workspace`}
           onClick={() => {
             application.accountMenuController.setSigningOut(true)
           }}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx
index 2543d1508..e1e32911e 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx
@@ -10,6 +10,7 @@ import PasswordWizard from '@/Components/PasswordWizard/PasswordWizard'
 import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
 import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
 import ModalOverlay from '@/Components/Modal/ModalOverlay'
+import { c, jt } from 'ttag'
 
 type Props = {
   application: WebApplication
@@ -34,28 +35,27 @@ const Credentials: FunctionComponent<Props> = ({ application }: Props) => {
 
   const closeChangeEmailDialog = () => setIsChangeEmailDialogOpen(false)
 
+  const emailSpan = <span className="wrap font-bold">{user?.email}</span>
+  const passwordDateSpan = <span className="font-bold">{passwordCreatedOn}</span>
+
   return (
     <>
       <PreferencesGroup>
         <PreferencesSegment>
-          <Title>Credentials</Title>
-          <Subtitle>Email</Subtitle>
-          <Text>
-            You're signed in as <span className="wrap font-bold">{user?.email}</span>
-          </Text>
+          <Title>{c('Title').t`Credentials`}</Title>
+          <Subtitle>{c('Subtitle').t`Email`}</Subtitle>
+          <Text>{jt`You're signed in as ${emailSpan}`}</Text>
           <Button
             className="mt-3 min-w-20"
-            label="Change email"
+            label={c('Action').t`Change email`}
             onClick={() => {
               setIsChangeEmailDialogOpen(true)
             }}
           />
           <HorizontalSeparator classes="my-4" />
-          <Subtitle>Password</Subtitle>
-          <Text>
-            Current password was set on <span className="font-bold">{passwordCreatedOn}</span>
-          </Text>
-          <Button className="mt-3 min-w-20" label="Change password" onClick={presentPasswordWizard} />
+          <Subtitle>{c('Subtitle').t`Password`}</Subtitle>
+          <Text>{jt`Current password was set on ${passwordDateSpan}`}</Text>
+          <Button className="mt-3 min-w-20" label={c('Action').t`Change password`} onClick={presentPasswordWizard} />
           <ModalOverlay isOpen={isChangeEmailDialogOpen} close={closeChangeEmailDialog}>
             <ChangeEmail onCloseDialog={closeChangeEmailDialog} application={application} />
           </ModalOverlay>
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx
index 9d398852e..69eeacd61 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx
@@ -4,6 +4,7 @@ import { Text, Title } from '@/Components/Preferences/PreferencesComponents/Cont
 import Button from '@/Components/Button/Button'
 import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup'
 import { WebApplication } from '@/Application/WebApplication'
+import { c } from 'ttag'
 
 type Props = {
   application: WebApplication
@@ -16,12 +17,13 @@ const DeleteAccount = ({ application }: Props) => {
   return (
     <PreferencesGroup>
       <PreferencesSegment>
-        <Title>Delete account</Title>
-        <Text>This action is irreversible. After deletion completes, you will be signed out on all devices.</Text>
+        <Title>{c('Title').t`Delete account`}</Title>
+        <Text>{c('Info')
+          .t`This action is irreversible. After deletion completes, you will be signed out on all devices.`}</Text>
         <div className="mt-3 flex flex-row flex-wrap gap-3">
           <Button
             colorStyle="danger"
-            label="Delete my account"
+            label={c('Action').t`Delete my account`}
             onClick={() => {
               application.accountMenuController.setDeletingAccount(true)
             }}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx
index c2c5a9083..ca9bf873c 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx
@@ -17,6 +17,7 @@ import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/Pre
 import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment'
 import Spinner from '@/Components/Spinner/Spinner'
 import NoProSubscription from '../NoProSubscription'
+import { c, jt } from 'ttag'
 
 type Props = {
   application: WebApplication
@@ -37,7 +38,7 @@ const Email: FunctionComponent<Props> = ({ application }: Props) => {
       await application.settings.updateSetting(settingName, payload, false)
       return true
     } catch (e) {
-      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING).catch(console.error)
+      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING()).catch(console.error)
       return false
     }
   }
@@ -47,7 +48,7 @@ const Email: FunctionComponent<Props> = ({ application }: Props) => {
       await application.settings.updateSubscriptionSetting(settingName, payload, false)
       return true
     } catch (e) {
-      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING).catch(console.error)
+      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING()).catch(console.error)
       return false
     }
   }
@@ -117,27 +118,27 @@ const Email: FunctionComponent<Props> = ({ application }: Props) => {
     }
   }
 
+  const subscriptionBold = <span className="font-bold">{c('Label').t`subscription`}</span>
+
   return (
     <PreferencesGroup>
       <PreferencesSegment>
-        <Title>Email</Title>
+        <Title>{c('Title').t`Email`}</Title>
         <div>
           <div className="flex items-start justify-between gap-2 md:items-center">
             <div className="flex flex-col">
-              <Subtitle>Mute sign-in notification emails</Subtitle>
+              <Subtitle>{c('Subtitle').t`Mute sign-in notification emails`}</Subtitle>
               {isMuteSignInEmailsFeatureAvailable ? (
                 <Text>
-                  Disables email notifications when a new sign-in occurs on your account. (Email notifications are
-                  available only to paid subscribers).
+                  {c('Info')
+                    .t`Disables email notifications when a new sign-in occurs on your account. (Email notifications are available only to paid subscribers).`}
                 </Text>
               ) : (
                 <NoProSubscription
                   application={application}
                   text={
                     <span>
-                      Sign-in notification emails are available only on a{' '}
-                      <span className="font-bold">subscription</span> plan. Please upgrade in order to enable sign-in
-                      notifications.
+                      {jt`Sign-in notification emails are available only on a ${subscriptionBold} plan. Please upgrade in order to enable sign-in notifications.`}
                     </span>
                   }
                 />
@@ -157,8 +158,8 @@ const Email: FunctionComponent<Props> = ({ application }: Props) => {
           <HorizontalSeparator classes="my-4" />
           <div className="flex items-start justify-between gap-2 md:items-center">
             <div className="flex flex-col">
-              <Subtitle>Mute marketing notification emails</Subtitle>
-              <Text>Disables email notifications with special deals and promotions.</Text>
+              <Subtitle>{c('Subtitle').t`Mute marketing notification emails`}</Subtitle>
+              <Text>{c('Info').t`Disables email notifications with special deals and promotions.`}</Text>
             </div>
             {isLoading ? (
               <Spinner className="h-5 w-5 flex-shrink-0" />
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx
index 53c418a9c..394504fec 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx
@@ -18,6 +18,8 @@ const NoProSubscription: FunctionComponent<Props> = ({ application, text }) => {
     try {
       if (application.isNativeIOS()) {
         application.showPremiumModal()
+      } else if (application.hasValidFirstPartySubscription()) {
+        void application.openSubscriptionDashboard.execute()
       } else {
         void application.openPurchaseFlow()
       }
@@ -38,7 +40,7 @@ const NoProSubscription: FunctionComponent<Props> = ({ application, text }) => {
         {!application.hideOutboundSubscriptionLinks && (
           <LinkButton className="mr-3 mt-3 min-w-20" label="Learn More" link={window.plansUrl as string} />
         )}
-        {application.hasAccount() && (
+        {application.hasAccount() && application.canShowPurchaseFlow() && (
           <Button className="mt-3 min-w-20" primary label="Upgrade" onClick={onPurchaseClick} />
         )}
       </div>
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx
index 53796f663..1a41705c2 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx
@@ -8,6 +8,7 @@ import { Subtitle, Title, Text } from '../../PreferencesComponents/Content'
 import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
 import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
 import ClearSessionDataView from './ClearSessionDataView'
+import { c } from 'ttag'
 
 type Props = {
   application: WebApplication
@@ -18,27 +19,27 @@ const SignOutView: FunctionComponent<Props> = observer(({ application }) => {
     <>
       <PreferencesGroup>
         <PreferencesSegment>
-          <Title>Sign out</Title>
-          <Subtitle>Other devices</Subtitle>
-          <Text>Want to sign out on all devices except this one?</Text>
+          <Title>{c('Title').t`Sign out`}</Title>
+          <Subtitle>{c('Subtitle').t`Other devices`}</Subtitle>
+          <Text>{c('Info').t`Want to sign out on all devices except this one?`}</Text>
           <div className="mt-3 flex flex-row flex-wrap gap-3">
             <Button
-              label="Sign out other sessions"
+              label={c('Action').t`Sign out other sessions`}
               onClick={() => {
                 application.accountMenuController.setOtherSessionsSignOut(true)
               }}
             />
-            <Button label="Manage sessions" onClick={() => application.openSessionsModal()} />
+            <Button label={c('Action').t`Manage sessions`} onClick={() => application.openSessionsModal()} />
           </div>
         </PreferencesSegment>
         <HorizontalSeparator classes="my-4" />
         <PreferencesSegment>
-          <Subtitle>This workspace</Subtitle>
-          <Text>Remove all data related to the current workspace from the application.</Text>
+          <Subtitle>{c('Subtitle').t`This workspace`}</Subtitle>
+          <Text>{c('Info').t`Remove all data related to the current workspace from the application.`}</Text>
           <Button
             className="mt-3"
             colorStyle="danger"
-            label="Sign out workspace"
+            label={c('Action').t`Sign out workspace`}
             onClick={() => {
               application.accountMenuController.setSigningOut(true)
             }}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx
index 90bdd8d36..dbbbe272f 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx
@@ -36,7 +36,7 @@ const NoSubscription: FunctionComponent<Props> = ({ application }) => {
         {!application.hideOutboundSubscriptionLinks && (
           <LinkButton className="mr-3 mt-3 min-w-20" label="Learn More" link={window.plansUrl as string} />
         )}
-        {application.hasAccount() && (
+        {application.hasAccount() && application.canShowPurchaseFlow() && (
           <Button className="mt-3 min-w-20" primary label="Subscribe" onClick={onPurchaseClick} />
         )}
       </div>
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
index 5e02fc7d7..cb4f72041 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx
@@ -5,6 +5,7 @@ import { useApplication } from '@/Components/ApplicationProvider'
 
 const SubscriptionInformation = () => {
   const application = useApplication()
+  const isSharedSubscription = application.subscriptionController.isSharedSubscription
 
   const manageSubscription = async () => {
     void application.openSubscriptionDashboard.execute()
@@ -13,7 +14,9 @@ const SubscriptionInformation = () => {
   return (
     <>
       <SubscriptionStatusText />
-      <Button className="mr-3 mt-3 min-w-20" label="Manage subscription" onClick={manageSubscription} />
+      {!isSharedSubscription && application.canShowPurchaseFlow() && (
+        <Button className="mr-3 mt-3 min-w-20" label="Manage subscription" onClick={manageSubscription} />
+      )}
     </>
   )
 }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
index 03875fcbb..46c540748 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionStatusText.tsx
@@ -11,8 +11,16 @@ const SubscriptionStatusText = () => {
     isUserSubscriptionExpired,
     isUserSubscriptionCanceled,
   } = application.subscriptions
+  const isSharedSubscription = application.subscriptionController.isSharedSubscription
 
   const expirationDateString = userSubscriptionExpirationDate?.toLocaleString()
+  const sharedMessage = isSharedSubscription ? (
+    <>
+      <br />
+      <br />
+      This subscription has been shared with you and can only be managed by the owner.
+    </>
+  ) : null
 
   if (isUserSubscriptionCanceled) {
     return (
@@ -29,6 +37,7 @@ const SubscriptionStatusText = () => {
           <span className="font-bold">but will remain valid until {expirationDateString}</span>
         )}
         . You may resubscribe below if you wish.
+        {sharedMessage}
       </Text>
     )
   }
@@ -43,6 +52,7 @@ const SubscriptionStatusText = () => {
         </span>{' '}
         subscription <span className="font-bold">expired on {expirationDateString}</span>. You may resubscribe below if
         you wish.
+        {sharedMessage}
       </Text>
     )
   }
@@ -54,7 +64,7 @@ const SubscriptionStatusText = () => {
         Standard Notes{userSubscriptionName ? ' ' : ''}
         {userSubscriptionName}
       </span>{' '}
-      subscription will be <span className="font-bold">renewed on {expirationDateString}</span>.
+      subscription will be <span className="font-bold">renewed on {expirationDateString}</span>.{sharedMessage}
     </Text>
   )
 }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx
index 4c15753ea..e5ff64d6f 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx
@@ -9,6 +9,7 @@ import { WebApplication } from '@/Application/WebApplication'
 import { formatLastSyncDate } from '@/Utils/DateUtils'
 import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
 import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
+import { c, jt } from 'ttag'
 
 type Props = {
   application: WebApplication
@@ -27,24 +28,24 @@ const Sync: FunctionComponent<Props> = ({ application }: Props) => {
     })
     setIsSyncingInProgress(false)
     if (response && (response as any).error) {
-      application.alerts.alert(STRING_GENERIC_SYNC_ERROR).catch(console.error)
+      application.alerts.alert(STRING_GENERIC_SYNC_ERROR()).catch(console.error)
     } else {
       setLastSyncDate(formatLastSyncDate(application.sync.getLastSyncDate() as Date))
     }
   }
 
+  const lastSyncSpan = <span className="font-bold">{c('Info').t`on ${lastSyncDate}`}</span>
+
   return (
     <PreferencesGroup>
       <PreferencesSegment>
         <div className="flex flex-row items-center">
           <div className="flex flex-grow flex-col">
-            <Title>Sync</Title>
-            <Text>
-              Last synced <span className="font-bold">on {lastSyncDate}</span>
-            </Text>
+            <Title>{c('Title').t`Sync`}</Title>
+            <Text>{jt`Last synced ${lastSyncSpan}`}</Text>
             <Button
               className="mt-3 min-w-20"
-              label="Sync now"
+              label={c('Action').t`Sync now`}
               disabled={isSyncingInProgress}
               onClick={doSynchronization}
             />
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx
index f1bd12b8d..b5cb3a5c9 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx
@@ -21,6 +21,7 @@ import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
 import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
 import Spinner from '@/Components/Spinner/Spinner'
 import { downloadOrShareBlobBasedOnPlatform } from '@/Utils/DownloadOrShareBasedOnPlatform'
+import { c } from 'ttag'
 
 type Props = {
   application: WebApplication
@@ -104,7 +105,7 @@ const DataBackups = ({ application }: Props) => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const readFile = async (file: File): Promise<any> => {
     if (file.type === 'application/zip') {
-      application.alerts.alert(STRING_IMPORTING_ZIP_FILE).catch(console.error)
+      application.alerts.alert(STRING_IMPORTING_ZIP_FILE()).catch(console.error)
       return
     }
 
@@ -115,7 +116,7 @@ const DataBackups = ({ application }: Props) => {
           const data = JSON.parse(e.target?.result as string)
           resolve(data)
         } catch (e) {
-          application.alerts.alert(STRING_INVALID_IMPORT_FILE).catch(console.error)
+          application.alerts.alert(STRING_INVALID_IMPORT_FILE()).catch(console.error)
         }
       }
       reader.readAsText(file)
@@ -129,7 +130,7 @@ const DataBackups = ({ application }: Props) => {
 
     setIsImportDataLoading(false)
 
-    let statusText = STRING_IMPORT_SUCCESS
+    let statusText = STRING_IMPORT_SUCCESS()
     if (result.isFailed()) {
       statusText = result.getError()
     } else if (result.getValue().errorCount) {
@@ -162,7 +163,7 @@ const DataBackups = ({ application }: Props) => {
       await performImport(data)
     } else {
       setIsImportDataLoading(false)
-      void alertDialog({ text: STRING_UNSUPPORTED_BACKUP_FILE_VERSION })
+      void alertDialog({ text: STRING_UNSUPPORTED_BACKUP_FILE_VERSION() })
     }
   }
 
@@ -187,32 +188,32 @@ const DataBackups = ({ application }: Props) => {
     <>
       <PreferencesGroup>
         <PreferencesSegment>
-          <Title>Data backups</Title>
-          <Subtitle>Download a backup of all your text-based data</Subtitle>
+          <Title>{c('Title').t`Data backups`}</Title>
+          <Subtitle>{c('Subtitle').t`Download a backup of all your text-based data`}</Subtitle>
 
           {isEncryptionEnabled && (
             <form className="sk-panel-form sk-panel-row">
               <div className="flex items-center gap-2">
                 <label className="flex items-center gap-2">
                   <input type="radio" onChange={() => setIsBackupEncrypted(true)} checked={isBackupEncrypted} />
-                  <span className="text-base font-medium md:text-sm">Encrypted</span>
+                  <span className="text-base font-medium md:text-sm">{c('Label').t`Encrypted`}</span>
                 </label>
                 <label className="flex items-center gap-2">
                   <input type="radio" onChange={() => setIsBackupEncrypted(false)} checked={!isBackupEncrypted} />
-                  <span className="text-base font-medium md:text-sm">Decrypted</span>
+                  <span className="text-base font-medium md:text-sm">{c('Label').t`Decrypted`}</span>
                 </label>
               </div>
             </form>
           )}
 
-          <Button onClick={downloadDataArchive} label="Download backup" className="mt-2" />
+          <Button onClick={downloadDataArchive} label={c('Action').t`Download backup`} className="mt-2" />
         </PreferencesSegment>
         <HorizontalSeparator classes="my-4" />
         <PreferencesSegment>
-          <Subtitle>Import a previously saved backup file</Subtitle>
+          <Subtitle>{c('Subtitle').t`Import a previously saved backup file`}</Subtitle>
 
           <div className="mt-3 flex flex-row items-center">
-            <Button label="Import backup" onClick={handleImportFile} />
+            <Button label={c('Action').t`Import backup`} onClick={handleImportFile} />
             <input type="file" ref={fileInputRef} onChange={importFileSelected} className="hidden" />
             {isImportDataLoading && <Spinner className="ml-4" />}
           </div>
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx
index bfe1c3918..680431988 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx
@@ -61,7 +61,7 @@ const EmailBackups = ({ application }: Props) => {
       await application.settings.updateSetting(settingName, payload, false)
       return true
     } catch (e) {
-      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING).catch(console.error)
+      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING()).catch(console.error)
       return false
     }
   }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx
index 5d8390987..fb4bb633b 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx
@@ -24,7 +24,7 @@ const Privacy: FunctionComponent<Props> = ({ application }: Props) => {
       await application.settings.updateSetting(settingName, payload, false)
       return true
     } catch (e) {
-      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING).catch(console.error)
+      application.alerts.alert(STRING_FAILED_TO_UPDATE_USER_SETTING()).catch(console.error)
       return false
     }
   }
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx
index 4c967d171..0b3f9d4d6 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx
@@ -80,17 +80,17 @@ const WhatsNew = ({ application }: { application: WebApplication }) => {
                 <div className="flex items-start">
                   <Title className="mb-3 flex">{version.version}</Title>
                   {version.version === appVersion && (
-                    <div className="ml-2 select-none rounded bg-info px-2 py-1 text-[10px] font-bold text-info-contrast">
+                    <div className="ml-2 select-none rounded bg-info px-2 py-1 text-[0.625rem] font-bold text-info-contrast">
                       Your Version
                     </div>
                   )}
                   {isLatest && (
-                    <div className="ml-2 select-none rounded bg-success px-2 py-1 text-[10px] font-bold text-success-contrast">
+                    <div className="ml-2 select-none rounded bg-success px-2 py-1 text-[0.625rem] font-bold text-success-contrast">
                       Latest Version
                     </div>
                   )}
                   {isUnreadVersion && (
-                    <div className="ml-2 select-none rounded bg-success px-2 py-1 text-[10px] font-bold text-success-contrast">
+                    <div className="ml-2 select-none rounded bg-success px-2 py-1 text-[0.625rem] font-bold text-success-contrast">
                       New
                     </div>
                   )}
diff --git a/packages/web/src/javascripts/Components/Preferences/PreferencesComponents/Content.tsx b/packages/web/src/javascripts/Components/Preferences/PreferencesComponents/Content.tsx
index 281289ad1..1a23979d2 100644
--- a/packages/web/src/javascripts/Components/Preferences/PreferencesComponents/Content.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/PreferencesComponents/Content.tsx
@@ -53,6 +53,8 @@ type PillProps = Props & {
 export const Pill: FunctionComponent<PillProps> = ({ children, className, style }) => {
   const colorClass = getColorsForPrimaryVariant(style)
   return (
-    <div className={classNames('ml-2 rounded px-2 py-1 text-[10px] font-bold', className, colorClass)}>{children}</div>
+    <div className={classNames('ml-2 rounded px-2 py-1 text-[0.625rem] font-bold', className, colorClass)}>
+      {children}
+    </div>
   )
 }
diff --git a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/SuccessPrompt.tsx b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/SuccessPrompt.tsx
index 51c3fcae4..cddd34c54 100644
--- a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/SuccessPrompt.tsx
+++ b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/SuccessPrompt.tsx
@@ -23,7 +23,7 @@ export const SuccessPrompt = ({
           className="mx-auto mb-5 flex h-24 w-24 items-center justify-center rounded-[50%] bg-contrast"
           aria-hidden={true}
         >
-          <Icon className={'h-24 w-24 px-7 py-2 text-[50px]'} size={'custom'} type={'🎉'} />
+          <Icon className={'h-24 w-24 px-7 py-2 text-[3.125rem]'} size={'custom'} type={'🎉'} />
         </div>
         <div className="mb-1 text-center text-lg font-bold">Your purchase was successful!</div>
       </div>
diff --git a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx
index ab39b5749..108ddf159 100644
--- a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx
+++ b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx
@@ -110,16 +110,18 @@ export const UpgradePrompt = ({
           )}
         </div>
       </div>
-      <button
-        onClick={handleClick}
-        className={classNames(
-          'no-border cursor-pointer rounded bg-info py-2 font-bold text-info-contrast hover:brightness-125 focus:brightness-125',
-          preferHorizontalLayout ? 'w-full px-4 md:ml-auto md:w-auto' : 'my-2 w-full',
-        )}
-        ref={ctaRef}
-      >
-        Upgrade
-      </button>
+      {application.canShowPurchaseFlow() && (
+        <button
+          onClick={handleClick}
+          className={classNames(
+            'no-border cursor-pointer rounded bg-info py-2 font-bold text-info-contrast hover:brightness-125 focus:brightness-125',
+            preferHorizontalLayout ? 'w-full px-4 md:ml-auto md:w-auto' : 'my-2 w-full',
+          )}
+          ref={ctaRef}
+        >
+          Upgrade
+        </button>
+      )}
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx
index 73866f4c1..200ccb4e0 100644
--- a/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx
+++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionContentLocked.tsx
@@ -37,15 +37,17 @@ const RevisionContentLocked: FunctionComponent = () => {
         <div className="leading-140% mb-4 text-passive-0">
           {getPremiumContentCopy(planName)}. Learn more about our other plans to upgrade your history capacity.
         </div>
-        <Button
-          primary
-          label="Discover plans"
-          onClick={() => {
-            if (window.plansUrl) {
-              window.location.assign(window.plansUrl)
-            }
-          }}
-        />
+        {application.canShowPurchaseFlow() && (
+          <Button
+            primary
+            label="Discover plans"
+            onClick={() => {
+              if (window.plansUrl) {
+                window.location.assign(window.plansUrl)
+              }
+            }}
+          />
+        )}
       </div>
     </div>
   )
diff --git a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
index 5eaf25df4..afd8d2234 100644
--- a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
+++ b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
@@ -1,8 +1,10 @@
 import { ItemListController } from '@/Controllers/ItemList/ItemListController'
 import { KeyboardKey } from '@standardnotes/ui-services'
-import { useCallback, KeyboardEventHandler, useRef } from 'react'
+import { useCallback, KeyboardEventHandler, useRef, useState } from 'react'
 import SearchOptions from '@/Components/SearchOptions/SearchOptions'
+import SearchFilterSheet from '@/Components/SearchOptions/SearchFilterSheet'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
 import Icon from '../Icon/Icon'
 import DecoratedInput from '../Input/DecoratedInput'
 import { observer } from 'mobx-react-lite'
@@ -14,13 +16,49 @@ type Props = {
   itemListController: ItemListController
   searchOptionsController: SearchOptionsController
   hideOptions?: boolean
+  showSearchEnhancements?: boolean
 }
 
-const SearchBar = ({ itemListController, searchOptionsController, hideOptions = false }: Props) => {
+type SearchFilterButtonProps = {
+  activeFilterCount: number
+  isOpen: boolean
+  onClick: () => void
+}
+
+const SearchFilterButton = ({ activeFilterCount, isOpen, onClick }: SearchFilterButtonProps) => (
+  <button
+    type="button"
+    className={classNames(
+      'relative flex flex-shrink-0 cursor-pointer border-0 bg-transparent p-0',
+      isOpen ? 'text-info' : 'text-passive-1 hover:text-info',
+    )}
+    onMouseDown={(event) => event.preventDefault()}
+    onClick={onClick}
+    aria-label="Search filters"
+    aria-expanded={isOpen}
+  >
+    <Icon type="tune" className="h-4.5 w-4.5" />
+    {activeFilterCount > 0 && (
+      <span className="absolute -right-1 -top-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-0.5 text-[10px] font-semibold leading-none text-info-contrast">
+        {activeFilterCount}
+      </span>
+    )}
+  </button>
+)
+
+const SearchBar = ({
+  itemListController,
+  searchOptionsController,
+  hideOptions = false,
+  showSearchEnhancements = false,
+}: Props) => {
   const searchBarRef = useRef<HTMLDivElement>(null)
   const searchInputRef = useRef<HTMLInputElement>(null)
+  const [isFilterPanelOpen, setIsFilterPanelOpen] = useState(false)
+  const isMobileScreen = useMediaQuery(MutuallyExclusiveMediaQueryBreakpoints.sm)
 
   const { noteFilterText, setNoteFilterText, clearFilterText, onFilterEnter } = itemListController
+  const { activeSearchFilterCount } = searchOptionsController
 
   const onNoteFilterTextChange = useCallback(
     (text: string) => {
@@ -43,6 +81,47 @@ const SearchBar = ({ itemListController, searchOptionsController, hideOptions =
     searchInputRef.current?.focus()
   }, [clearFilterText])
 
+  const toggleFilterPanel = useCallback(() => {
+    setIsFilterPanelOpen((current) => !current)
+  }, [])
+
+  const closeFilterPanel = useCallback(() => {
+    setIsFilterPanelOpen(false)
+  }, [])
+
+  const searchOptionsVisibilityClass = (() => {
+    if (hideOptions) {
+      return 'hidden'
+    }
+
+    if (showSearchEnhancements) {
+      if (isMobileScreen) {
+        return 'hidden'
+      }
+
+      return isFilterPanelOpen ? 'flex' : 'hidden'
+    }
+
+    if (!noteFilterText) {
+      return 'hidden group-focus-within:flex'
+    }
+
+    return undefined
+  })()
+
+  const rightDecorations = showSearchEnhancements
+    ? [
+        <div key="search-actions" className="flex items-center gap-1">
+          {noteFilterText && <ClearInputButton onClick={onClearSearch} />}
+          <SearchFilterButton
+            activeFilterCount={activeSearchFilterCount}
+            isOpen={isFilterPanelOpen}
+            onClick={toggleFilterPanel}
+          />
+        </div>,
+      ]
+    : [noteFilterText && <ClearInputButton key="clear-search" onClick={onClearSearch} />].filter(Boolean)
+
   return (
     <div className="group pb-0.5 pt-3" role="search" ref={searchBarRef}>
       <DecoratedInput
@@ -58,18 +137,21 @@ const SearchBar = ({ itemListController, searchOptionsController, hideOptions =
         onChange={onNoteFilterTextChange}
         onKeyUp={onNoteFilterKeyUp}
         left={[<Icon type="search" className="mr-1 h-4.5 w-4.5 flex-shrink-0 text-passive-1" />]}
-        right={[noteFilterText && <ClearInputButton onClick={onClearSearch} />]}
+        right={rightDecorations}
         roundedFull
       />
 
-      <div
-        className={classNames(
-          'animate-fade-from-top',
-          hideOptions ? 'hidden' : !noteFilterText && 'hidden group-focus-within:flex',
-        )}
-      >
-        <SearchOptions searchOptions={searchOptionsController} />
+      <div className={classNames('animate-fade-from-top w-full', searchOptionsVisibilityClass)}>
+        <SearchOptions searchOptions={searchOptionsController} showSearchEnhancements={showSearchEnhancements} />
       </div>
+
+      {showSearchEnhancements && isMobileScreen && (
+        <SearchFilterSheet
+          open={isFilterPanelOpen && !hideOptions}
+          onClose={closeFilterPanel}
+          searchOptions={searchOptionsController}
+        />
+      )}
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
new file mode 100644
index 000000000..4c695618a
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
@@ -0,0 +1,53 @@
+import Checkbox from '@/Components/Checkbox/Checkbox'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { classNames } from '@standardnotes/snjs'
+import { observer } from 'mobx-react-lite'
+import SearchBubbles from './SearchBubbles'
+import SearchOptionsSection, { ClearFilterButton } from './SearchOptionsSection'
+import SearchTagFilters from './SearchTagFilters'
+
+type Props = {
+  searchOptions: SearchOptionsController
+  className?: string
+}
+
+const EnhancedSearchOptionsContent = ({ searchOptions, className }: Props) => {
+  const { noteTitleOnly, tagFilterList, activeSearchFilterCount } = searchOptions
+
+  return (
+    <div className={classNames('flex w-full flex-col gap-2', className)}>
+      <div className="flex flex-col gap-2" onMouseDown={(event) => event.preventDefault()}>
+        <div className="flex items-start justify-between gap-2">
+          <Checkbox
+            name="search-note-title-only"
+            label="Search titles only"
+            checked={noteTitleOnly}
+            onChange={(event) => searchOptions.setNoteTitleOnly(event.target.checked)}
+          />
+          {activeSearchFilterCount > 0 && (
+            <ClearFilterButton onClick={searchOptions.clearAllFilters}>Clear all filters</ClearFilterButton>
+          )}
+        </div>
+
+        <SearchOptionsSection label="Include">
+          <div className="flex flex-wrap gap-2">
+            <SearchBubbles searchOptions={searchOptions} />
+          </div>
+        </SearchOptionsSection>
+      </div>
+
+      <SearchOptionsSection
+        label="Filter by tag"
+        action={
+          tagFilterList.length > 0 ? (
+            <ClearFilterButton onClick={searchOptions.clearTagFilters}>Clear tag filters</ClearFilterButton>
+          ) : undefined
+        }
+      >
+        <SearchTagFilters searchOptions={searchOptions} />
+      </SearchOptionsSection>
+    </div>
+  )
+}
+
+export default observer(EnhancedSearchOptionsContent)
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
new file mode 100644
index 000000000..c5ba1cfc5
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
@@ -0,0 +1,30 @@
+import Bubble from '@/Components/Bubble/Bubble'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { observer } from 'mobx-react-lite'
+import { useCallback } from 'react'
+
+type Props = {
+  searchOptions: SearchOptionsController
+}
+
+const SearchBubbles = ({ searchOptions }: Props) => {
+  const { includeProtectedContents, includeArchived, includeTrashed } = searchOptions
+
+  const toggleIncludeProtectedContents = useCallback(async () => {
+    await searchOptions.toggleIncludeProtectedContents()
+  }, [searchOptions])
+
+  return (
+    <>
+      <Bubble
+        label="Protected Contents"
+        selected={includeProtectedContents}
+        onSelect={toggleIncludeProtectedContents}
+      />
+      <Bubble label="Archived" selected={includeArchived} onSelect={searchOptions.toggleIncludeArchived} />
+      <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
+    </>
+  )
+}
+
+export default observer(SearchBubbles)
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx
new file mode 100644
index 000000000..8d0474916
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx
@@ -0,0 +1,35 @@
+import MobilePopoverContent from '@/Components/Popover/MobilePopoverContent'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { useAndroidBackHandler } from '@/NativeMobileWeb/useAndroidBackHandler'
+import { observer } from 'mobx-react-lite'
+import { useEffect } from 'react'
+import EnhancedSearchOptionsContent from './EnhancedSearchOptionsContent'
+
+type Props = {
+  open: boolean
+  onClose: () => void
+  searchOptions: SearchOptionsController
+}
+
+const SearchFilterSheet = ({ open, onClose, searchOptions }: Props) => {
+  const addAndroidBackHandler = useAndroidBackHandler()
+
+  useEffect(() => {
+    if (!open) {
+      return
+    }
+
+    return addAndroidBackHandler(() => {
+      onClose()
+      return true
+    })
+  }, [addAndroidBackHandler, onClose, open])
+
+  return (
+    <MobilePopoverContent open={open} requestClose={onClose} title="Search filters" id="search-filters" className="p-4">
+      <EnhancedSearchOptionsContent searchOptions={searchOptions} />
+    </MobilePopoverContent>
+  )
+}
+
+export default observer(SearchFilterSheet)
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
index 89829a3ea..63e86746d 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
@@ -1,32 +1,23 @@
-import { observer } from 'mobx-react-lite'
-import Bubble from '@/Components/Bubble/Bubble'
-import { useCallback } from 'react'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { observer } from 'mobx-react-lite'
+import EnhancedSearchOptionsContent from './EnhancedSearchOptionsContent'
+import SearchBubbles from './SearchBubbles'
 
 type Props = {
   searchOptions: SearchOptionsController
+  showSearchEnhancements?: boolean
 }
 
-const SearchOptions = ({ searchOptions }: Props) => {
-  const { includeProtectedContents, includeArchived, includeTrashed } = searchOptions
+const SearchOptions = ({ searchOptions, showSearchEnhancements = false }: Props) => {
+  if (!showSearchEnhancements) {
+    return (
+      <div className="mt-3 flex flex-wrap gap-2" onMouseDown={(event) => event.preventDefault()}>
+        <SearchBubbles searchOptions={searchOptions} />
+      </div>
+    )
+  }
 
-  const toggleIncludeProtectedContents = useCallback(async () => {
-    await searchOptions.toggleIncludeProtectedContents()
-  }, [searchOptions])
-
-  return (
-    <div className="mt-3 flex flex-wrap gap-2" onMouseDown={(e) => e.preventDefault()}>
-      <Bubble
-        label="Protected Contents"
-        selected={includeProtectedContents}
-        onSelect={toggleIncludeProtectedContents}
-      />
-
-      <Bubble label="Archived" selected={includeArchived} onSelect={searchOptions.toggleIncludeArchived} />
-
-      <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
-    </div>
-  )
+  return <EnhancedSearchOptionsContent searchOptions={searchOptions} className="mt-2" />
 }
 
 export default observer(SearchOptions)
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchOptionsSection.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchOptionsSection.tsx
new file mode 100644
index 000000000..c8edb58e3
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchOptionsSection.tsx
@@ -0,0 +1,35 @@
+import { ReactNode } from 'react'
+
+type ClearFilterButtonProps = {
+  onClick: () => void
+  children: ReactNode
+}
+
+export const ClearFilterButton = ({ onClick, children }: ClearFilterButtonProps) => (
+  <button
+    type="button"
+    className="mb-2 cursor-pointer border-0 bg-transparent p-0 text-xs text-info hover:underline"
+    onMouseDown={(event) => event.preventDefault()}
+    onClick={onClick}
+  >
+    {children}
+  </button>
+)
+
+type SearchOptionsSectionProps = {
+  label: string
+  children: ReactNode
+  action?: ReactNode
+}
+
+const SearchOptionsSection = ({ label, children, action }: SearchOptionsSectionProps) => (
+  <div>
+    <div className="mb-1 flex items-center justify-between gap-2">
+      <div className="text-xs text-passive-0">{label}</div>
+      {action}
+    </div>
+    {children}
+  </div>
+)
+
+export default SearchOptionsSection
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx
new file mode 100644
index 000000000..e7d5712ba
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx
@@ -0,0 +1,49 @@
+import ItemSelectionDropdown from '@/Components/ItemSelectionDropdown/ItemSelectionDropdown'
+import LinkedItemBubble from '@/Components/LinkedItems/LinkedItemBubble'
+import { useApplication } from '@/Components/ApplicationProvider'
+import { ElementIds } from '@/Constants/ElementIDs'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { createLinkFromItem } from '@/Utils/Items/Search/createLinkFromItem'
+import { ContentType, SNTag } from '@standardnotes/snjs'
+import { observer } from 'mobx-react-lite'
+
+type Props = {
+  searchOptions: SearchOptionsController
+}
+
+const SearchTagFilters = ({ searchOptions }: Props) => {
+  const application = useApplication()
+  const { tagFilterList } = searchOptions
+  const selected = application.navigationController.selected
+
+  const excludeUuids = tagFilterList.map((tag) => tag.uuid)
+  if (selected instanceof SNTag && !excludeUuids.includes(selected.uuid)) {
+    excludeUuids.push(selected.uuid)
+  }
+
+  return (
+    <div className="flex flex-wrap items-center gap-2">
+      {tagFilterList.map((tag) => (
+        <LinkedItemBubble
+          key={tag.uuid}
+          className="m-0"
+          link={createLinkFromItem(tag, 'linked')}
+          unlinkItem={async (item) => {
+            searchOptions.removeTagFilter(item as SNTag)
+            document.getElementById(ElementIds.SearchBar)?.focus()
+          }}
+          isBidirectional={false}
+          inlineFlex={true}
+        />
+      ))}
+      <ItemSelectionDropdown
+        onSelection={(item) => searchOptions.addTagFilter(item as SNTag)}
+        placeholder="Add tag..."
+        contentTypes={[ContentType.TYPES.Tag]}
+        excludeUuids={excludeUuids}
+      />
+    </div>
+  )
+}
+
+export default observer(SearchTagFilters)
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
index 549e36d2c..d317950f4 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
@@ -59,19 +59,23 @@ const CompoundPredicateBuilder = ({ controller }: Props) => {
                 </option>
               ))}
             </select>
-            <select
-              className="rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
-              value={predicate.operator}
-              onChange={(event) => {
-                setPredicate(index, { operator: event.target.value as PredicateOperator })
-              }}
-            >
-              {AllNonCompoundPredicateOperators.map((operator) => (
-                <option key={operator} value={operator}>
-                  {operator}
-                </option>
-              ))}
-            </select>
+            {PredicateKeypathTypes[predicate.keypath as PredicateKeypath] === 'tag' ? (
+              <div className="shrink-0 px-2 py-1.5 text-sm">include</div>
+            ) : (
+              <select
+                className="rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
+                value={predicate.operator}
+                onChange={(event) => {
+                  setPredicate(index, { operator: event.target.value as PredicateOperator })
+                }}
+              >
+                {AllNonCompoundPredicateOperators.map((operator) => (
+                  <option key={operator} value={operator}>
+                    {operator}
+                  </option>
+                ))}
+              </select>
+            )}
             {predicate.keypath && (
               <PredicateValue
                 keypath={predicate.keypath as PredicateKeypath}
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts
index e6ad10b19..6d6666375 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts
@@ -11,6 +11,16 @@ const getEmptyPredicate = (): PredicateJsonForm => {
   }
 }
 
+const toTagsPredicate = (tagTitle: PredicateJsonForm['value']): PredicateJsonForm => ({
+  keypath: 'tags',
+  operator: 'includes',
+  value: {
+    keypath: 'title',
+    operator: '=',
+    value: tagTitle,
+  },
+})
+
 export class CompoundPredicateBuilderController {
   operator: PredicateCompoundOperator = 'and'
   predicates: PredicateJsonForm[] = [getEmptyPredicate()]
@@ -64,6 +74,9 @@ export class CompoundPredicateBuilderController {
         case 'date':
           this.setPredicate(index, { value: '1.days.ago' })
           break
+        case 'tag':
+          this.setPredicate(index, { value: '' })
+          break
       }
     }
 
@@ -81,7 +94,12 @@ export class CompoundPredicateBuilderController {
   toJson(): PredicateJsonForm {
     return {
       operator: this.operator,
-      value: this.predicates,
+      value: this.predicates.map((predicate) => {
+        if (predicate.keypath === 'tags') {
+          return toTagsPredicate(predicate.value)
+        }
+        return predicate
+      }),
     }
   }
 
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts
index 1c22bfb3d..8f624d722 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts
@@ -18,6 +18,7 @@ export type PredicateKeypath =
   | 'starred'
   | 'hidePreview'
   | 'spellcheck'
+  | 'tags'
 
 export const PredicateKeypathLabels: { [k in PredicateKeypath]: string } = {
   title: 'Title',
@@ -39,10 +40,11 @@ export const PredicateKeypathLabels: { [k in PredicateKeypath]: string } = {
   starred: 'Starred',
   hidePreview: 'Hide Preview',
   spellcheck: 'Spellcheck',
+  tags: 'Tags',
 } as const
 
 export const PredicateKeypathTypes: {
-  [k in PredicateKeypath]: 'string' | 'noteType' | 'editorIdentifier' | 'number' | 'boolean' | 'date'
+  [k in PredicateKeypath]: 'string' | 'noteType' | 'editorIdentifier' | 'number' | 'boolean' | 'date' | 'tag'
 } = {
   title: 'string',
   'title.length': 'number',
@@ -63,4 +65,5 @@ export const PredicateKeypathTypes: {
   starred: 'boolean',
   hidePreview: 'boolean',
   spellcheck: 'boolean',
+  tags: 'tag',
 } as const
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx
index 63f652a4a..7a5ef176a 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx
@@ -1,5 +1,5 @@
 import { getDropdownItemsForAllEditors } from '@/Utils/DropdownItemsForEditors'
-import { NoteType } from '@standardnotes/snjs'
+import { ContentType, naturalSort, NoteType, SNTag } from '@standardnotes/snjs'
 import { useApplication } from '../ApplicationProvider'
 import { PredicateKeypath, PredicateKeypathTypes } from './PredicateKeypaths'
 
@@ -14,7 +14,22 @@ const PredicateValue = ({ keypath, value, setValue }: Props) => {
   const type = PredicateKeypathTypes[keypath]
   const editorItems = getDropdownItemsForAllEditors(application)
 
-  return type === 'noteType' ? (
+  return type === 'tag' ? (
+    <select
+      className="flex-grow truncate rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
+      value={value}
+      onChange={(event) => {
+        setValue(event.target.value)
+      }}
+    >
+      <option value="">Select a tag...</option>
+      {naturalSort(application.items.getItems<SNTag>(ContentType.TYPES.Tag), 'title').map((tag) => (
+        <option key={tag.uuid} value={tag.title}>
+          {application.items.getTagLongTitle(tag) || tag.title}
+        </option>
+      ))}
+    </select>
+  ) : type === 'noteType' ? (
     <select
       className="flex-grow rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
       value={value}
diff --git a/packages/web/src/javascripts/Components/SuperEditor/BlocksEditorComposer.tsx b/packages/web/src/javascripts/Components/SuperEditor/BlocksEditorComposer.tsx
index 71fc81a13..507579b24 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/BlocksEditorComposer.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/BlocksEditorComposer.tsx
@@ -2,6 +2,7 @@ import { FunctionComponent } from 'react'
 import { LexicalComposer, InitialEditorStateType } from '@lexical/react/LexicalComposer'
 import BlocksEditorTheme from './Lexical/Theme/Theme'
 import { BlockEditorNodes } from './Lexical/Nodes/AllNodes'
+import { highlightHtmlImport } from './Lexical/Utils/highlightHtmlImport'
 import { Klass, LexicalNode } from 'lexical'
 
 type BlocksEditorComposerProps = {
@@ -26,6 +27,9 @@ export const BlocksEditorComposer: FunctionComponent<BlocksEditorComposerProps>
         onError: (error: Error) => console.error(error),
         editorState: typeof initialValue === 'string' && initialValue.length === 0 ? undefined : initialValue,
         nodes: [...nodes, ...BlockEditorNodes],
+        html: {
+          import: highlightHtmlImport,
+        },
       }}
     >
       <>{children}</>
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss
index c3deb8ae3..58a4fff95 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss
+++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss
@@ -42,9 +42,7 @@
 }
 
 ::highlight(search-results) {
-  background-color: var(--sn-stylekit-info-color);
   background-color: color-mix(in srgb, var(--sn-stylekit-info-color), transparent 60%);
-  color: var(--text-norm);
 }
 
 // has to be defined separately, otherwise browsers which don't support ::highlight syntax
@@ -57,6 +55,6 @@
 }
 
 ::highlight(active-search-result) {
-  background-color: var(--sn-stylekit-info-color);
-  color: var(--text-norm);
+  background-color: color-mix(in srgb, var(--sn-stylekit-info-color), transparent 30%);
+  color: var(--sn-stylekit-info-contrast-color);
 }
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss
index b806a0e9c..dbe536ded 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss
+++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss
@@ -34,19 +34,19 @@
   }
 }
 .Lexical__h1 {
-  font-size: 26px;
+  font-size: 1.625rem;
   color: var(--sn-stylekit-editor-foreground-color);
   font-weight: 700;
   margin: 0;
 }
 .Lexical__h2 {
-  font-size: 22px;
+  font-size: 1.375rem;
   color: var(--sn-stylekit-editor-foreground-color);
   font-weight: 700;
   margin: 0;
 }
 .Lexical__h3 {
-  font-size: 19px;
+  font-size: 1.1875rem;
   font-weight: 700;
   margin: 0;
 }
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/CodeHighlightColors.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/CodeHighlightColors.ts
new file mode 100644
index 000000000..6db3ea222
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/CodeHighlightColors.ts
@@ -0,0 +1,33 @@
+import BlocksEditorTheme from '../../Theme/Theme'
+
+const TOKEN_CLASS_COLORS: Record<string, string> = {
+  Lexical__tokenComment: 'slategray',
+  Lexical__tokenPunctuation: '#999',
+  Lexical__tokenProperty: '#905',
+  Lexical__tokenSelector: '#690',
+  Lexical__tokenOperator: '#9a6e3a',
+  Lexical__tokenAttr: '#07a',
+  Lexical__tokenVariable: '#e90',
+  Lexical__tokenFunction: '#dd4a68',
+}
+
+const HIGHLIGHT_TYPE_TO_COLOR: Record<string, string> = {}
+
+const codeHighlightTheme = BlocksEditorTheme.codeHighlight
+
+if (codeHighlightTheme) {
+  for (const [highlightType, tokenClass] of Object.entries(codeHighlightTheme)) {
+    const color = TOKEN_CLASS_COLORS[tokenClass]
+    if (color) {
+      HIGHLIGHT_TYPE_TO_COLOR[highlightType] = color
+    }
+  }
+}
+
+export const getPDFColorForCodeHighlight = (highlightType: string | null | undefined): string | undefined => {
+  if (!highlightType) {
+    return undefined
+  }
+
+  return HIGHLIGHT_TYPE_TO_COLOR[highlightType]
+}
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx
index 3bc69be0d..375f574c8 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx
@@ -4,17 +4,19 @@ import {
   $isElementNode,
   $isParagraphNode,
   $isLineBreakNode,
+  $isTabNode,
   $isTextNode,
   LexicalEditor,
   LexicalNode,
   ElementNode,
+  TextNode,
 } from 'lexical'
 import { $isLinkNode } from '@lexical/link'
 import { $isHeadingNode, type HeadingNode, $isQuoteNode } from '@lexical/rich-text'
 import { $isListNode, $isListItemNode, ListType } from '@lexical/list'
 import { $isHorizontalRuleNode } from '@lexical/react/LexicalHorizontalRuleNode'
 import { $isTableNode, $isTableRowNode, $isTableCellNode } from '@lexical/table'
-import { $isCodeNode } from '@lexical/code'
+import { $isCodeHighlightNode, $isCodeNode } from '@lexical/code'
 import { $isInlineFileNode } from '../../../Plugins/InlineFilePlugin/InlineFileNode'
 import { $isRemoteImageNode } from '../../../Plugins/RemoteImagePlugin/RemoteImageNode'
 import { $isCollapsibleContainerNode } from '../../../Plugins/CollapsiblePlugin/CollapsibleContainerNode'
@@ -32,20 +34,24 @@ import {
   MONOSPACE_FONT_FAMILY,
   getFontFamiliesFromLexicalNode,
 } from './FontConfig'
+import { getPDFColorForCodeHighlight } from './CodeHighlightColors'
+import {
+  PDF_BASE_FONT_SIZE,
+  PDF_BLOCK_GAP,
+  PDF_CODE_BLOCK_FONT_SIZE,
+  PDF_CODE_TAB_SIZE,
+  PDF_LINE_HEIGHT_MULTIPLIER,
+  PDF_LIST_ITEM_GAP,
+  PDF_PAGE_PADDING,
+  PDF_QUOTE_INNER_GAP,
+} from './PDFLayoutConstants'
 
 const PDF_SUPERSUBSCRIPT_FONT_SIZE = 9
 const PDF_HEADING_SUPERSUBSCRIPT_SCALE = 0.75
 
 const styles = StyleSheet.create({
-  page: {
-    paddingVertical: 35,
-    paddingHorizontal: 35,
-    lineHeight: 1.5,
-    fontSize: 12,
-    gap: 14,
-  },
   block: {
-    gap: 14,
+    gap: PDF_BLOCK_GAP,
   },
   wrap: {
     flexWrap: 'wrap',
@@ -75,7 +81,7 @@ const styles = StyleSheet.create({
     borderLeftColor: '#72767e',
     paddingLeft: 12,
     paddingVertical: 4,
-    gap: 4,
+    gap: PDF_QUOTE_INNER_GAP,
   },
 })
 
@@ -138,6 +144,7 @@ const getListItemNode = ({
         type: 'Text',
         style: {
           flex: 1,
+          lineHeight: PDF_BASE_FONT_SIZE * PDF_LINE_HEIGHT_MULTIPLIER,
         },
         children,
       },
@@ -145,13 +152,121 @@ const getListItemNode = ({
   }
 }
 
-const MinimumHeadingFontSize = 13
-const MaxHeadingLevel = 6
+const HEADING_FONT_SIZES = [1.625, 1.375, 1.125, 0.875, 0.625, 0.375]
+
 const getFontSizeForHeading = (heading: HeadingNode) => {
   const level = parseInt(heading.getTag().slice(1))
-  const multiplier = (MaxHeadingLevel - level) * 2
+  return (HEADING_FONT_SIZES[level - 1] ?? 1) * PDF_BASE_FONT_SIZE
+}
 
-  return MinimumHeadingFontSize + multiplier
+const getPDFTextContent = (node: TextNode, isCodeNodeText: boolean): string => {
+  if ($isTabNode(node) && isCodeNodeText) {
+    return ' '.repeat(PDF_CODE_TAB_SIZE)
+  }
+
+  return node.getTextContent()
+}
+
+const getPDFTextFontFamily = (
+  node: TextNode,
+  fontFamilies: FontFamily[],
+  useCustomFonts: boolean,
+  isInlineCode: boolean,
+  isCodeNodeText: boolean,
+): FontFamily | FontFamily[] => {
+  if (isCodeNodeText || isInlineCode) {
+    return MONOSPACE_FONT_FAMILY
+  }
+
+  if (useCustomFonts) {
+    const nodeFontFamilies = getFontFamiliesFromLexicalNode(node)
+    fontFamilies.push(...nodeFontFamilies)
+    return [...nodeFontFamilies, FALLBACK_FONT_FAMILY]
+  }
+
+  return FALLBACK_FONT_FAMILY
+}
+
+const getPDFTextFontSize = (
+  isInlineCode: boolean,
+  isCodeNodeText: boolean,
+  isSuperscript: boolean,
+  isSubscript: boolean,
+  headingFontSize: number | undefined,
+): number | undefined => {
+  const baseFontSize = isInlineCode || isCodeNodeText ? PDF_CODE_BLOCK_FONT_SIZE : undefined
+
+  if (isSuperscript || isSubscript) {
+    if (headingFontSize) {
+      return Math.max(PDF_SUPERSUBSCRIPT_FONT_SIZE, Math.round(headingFontSize * PDF_HEADING_SUPERSUBSCRIPT_SCALE))
+    }
+    return PDF_SUPERSUBSCRIPT_FONT_SIZE
+  }
+
+  return baseFontSize
+}
+
+const getPDFTextLineHeight = (isHeading: boolean, headingFontSize: number | undefined): string => {
+  const size =
+    isHeading && headingFontSize
+      ? headingFontSize * PDF_LINE_HEIGHT_MULTIPLIER
+      : PDF_BASE_FONT_SIZE * PDF_LINE_HEIGHT_MULTIPLIER
+
+  return `${size}px`
+}
+
+const getPDFTextColor = (node: TextNode, parent: LexicalNode | null): string | undefined => {
+  if ($isCodeHighlightNode(node) && $isCodeNode(parent)) {
+    return getPDFColorForCodeHighlight(node.getHighlightType())
+  }
+
+  return undefined
+}
+
+const getPDFTextDecoration = (node: TextNode): 'underline' | 'line-through' | undefined => {
+  if (node.hasFormat('underline')) {
+    return 'underline'
+  }
+  if (node.hasFormat('strikethrough')) {
+    return 'line-through'
+  }
+  return undefined
+}
+
+const isInsideTableHeaderCell = (node: LexicalNode): boolean => {
+  return node.getParents().some((parent) => {
+    return $isTableCellNode(parent) && parent.hasHeader()
+  })
+}
+
+const getPDFTextDataNodeFromLexicalTextNode = (
+  node: TextNode,
+  parent: LexicalNode | null,
+  fontFamilies: FontFamily[],
+  useCustomFonts: boolean,
+): PDFDataNode => {
+  const isInlineCode = node.hasFormat('code')
+  const isCodeNodeText = $isCodeNode(parent)
+  const isHeading = $isHeadingNode(parent)
+  const isSuperscript = node.hasFormat('superscript')
+  const isSubscript = node.hasFormat('subscript')
+  const headingFontSize = isHeading ? getFontSizeForHeading(parent) : undefined
+
+  return {
+    type: 'Text',
+    children: getPDFTextContent(node, isCodeNodeText),
+    style: {
+      fontFamily: getPDFTextFontFamily(node, fontFamilies, useCustomFonts, isInlineCode, isCodeNodeText),
+      fontWeight: node.hasFormat('bold') || isHeading || isInsideTableHeaderCell(node) ? 'bold' : 'normal',
+      fontStyle: node.hasFormat('italic') ? 'italic' : 'normal',
+      textDecoration: getPDFTextDecoration(node),
+      backgroundColor: isInlineCode ? '#f1f1f1' : node.hasFormat('highlight') ? 'rgb(255,255,0)' : undefined,
+      color: getPDFTextColor(node, parent),
+      fontSize: getPDFTextFontSize(isInlineCode, isCodeNodeText, isSuperscript, isSubscript, headingFontSize),
+      verticalAlign: isSuperscript ? 'super' : isSubscript ? 'sub' : undefined,
+      lineHeight: getPDFTextLineHeight(isHeading, headingFontSize),
+    },
+  }
 }
 
 const getNodeTextAlignment = (node: ElementNode) => {
@@ -183,6 +298,11 @@ const getNodeDirection = (node: ElementNode) => {
   return direction ?? 'ltr'
 }
 
+const getPDFVerticalSpacer = (height: number = PDF_BASE_FONT_SIZE * PDF_LINE_HEIGHT_MULTIPLIER): PDFDataNode => ({
+  type: 'View',
+  style: { height },
+})
+
 const getPDFDataNodeFromLexicalNode = (
   node: LexicalNode,
   fontFamilies: FontFamily[],
@@ -198,53 +318,7 @@ const getPDFDataNodeFromLexicalNode = (
   }
 
   if ($isTextNode(node)) {
-    const isInlineCode = node.hasFormat('code')
-    const isCodeNodeText = $isCodeNode(parent)
-    const isBold = node.hasFormat('bold')
-    const isItalic = node.hasFormat('italic')
-    const isHighlight = node.hasFormat('highlight')
-    const isSuperscript = node.hasFormat('superscript')
-    const isSubscript = node.hasFormat('subscript')
-    let fontFamily: FontFamily[] | FontFamily = FALLBACK_FONT_FAMILY
-
-    if (isInlineCode && isCodeNodeText) {
-      fontFamily = MONOSPACE_FONT_FAMILY
-    } else {
-      if (useCustomFonts) {
-        const nodeFontFamilies = getFontFamiliesFromLexicalNode(node)
-        fontFamily = [...nodeFontFamilies, FALLBACK_FONT_FAMILY]
-        fontFamilies.push(...nodeFontFamilies)
-      }
-    }
-
-    const baseFontSize = isInlineCode || isCodeNodeText ? 11 : undefined
-    const headingFontSize = $isHeadingNode(parent) ? getFontSizeForHeading(parent) : undefined
-    const fontSize =
-      isSuperscript || isSubscript
-        ? headingFontSize
-          ? Math.max(PDF_SUPERSUBSCRIPT_FONT_SIZE, Math.round(headingFontSize * PDF_HEADING_SUPERSUBSCRIPT_SCALE))
-          : PDF_SUPERSUBSCRIPT_FONT_SIZE
-        : baseFontSize
-
-    return {
-      type: 'Text',
-      children: node.getTextContent(),
-      style: {
-        fontFamily,
-        fontWeight: isBold ? 'bold' : 'normal',
-        fontStyle: isItalic ? 'italic' : 'normal',
-        direction: $isElementNode(parent) ? getNodeDirection(parent) : 'ltr',
-        textDecoration: node.hasFormat('underline')
-          ? 'underline'
-          : node.hasFormat('strikethrough')
-          ? 'line-through'
-          : undefined,
-        backgroundColor: isInlineCode ? '#f1f1f1' : isHighlight ? 'rgb(255,255,0)' : undefined,
-        fontSize,
-        textAlign: $isElementNode(parent) ? getNodeTextAlignment(parent) : 'left',
-        verticalAlign: isSuperscript ? 'super' : isSubscript ? 'sub' : undefined,
-      },
-    }
+    return getPDFTextDataNodeFromLexicalTextNode(node, parent, fontFamilies, useCustomFonts)
   }
 
   if ($isCodeNode(node)) {
@@ -270,16 +344,20 @@ const getPDFDataNodeFromLexicalNode = (
           backgroundColor: 'rgba(0,0,0,0.05)',
           padding: 12,
           borderRadius: 6,
-          fontFamily: 'Courier',
+          fontFamily: MONOSPACE_FONT_FAMILY,
+          fontSize: PDF_CODE_BLOCK_FONT_SIZE,
         },
       ],
       children: lines.map((line) => {
         return {
           type: 'View',
           style: [styles.row, styles.wrap],
-          children: line.map((child) => {
-            return getPDFDataNodeFromLexicalNode(child, fontFamilies, useCustomFonts)
-          }),
+          children:
+            line.length === 0
+              ? [getPDFVerticalSpacer(PDF_CODE_BLOCK_FONT_SIZE * PDF_LINE_HEIGHT_MULTIPLIER)]
+              : line
+                  .map((child) => getPDFDataNodeFromLexicalNode(child, fontFamilies, useCustomFonts))
+                  .filter((child): child is PDFDataNode => child != null),
         }
       }),
     }
@@ -356,7 +434,7 @@ const getPDFDataNodeFromLexicalNode = (
       style: [
         styles.column,
         {
-          gap: 7,
+          gap: PDF_LIST_ITEM_GAP,
         },
       ],
       children,
@@ -392,7 +470,7 @@ const getPDFDataNodeFromLexicalNode = (
   }
 
   if ($isParagraphNode(node) && node.getTextContent().length === 0) {
-    return null
+    return getPDFVerticalSpacer()
   }
 
   if ($isTableCellNode(node)) {
@@ -403,7 +481,8 @@ const getPDFDataNodeFromLexicalNode = (
         borderColor: '#e3e3e3',
         borderWidth: 1,
         flex: 1,
-        padding: 2,
+        paddingHorizontal: 8,
+        paddingVertical: 6,
       },
       children,
     }
@@ -453,7 +532,8 @@ const getPDFDataNodeFromLexicalNode = (
         {
           type: 'Text',
           style: {
-            lineHeight: $isHeadingNode(node) ? 1 : 1.5,
+            textAlign: getNodeTextAlignment(node),
+            direction: getNodeDirection(node),
           },
           children,
         },
@@ -476,6 +556,95 @@ const getPDFDataNodesFromLexicalNodes = (
   return nodes.map((node) => getPDFDataNodeFromLexicalNode(node, fontFamilies, useCustomFonts))
 }
 
+/**
+ * Page widths in points (72dpi) sourced from PAGE_SIZES in
+ * @react-pdf/layout/lib/index.js — verify against that file when upgrading the library.
+ */
+const PDF_PAGE_WIDTHS_PT: Record<PrefValue[PrefKey.SuperNoteExportPDFPageSize], number> = {
+  A3: 841.89,
+  A4: 595.28,
+  LETTER: 612,
+  LEGAL: 612,
+  TABLOID: 792,
+}
+
+const getPDFContentWidth = (pageSize: PrefValue[PrefKey.SuperNoteExportPDFPageSize]): number => {
+  return PDF_PAGE_WIDTHS_PT[pageSize] - 2 * PDF_PAGE_PADDING
+}
+
+type PDFImageNaturalDimensions = {
+  width: number
+  height: number
+}
+
+const walkPDFDataNodes = (nodes: PDFDataNode[], visitor: (node: NonNullable<PDFDataNode>) => void): void => {
+  const visit = (node: PDFDataNode) => {
+    if (!node) {
+      return
+    }
+    visitor(node)
+    if (Array.isArray(node.children)) {
+      node.children.forEach(visit)
+    }
+  }
+  nodes.forEach(visit)
+}
+
+const collectPDFImageSources = (nodes: PDFDataNode[]): string[] => {
+  const sources = new Set<string>()
+  walkPDFDataNodes(nodes, (node) => {
+    if (node.type === 'Image' && typeof node.src === 'string') {
+      sources.add(node.src)
+    }
+  })
+  return [...sources]
+}
+
+const loadPDFImageDimensions = (src: string): Promise<PDFImageNaturalDimensions | null> => {
+  return new Promise((resolve) => {
+    const image = new window.Image()
+    image.onload = () => {
+      if (image.naturalWidth <= 0 || image.naturalHeight <= 0) {
+        resolve(null)
+        return
+      }
+      resolve({ width: image.naturalWidth, height: image.naturalHeight })
+    }
+    image.onerror = () => resolve(null)
+    image.src = src
+  })
+}
+
+const loadPDFImageDimensionsMap = async (sources: string[]): Promise<Map<string, PDFImageNaturalDimensions>> => {
+  const entries = await Promise.all(sources.map(async (src) => [src, await loadPDFImageDimensions(src)] as const))
+
+  const map = new Map<string, PDFImageNaturalDimensions>()
+  for (const [src, dimensions] of entries) {
+    if (dimensions) {
+      map.set(src, dimensions)
+    }
+  }
+  return map
+}
+
+const patchPDFImageStyles = (
+  nodes: PDFDataNode[],
+  contentWidth: number,
+  imageDimensions: Map<string, PDFImageNaturalDimensions>,
+): void => {
+  walkPDFDataNodes(nodes, (node) => {
+    if (node.type === 'Image' && typeof node.src === 'string') {
+      const natural = imageDimensions.get(node.src)
+      if (natural && natural.width > 0 && natural.height > 0) {
+        const displayWidth = Math.min(natural.width, contentWidth)
+        node.style = { width: displayWidth, height: displayWidth * (natural.height / natural.width) }
+      } else {
+        node.style = { width: contentWidth }
+      }
+    }
+  })
+}
+
 const pdfWorker = new PDFWorker()
 const PDFWorkerComlink = wrap<PDFWorkerInterface>(pdfWorker)
 
@@ -499,10 +668,15 @@ export function $generatePDFFromNodes(editor: LexicalEditor, pageSize: PrefValue
           const root = $getRoot()
           const nodes = root.getChildren()
           const fontFamilies: FontFamily[] = []
-
+          const contentWidth = getPDFContentWidth(pageSize)
           const pdfDataNodes = getPDFDataNodesFromLexicalNodes(nodes, fontFamilies, useCustomFonts)
+          const imageSources = collectPDFImageSources(pdfDataNodes)
 
-          void PDFWorkerComlink.renderPDF(pdfDataNodes, pageSize, fontFamilies, useCustomFonts)
+          void loadPDFImageDimensionsMap(imageSources)
+            .then((imageDimensions) => {
+              patchPDFImageStyles(pdfDataNodes, contentWidth, imageDimensions)
+              return PDFWorkerComlink.renderPDF(pdfDataNodes, pageSize, fontFamilies, useCustomFonts)
+            })
             .then((blob) => {
               const url = URL.createObjectURL(blob)
               resolve(url)
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFLayoutConstants.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFLayoutConstants.ts
new file mode 100644
index 000000000..3b46d02a2
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFLayoutConstants.ts
@@ -0,0 +1,8 @@
+export const PDF_BASE_FONT_SIZE = 12
+export const PDF_LINE_HEIGHT_MULTIPLIER = 1.5
+export const PDF_CODE_BLOCK_FONT_SIZE = 11
+export const PDF_CODE_TAB_SIZE = 2
+export const PDF_BLOCK_GAP = 4
+export const PDF_LIST_ITEM_GAP = 0
+export const PDF_QUOTE_INNER_GAP = 4
+export const PDF_PAGE_PADDING = 35
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.worker.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.worker.tsx
index f35b974b8..dd4f0af59 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.worker.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.worker.tsx
@@ -18,6 +18,7 @@ import {
 } from '@react-pdf/renderer'
 import { expose } from 'comlink'
 import { FontFamily, registerPDFFonts } from './FontConfig'
+import { PDF_BASE_FONT_SIZE, PDF_BLOCK_GAP, PDF_PAGE_PADDING } from './PDFLayoutConstants'
 
 export type PDFDataNode =
   | ((
@@ -80,11 +81,10 @@ const PDFDocument = ({ nodes, pageSize }: { nodes: PDFDataNode[]; pageSize: Page
       <Page
         size={pageSize}
         style={{
-          paddingVertical: 35,
-          paddingHorizontal: 35,
-          lineHeight: 1.5,
-          fontSize: 12,
-          gap: 14,
+          paddingVertical: PDF_PAGE_PADDING,
+          paddingHorizontal: PDF_PAGE_PADDING,
+          fontSize: PDF_BASE_FONT_SIZE,
+          gap: PDF_BLOCK_GAP,
         }}
       >
         {nodes.map((node, index) => {
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/highlightHtmlImport.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/highlightHtmlImport.ts
new file mode 100644
index 000000000..11810d40a
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/highlightHtmlImport.ts
@@ -0,0 +1,42 @@
+import { isHighlightSpanElement } from '@standardnotes/ui-services/src/Import/HighlightSpanImport'
+import { $isTextNode, DOMConversionMap, LexicalNode } from 'lexical'
+
+function applyHighlightToTextChild(domNode: HTMLElement) {
+  const backgroundColor = domNode.style.backgroundColor
+
+  return {
+    forChild: (lexicalNode: LexicalNode) => {
+      if (!$isTextNode(lexicalNode)) {
+        return lexicalNode
+      }
+
+      if (!lexicalNode.hasFormat('highlight')) {
+        lexicalNode.toggleFormat('highlight')
+      }
+
+      if (backgroundColor) {
+        lexicalNode.setStyle(`background-color: ${backgroundColor}`)
+      }
+
+      return lexicalNode
+    },
+    node: null,
+  }
+}
+
+export const highlightHtmlImport: DOMConversionMap = {
+  mark: () => ({
+    conversion: applyHighlightToTextChild,
+    priority: 1,
+  }),
+  span: (domNode) => {
+    if (!isHighlightSpanElement(domNode as HTMLElement)) {
+      return null
+    }
+
+    return {
+      conversion: applyHighlightToTextChild,
+      priority: 1,
+    }
+  },
+}
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.tsx
index 8b01fe1f8..d624ef807 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.tsx
@@ -310,7 +310,7 @@ function useDraggableBlockMenu(editor: LexicalEditor, anchorElem: HTMLElement, i
         return false
       }
 
-      const dragData = dataTransfer?.getData(DRAG_DATA_FORMAT) || ''
+      const dragData = dataTransfer?.getData(DRAG_DATA_FORMAT) || draggedNodeKey || ''
       const draggedNode = $getNodeByKey(dragData)
       if (!draggedNode) {
         return false
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.spec.ts b/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.spec.ts
new file mode 100644
index 000000000..0e75fe96f
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.spec.ts
@@ -0,0 +1,110 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { HeadlessSuperConverter } from './HeadlessSuperConverter'
+import { EvernoteConverter } from '@standardnotes/ui-services/src/Import/EvernoteConverter/EvernoteConverter'
+import { checkboxEnex, highlightEnex } from '@standardnotes/ui-services/src/Import/EvernoteConverter/testData'
+import { GenerateUuid } from '@standardnotes/services'
+import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
+
+describe('HeadlessSuperConverter', () => {
+  it('imports mark tags as highlight format', () => {
+    const converter = new HeadlessSuperConverter()
+    const superString = converter.convertOtherFormatToSuperString('<p><mark>Line 2</mark></p>', 'html', {
+      html: {
+        addLineBreaks: false,
+      },
+    })
+
+    expect(superString).toContain('"format":128')
+  })
+
+  it('imports Evernote highlight spans as highlight format with background color', () => {
+    const converter = new HeadlessSuperConverter()
+    const superString = converter.convertOtherFormatToSuperString(
+      '<p><span style="--en-highlight:yellow;background-color: #ffef9e;">Line 2</span></p>',
+      'html',
+      {
+        html: {
+          addLineBreaks: false,
+        },
+      },
+    )
+
+    expect(superString).toContain('"format":128')
+    expect(superString).toContain('background-color')
+  })
+
+  it('imports legacy -evernote-highlight spans as highlight format', () => {
+    const converter = new HeadlessSuperConverter()
+    const superString = converter.convertOtherFormatToSuperString(
+      '<p><span style="background-color: rgb(255, 250, 165);-evernote-highlight:true;">Line 2</span></p>',
+      'html',
+      {
+        html: {
+          addLineBreaks: false,
+        },
+      },
+    )
+
+    expect(superString).toContain('"format":128')
+  })
+
+  it('imports Evernote checkbox lists as check list type', async () => {
+    const crypto = {
+      generateUUID: () => String(Math.random()),
+    } as unknown as PureCryptoInterface
+    const generateUuid = new GenerateUuid(crypto)
+    const superConverter = new HeadlessSuperConverter()
+    const evernoteConverter = new EvernoteConverter(generateUuid)
+
+    const readFileAsText = async (file: File) => file as unknown as string
+
+    const { successful } = await evernoteConverter.convert(checkboxEnex as unknown as File, {
+      insertNote: async ({ text }) => ({ content: { text } }) as never,
+      insertTag: async () => ({ content: { references: [] } }) as never,
+      convertHTMLToSuper: (html, options) =>
+        superConverter.convertOtherFormatToSuperString(html, 'html', { html: options }),
+      convertMarkdownToSuper: jest.fn(),
+      readFileAsText,
+      canUseSuper: true,
+      canUploadFiles: false,
+      uploadFile: async () => void 0,
+      linkItems: async () => void 0,
+      cleanupItems: async () => void 0,
+    })
+
+    const superString = (successful?.[0] as unknown as { content: { text: string } }).content.text
+    expect(superString).toContain('"listType":"check"')
+  })
+
+  it('exports imported Evernote highlights as mark elements', async () => {
+    const crypto = {
+      generateUUID: () => String(Math.random()),
+    } as unknown as PureCryptoInterface
+    const generateUuid = new GenerateUuid(crypto)
+    const superConverter = new HeadlessSuperConverter()
+    const evernoteConverter = new EvernoteConverter(generateUuid)
+
+    const readFileAsText = async (file: File) => file as unknown as string
+
+    const { successful } = await evernoteConverter.convert(highlightEnex as unknown as File, {
+      insertNote: async ({ text }) => ({ content: { text } }) as never,
+      insertTag: async () => ({ content: { references: [] } }) as never,
+      convertHTMLToSuper: (html, options) =>
+        superConverter.convertOtherFormatToSuperString(html, 'html', { html: options }),
+      convertMarkdownToSuper: jest.fn(),
+      readFileAsText,
+      canUseSuper: true,
+      canUploadFiles: false,
+      uploadFile: async () => void 0,
+      linkItems: async () => void 0,
+      cleanupItems: async () => void 0,
+    })
+
+    const superString = (successful?.[0] as unknown as { content: { text: string } }).content.text
+    expect(superString).toContain('"format":128')
+    expect(superString).toContain('background-color')
+  })
+})
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx b/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx
index 63651062a..6b342adbc 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx
@@ -20,6 +20,7 @@ import { parseFileName } from '@standardnotes/utils'
 import { $dfs } from '@lexical/utils'
 import { $isFileNode } from '../Plugins/EncryptedFilePlugin/Nodes/FileUtils'
 import { $generateNodesFromSerializedNodes, $insertGeneratedNodes } from '@lexical/clipboard'
+import { highlightHtmlImport } from '../Lexical/Utils/highlightHtmlImport'
 
 export class HeadlessSuperConverter implements SuperConverterServiceInterface {
   private importEditor: LexicalEditor
@@ -32,6 +33,9 @@ export class HeadlessSuperConverter implements SuperConverterServiceInterface {
       editable: false,
       onError: (error: Error) => console.error(error),
       nodes: BlockEditorNodes,
+      html: {
+        import: highlightHtmlImport,
+      },
     })
     this.exportEditor = createHeadlessEditor({
       namespace: 'BlocksEditor',
diff --git a/packages/web/src/javascripts/Constants/Strings.ts b/packages/web/src/javascripts/Constants/Strings.ts
index 770b36868..4e8cb3c50 100644
--- a/packages/web/src/javascripts/Constants/Strings.ts
+++ b/packages/web/src/javascripts/Constants/Strings.ts
@@ -1,13 +1,15 @@
 import { escapeHtmlString, Platform, SNApplication } from '@standardnotes/snjs'
 import { getPlatform, isDesktopApplication } from '../Utils'
+import { c } from 'ttag'
 
 /** @generic */
-export const STRING_SESSION_EXPIRED =
-  'Your session has expired. New changes will not be pulled in. Please sign in to refresh your session.'
-export const STRING_DEFAULT_FILE_ERROR =
-  'Please use FileSafe or the Bold Editor to attach images and files. Learn more at standardnotes.com/filesafe.'
-export const STRING_GENERIC_SYNC_ERROR =
-  'There was an error syncing. Please try again. If all else fails, try signing out and signing back in.'
+export const STRING_SESSION_EXPIRED = () =>
+  c('Error').t`Your session has expired. New changes will not be pulled in. Please sign in to refresh your session.`
+export const STRING_DEFAULT_FILE_ERROR = () =>
+  c('Error')
+    .t`Please use FileSafe or the Bold Editor to attach images and files. Learn more at standardnotes.com/filesafe.`
+export const STRING_GENERIC_SYNC_ERROR = () =>
+  c('Error').t`There was an error syncing. Please try again. If all else fails, try signing out and signing back in.`
 export function StringSyncException(data: unknown) {
   return `There was an error while trying to save your items. Please contact support and share this message: ${JSON.stringify(
     data,
@@ -51,8 +53,9 @@ export function StringEmptyTrash(count: number) {
 /** @account */
 export const STRING_ACCOUNT_MENU_UNCHECK_MERGE =
   'Unchecking this option means any of the notes you have written while you were signed out will be deleted. Are you sure you want to discard these notes?'
-export const STRING_SIGN_OUT_CONFIRMATION =
-  'This action will remove this workspace and its related data from this device. Your synced data will not be affected.'
+export const STRING_SIGN_OUT_CONFIRMATION = () =>
+  c('Info')
+    .t`This action will remove this workspace and its related data from this device. Your synced data will not be affected.`
 export const STRING_ERROR_DECRYPTING_IMPORT =
   'There was an error decrypting your items. Make sure the password you entered is correct and try again.'
 export const STRING_E2E_ENABLED =
@@ -61,28 +64,34 @@ export const STRING_LOCAL_ENC_ENABLED =
   'Encryption is enabled. Your data is encrypted using your passcode before it is saved to your device storage.'
 export const STRING_ENC_NOT_ENABLED =
   'Encryption is not enabled. Sign in, register, or add a passcode lock to enable encryption.'
-export const STRING_IMPORT_SUCCESS = 'Your data has been successfully imported.'
+export const STRING_IMPORT_SUCCESS = () => c('Info').t`Your data has been successfully imported.`
 export const STRING_REMOVE_PASSCODE_CONFIRMATION = 'Are you sure you want to remove your application passcode?'
 export const STRING_REMOVE_PASSCODE_OFFLINE_ADDENDUM = ' This will remove encryption from your local data.'
 export const STRING_NON_MATCHING_PASSCODES = 'The two passcodes you entered do not match. Please try again.'
-export const STRING_NON_MATCHING_PASSWORDS = 'The two passwords you entered do not match. Please try again.'
+export const STRING_NON_MATCHING_PASSWORDS = () =>
+  c('Error').t`The two passwords you entered do not match. Please try again.`
 export const STRING_GENERATING_LOGIN_KEYS = 'Generating Login Keys...'
 export const STRING_GENERATING_REGISTER_KEYS = 'Generating Account Keys...'
-export const STRING_INVALID_IMPORT_FILE = 'Unable to open file. Ensure it is a proper JSON file and try again.'
-export const STRING_IMPORTING_ZIP_FILE =
-  'The file you selected is not a valid backup file. Please extract the contents of the zip file, then upload the contained .txt file.'
+export const STRING_INVALID_IMPORT_FILE = () =>
+  c('Error').t`Unable to open file. Ensure it is a proper JSON file and try again.`
+export const STRING_IMPORTING_ZIP_FILE = () =>
+  c('Error')
+    .t`The file you selected is not a valid backup file. Please extract the contents of the zip file, then upload the contained .txt file.`
 export function StringImportError(errorCount: number) {
-  return `Import complete. ${errorCount} items were not imported because there was an error decrypting them. Make sure the password is correct and try again.`
+  return c('Info')
+    .t`Import complete. ${errorCount} items were not imported because there was an error decrypting them. Make sure the password is correct and try again.`
 }
-export const STRING_UNSUPPORTED_BACKUP_FILE_VERSION =
-  'This backup file was created using an unsupported version of the application and cannot be imported here. Please update your application and try again.'
+export const STRING_UNSUPPORTED_BACKUP_FILE_VERSION = () =>
+  c('Error')
+    .t`This backup file was created using an unsupported version of the application and cannot be imported here. Please update your application and try again.`
 
 /** @password_change */
 export const STRING_FAILED_PASSWORD_CHANGE =
   'There was an error re-encrypting your items. Your password was changed, but not all your items were properly re-encrypted and synced. You should try syncing again. If all else fails, you should restore your notes from backup.'
 
-export const STRING_CONFIRM_APP_QUIT_DURING_UPGRADE =
-  'The encryption upgrade is in progress. You may lose data if you quit the app. ' + 'Are you sure you want to quit?'
+export const STRING_CONFIRM_APP_QUIT_DURING_UPGRADE = () =>
+  c('Info')
+    .t`The encryption upgrade is in progress. You may lose data if you quit the app. Are you sure you want to quit?`
 
 export const STRING_CONFIRM_APP_QUIT_DURING_PASSCODE_CHANGE =
   'A passcode change is in progress. You may lose data if you quit the app. ' + 'Are you sure you want to quit?'
@@ -90,21 +99,20 @@ export const STRING_CONFIRM_APP_QUIT_DURING_PASSCODE_CHANGE =
 export const STRING_CONFIRM_APP_QUIT_DURING_PASSCODE_REMOVAL =
   'A passcode removal is in progress. You may lose data if you quit the app. ' + 'Are you sure you want to quit?'
 
-export const STRING_UPGRADE_ACCOUNT_CONFIRM_TITLE = 'Encryption upgrade available'
-export const STRING_UPGRADE_ACCOUNT_CONFIRM_TEXT =
-  'Encryption version 004 is available. ' +
-  'This version strengthens the encryption algorithms your account and ' +
-  'local storage use. To learn more about this upgrade, visit our ' +
-  '<a href="https://standardnotes.com/help/security" target="_blank">Security Upgrade page.</a>'
-export const STRING_UPGRADE_ACCOUNT_CONFIRM_BUTTON = 'Upgrade'
+export const STRING_UPGRADE_ACCOUNT_CONFIRM_TITLE = () => c('Title').t`Encryption upgrade available`
+export const STRING_UPGRADE_ACCOUNT_CONFIRM_TEXT = () =>
+  c('Info')
+    .t`Encryption version 004 is available. This version strengthens the encryption algorithms your account and local storage use. To learn more about this upgrade, visit our <a href="https://standardnotes.com/help/security" target="_blank">Security Upgrade page.</a>`
+export const STRING_UPGRADE_ACCOUNT_CONFIRM_BUTTON = () => c('Action').t`Upgrade`
 
 export const STRING_REMOVE_OFFLINE_KEY_CONFIRMATION = 'This will delete the previously saved offline key.'
 
-export const STRING_DELETE_ACCOUNT_CONFIRMATION =
-  "Are you sure you want to permanently delete your account? You will be asked to confirm your account password in the next step. If you have an active paid subscription, cancel the subscription first. Otherwise, if you'd like to keep the subscription, you can re-register with the same email after deletion, and your subscription will be linked back up with your account."
+export const STRING_DELETE_ACCOUNT_CONFIRMATION = () =>
+  c('Info')
+    .t`Are you sure you want to permanently delete your account? You will be asked to confirm your account password in the next step. If you have an active paid subscription, cancel the subscription first. Otherwise, if you'd like to keep the subscription, you can re-register with the same email after deletion, and your subscription will be linked back up with your account.`
 
-export const STRING_FAILED_TO_UPDATE_USER_SETTING =
-  'There was an error while trying to update your settings. Please try again.'
+export const STRING_FAILED_TO_UPDATE_USER_SETTING = () =>
+  c('Error').t`There was an error while trying to update your settings. Please try again.`
 
 export const Strings = {
   protectingNoteWithoutProtectionSources:
diff --git a/packages/web/src/javascripts/Controllers/FeaturesController.ts b/packages/web/src/javascripts/Controllers/FeaturesController.ts
index e1af69a56..fd2475ebe 100644
--- a/packages/web/src/javascripts/Controllers/FeaturesController.ts
+++ b/packages/web/src/javascripts/Controllers/FeaturesController.ts
@@ -13,7 +13,11 @@ import {
 import { action, makeObservable, observable, runInAction, when } from 'mobx'
 import { AbstractViewController } from './Abstract/AbstractViewController'
 import { CrossControllerEvent } from './CrossControllerEvent'
-import { featureTrunkUniversalSearchEnabled, featureTrunkVaultsEnabled } from '@/FeatureTrunk'
+import {
+  featureTrunkSearchEnhancementsEnabled,
+  featureTrunkUniversalSearchEnabled,
+  featureTrunkVaultsEnabled,
+} from '@/FeatureTrunk'
 
 export class FeaturesController extends AbstractViewController implements InternalEventHandlerInterface {
   hasFolders: boolean
@@ -172,4 +176,11 @@ export class FeaturesController extends AbstractViewController implements Intern
 
     return status === FeatureStatus.Entitled
   }
+
+  isSearchEnhancementsEnabled(): boolean {
+    return (
+      featureTrunkSearchEnhancementsEnabled() ||
+      this.features.hasRole(RoleName.create(RoleName.NAMES.InternalTeamUser).getValue())
+    )
+  }
 }
diff --git a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
index 4a2308a7c..558966eee 100644
--- a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
+++ b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
@@ -227,6 +227,8 @@ export class ItemListController
           this.searchOptionsController.includeProtectedContents,
           this.searchOptionsController.includeArchived,
           this.searchOptionsController.includeTrashed,
+          this.searchOptionsController.noteTitleOnly,
+          this.searchOptionsController.tagFilterList.map((tag) => tag.uuid).join(','),
         ],
         () => {
           this.reloadNotesDisplayOptions()
@@ -410,7 +412,7 @@ export class ItemListController
   }
 
   get isFiltering(): boolean {
-    return !!this.noteFilterText && this.noteFilterText.length > 0
+    return this.noteFilterText.length > 0 || this.searchOptionsController.tagFilterList.length > 0
   }
 
   reloadPanelTitle = () => {
@@ -598,6 +600,9 @@ export class ItemListController
 
         log(LoggingDomain.Selection, 'Selecting next item after closing active one')
         this.selectNextItem({ userTriggered: false })
+      } else if (this.paneController.isInMobileView && !this.itemManager.findItem(activeItem.uuid)) {
+        log(LoggingDomain.Selection, 'Navigating back to item list because active note was deleted remotely')
+        void this.paneController.setPaneLayout(PaneLayout.ItemSelection)
       }
     } else if (activeItem && this.shouldSelectActiveItem(activeItem)) {
       log(LoggingDomain.Selection, 'Selecting active item')
@@ -615,7 +620,7 @@ export class ItemListController
     const tag = this.navigationController.selected
 
     const searchText = this.noteFilterText.toLowerCase()
-    const isSearching = searchText.length
+    const isSearching = searchText.length > 0 || this.searchOptionsController.tagFilterList.length > 0
     let includeArchived: boolean
     let includeTrashed: boolean
 
@@ -627,10 +632,20 @@ export class ItemListController
       includeTrashed = this.displayOptions.includeTrashed ?? false
     }
 
+    const tags: SNTag[] = []
+    if (tag instanceof SNTag) {
+      tags.push(tag)
+    }
+    for (const filterTag of this.searchOptionsController.tagFilterList) {
+      if (!tags.some((existingTag) => existingTag.uuid === filterTag.uuid)) {
+        tags.push(filterTag)
+      }
+    }
+
     const criteria: NotesAndFilesDisplayControllerOptions = {
       sortBy: this.displayOptions.sortBy,
       sortDirection: this.displayOptions.sortDirection,
-      tags: tag instanceof SNTag ? [tag] : [],
+      tags,
       views: tag instanceof SmartView ? [tag] : [],
       includeArchived,
       includeTrashed,
@@ -639,6 +654,7 @@ export class ItemListController
       searchQuery: {
         query: searchText,
         includeProtectedNoteText: this.searchOptionsController.includeProtectedContents,
+        noteTitleOnly: this.searchOptionsController.noteTitleOnly,
       },
     }
 
diff --git a/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts b/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts
index 532b047b5..ebc44ab6e 100644
--- a/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts
+++ b/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts
@@ -11,7 +11,7 @@ import { action, makeObservable, observable } from 'mobx'
 import { AbstractViewController } from '../Abstract/AbstractViewController'
 import { PurchaseFlowPane } from './PurchaseFlowPane'
 import { LoadPurchaseFlowUrl } from '@/Application/UseCase/LoadPurchaseFlowUrl'
-import { IsNativeIOS } from '@standardnotes/ui-services'
+import { IsNativeIOS, IsNativeAndroid } from '@standardnotes/ui-services'
 
 export class PurchaseFlowController extends AbstractViewController {
   isOpen = false
@@ -25,6 +25,7 @@ export class PurchaseFlowController extends AbstractViewController {
     private mobileDevice: MobileDeviceInterface | undefined,
     private _loadPurchaseFlowUrl: LoadPurchaseFlowUrl,
     private _isNativeIOS: IsNativeIOS,
+    private _isNativeAndroid: IsNativeAndroid,
     eventBus: InternalEventBusInterface,
   ) {
     super(eventBus)
@@ -44,6 +45,10 @@ export class PurchaseFlowController extends AbstractViewController {
   }
 
   openPurchaseFlow = async (plan = AppleIAPProductId.ProPlanYearly) => {
+    if (this._isNativeAndroid.execute().getValue()) {
+      return
+    }
+
     const user = this.sessions.getUser()
     if (!user) {
       this.isOpen = true
@@ -58,6 +63,10 @@ export class PurchaseFlowController extends AbstractViewController {
   }
 
   openPurchaseWebpage = async () => {
+    if (this._isNativeAndroid.execute().getValue()) {
+      return
+    }
+
     const result = await this._loadPurchaseFlowUrl.execute()
     if (result.isFailed()) {
       console.error(result.getError())
diff --git a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
index 0ae8ccf8c..4d908acbb 100644
--- a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
+++ b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
@@ -4,14 +4,17 @@ import {
   InternalEventBusInterface,
   InternalEventHandlerInterface,
   InternalEventInterface,
+  SNTag,
 } from '@standardnotes/snjs'
-import { makeObservable, observable, action, runInAction } from 'mobx'
+import { makeObservable, observable, action, runInAction, computed } from 'mobx'
 import { AbstractViewController } from './Abstract/AbstractViewController'
 
 export class SearchOptionsController extends AbstractViewController implements InternalEventHandlerInterface {
   includeProtectedContents = false
   includeArchived = false
   includeTrashed = false
+  noteTitleOnly = false
+  tagFilterList: SNTag[] = []
 
   constructor(
     private protections: ProtectionsClientInterface,
@@ -23,11 +26,20 @@ export class SearchOptionsController extends AbstractViewController implements I
       includeProtectedContents: observable,
       includeTrashed: observable,
       includeArchived: observable,
+      noteTitleOnly: observable,
+      tagFilterList: observable,
 
       toggleIncludeArchived: action,
       toggleIncludeTrashed: action,
       toggleIncludeProtectedContents: action,
       refreshIncludeProtectedContents: action,
+      setNoteTitleOnly: action,
+      addTagFilter: action,
+      removeTagFilter: action,
+      clearTagFilters: action,
+      clearAllFilters: action,
+
+      activeSearchFilterCount: computed,
     })
 
     eventBus.addEventHandler(this, ApplicationEvent.UnprotectedSessionBegan)
@@ -64,4 +76,40 @@ export class SearchOptionsController extends AbstractViewController implements I
       })
     }
   }
+
+  setNoteTitleOnly = (value: boolean): void => {
+    this.noteTitleOnly = value
+  }
+
+  addTagFilter = (tag: SNTag): void => {
+    if (!this.tagFilterList.some((existing) => existing.uuid === tag.uuid)) {
+      this.tagFilterList = [...this.tagFilterList, tag]
+    }
+  }
+
+  removeTagFilter = (tag: SNTag): void => {
+    this.tagFilterList = this.tagFilterList.filter((existing) => existing.uuid !== tag.uuid)
+  }
+
+  clearTagFilters = (): void => {
+    this.tagFilterList = []
+  }
+
+  clearAllFilters = (): void => {
+    this.noteTitleOnly = false
+    this.includeArchived = false
+    this.includeTrashed = false
+    this.includeProtectedContents = false
+    this.tagFilterList = []
+  }
+
+  get activeSearchFilterCount(): number {
+    return (
+      Number(this.noteTitleOnly) +
+      Number(this.includeProtectedContents) +
+      Number(this.includeArchived) +
+      Number(this.includeTrashed) +
+      this.tagFilterList.length
+    )
+  }
 }
diff --git a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
index e1bf4c67e..6395cd276 100644
--- a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
+++ b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
@@ -36,6 +36,7 @@ export class SubscriptionController extends AbstractViewController implements In
       hasAccount: observable,
       onlineSubscription: observable,
 
+      isSharedSubscription: computed,
       usedInvitationsCount: computed,
       allowedInvitationsCount: computed,
       allInvitationsUsed: computed,
@@ -96,6 +97,10 @@ export class SubscriptionController extends AbstractViewController implements In
     return !!this.subscriptions.getOnlineSubscription() || offline
   }
 
+  get isSharedSubscription(): boolean {
+    return this.onlineSubscription?.subscriptionType === 'shared'
+  }
+
   get usedInvitationsCount(): number {
     return (
       this.subscriptionInvitations?.filter((invitation) =>
diff --git a/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts b/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts
index 8d8bb0eed..cba45958d 100644
--- a/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts
+++ b/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts
@@ -60,6 +60,7 @@ describe('ApplicationEventObserver', () => {
 
   beforeEach(() => {
     application = {} as jest.Mocked<WebApplication>
+    application.canShowPurchaseFlow = jest.fn().mockReturnValue(true)
 
     routeService = {} as jest.Mocked<RouteServiceInterface>
     routeService.getRoute = jest.fn().mockReturnValue({
@@ -109,6 +110,17 @@ describe('ApplicationEventObserver', () => {
       expect(purchaseFlowController.openPurchaseFlow).toHaveBeenCalled()
     })
 
+    it('should not open the purchase flow on Android', async () => {
+      application.canShowPurchaseFlow = jest.fn().mockReturnValue(false)
+      routeService.getRoute = jest.fn().mockReturnValue({
+        type: RouteType.Purchase,
+      } as jest.Mocked<RouteParserInterface>)
+
+      await createObserver().handle(ApplicationEvent.Launched)
+
+      expect(purchaseFlowController.openPurchaseFlow).not.toHaveBeenCalled()
+    })
+
     it('should open up settings if user is logged in', async () => {
       routeService.getRoute = jest.fn().mockReturnValue({
         type: RouteType.Settings,
diff --git a/packages/web/src/javascripts/Event/ApplicationEventObserver.ts b/packages/web/src/javascripts/Event/ApplicationEventObserver.ts
index e8e4c24b5..f386126aa 100644
--- a/packages/web/src/javascripts/Event/ApplicationEventObserver.ts
+++ b/packages/web/src/javascripts/Event/ApplicationEventObserver.ts
@@ -47,7 +47,9 @@ export class ApplicationEventObserver implements EventObserverInterface {
           const route = this.routeService.getRoute()
           switch (route.type) {
             case RouteType.Purchase:
-              void this.purchaseFlowController.openPurchaseFlow()
+              if (this.application.canShowPurchaseFlow()) {
+                void this.purchaseFlowController.openPurchaseFlow()
+              }
 
               break
             case RouteType.Settings: {
diff --git a/packages/web/src/javascripts/FeatureTrunk.ts b/packages/web/src/javascripts/FeatureTrunk.ts
index b74548d50..4250e596a 100644
--- a/packages/web/src/javascripts/FeatureTrunk.ts
+++ b/packages/web/src/javascripts/FeatureTrunk.ts
@@ -15,3 +15,7 @@ export function featureTrunkVaultsEnabled(): boolean {
 export function featureTrunkUniversalSearchEnabled(): boolean {
   return InternalFeatureService.get().isFeatureEnabled(InternalFeature.UniversalSearch)
 }
+
+export function featureTrunkSearchEnhancementsEnabled(): boolean {
+  return InternalFeatureService.get().isFeatureEnabled(InternalFeature.SearchEnhancements)
+}
diff --git a/packages/web/src/stylesheets/_editor.scss b/packages/web/src/stylesheets/_editor.scss
index 08d06f3b5..52c456275 100644
--- a/packages/web/src/stylesheets/_editor.scss
+++ b/packages/web/src/stylesheets/_editor.scss
@@ -71,7 +71,7 @@ $heading-height: 75px;
   }
 
   #save-status {
-    font-size: calc(var(--sn-stylekit-base-font-size) - 2px);
+    font-size: calc(var(--sn-stylekit-base-font-size) - 0.125rem);
     text-transform: none;
     font-weight: normal;
 
diff --git a/packages/web/src/stylesheets/_items-column.scss b/packages/web/src/stylesheets/_items-column.scss
index 4630ac0fa..8f73e4629 100644
--- a/packages/web/src/stylesheets/_items-column.scss
+++ b/packages/web/src/stylesheets/_items-column.scss
@@ -89,7 +89,7 @@
       cursor: default;
       background-color: var(--sn-stylekit-neutral-color);
       color: var(--sn-stylekit-neutral-contrast-color);
-      font-size: 10px;
+      font-size: 0.625rem;
       line-height: 17px;
       text-align: center;
       position: absolute;
diff --git a/packages/web/src/stylesheets/_main.scss b/packages/web/src/stylesheets/_main.scss
index 0d280c956..ce1ed6508 100644
--- a/packages/web/src/stylesheets/_main.scss
+++ b/packages/web/src/stylesheets/_main.scss
@@ -160,7 +160,7 @@ body,
 
     .section-title-bar {
       .add-button {
-        font-size: 12px;
+        font-size: 0.75rem;
       }
 
       .section-title-bar-header {
diff --git a/packages/web/src/stylesheets/_navigation.scss b/packages/web/src/stylesheets/_navigation.scss
index 4ddb5198d..05bb882c6 100644
--- a/packages/web/src/stylesheets/_navigation.scss
+++ b/packages/web/src/stylesheets/_navigation.scss
@@ -23,7 +23,7 @@ $content-horizontal-padding: 16px;
     padding-bottom: 8px;
     padding-left: $content-horizontal-padding;
     padding-right: $content-horizontal-padding;
-    font-size: 12px;
+    font-size: 0.75rem;
   }
 
   .root-drop {
@@ -54,7 +54,7 @@ $content-horizontal-padding: 16px;
 
   .tag,
   .root-drop {
-    font-size: 14px;
+    font-size: 0.875rem;
     cursor: pointer;
     transition: height 0.1s ease-in-out;
     width: 100%;
@@ -136,7 +136,7 @@ $content-horizontal-padding: 16px;
 
     .meta {
       > .menu {
-        font-size: 11px;
+        font-size: 0.6875rem;
 
         > .item {
           margin-right: 4px;
diff --git a/yarn.lock b/yarn.lock
index 57d077ddf..e6b3de8a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4915,285 +4915,303 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lexical/clipboard@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/clipboard@npm:0.38.1"
+"@lexical/clipboard@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/clipboard@npm:0.43.0"
   dependencies:
-    "@lexical/html": 0.38.1
-    "@lexical/list": 0.38.1
-    "@lexical/selection": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: d56bd0b5dbba12bda9e92b9a4e076df31d29d2eec389cda0500a9ef9a6e7b106ff2c461a02096fa7deb31ee5ee8ba37002baa5ac2ba240a35960dd77a1720293
+    "@lexical/html": 0.43.0
+    "@lexical/list": 0.43.0
+    "@lexical/selection": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 9b404ea0e982239b2a3ee607f143ab3fcb78cb0adf2ab721d74d15b32f27102a8bead18f988ab751a041f42ac0944aaa8d33d41f0e4f0f5aebe35f63337e8853
   languageName: node
   linkType: hard
 
-"@lexical/code@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/code@npm:0.38.1"
+"@lexical/code-core@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/code-core@npm:0.43.0"
   dependencies:
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
+    lexical: 0.43.0
+  checksum: a63d105158ffd8a839a9376037b3bac68da5dc8bc2dab6c1de2b0c0e34ceead1e04de6320dcfed0ba89f94c00757dbe28755b89b3d995fb374b5fbce6c1297e3
+  languageName: node
+  linkType: hard
+
+"@lexical/code-prism@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/code-prism@npm:0.43.0"
+  dependencies:
+    "@lexical/code-core": 0.43.0
+    lexical: 0.43.0
     prismjs: ^1.30.0
-  checksum: 7d2273bb057fa00f221098c6ecf769c1aa89892548cadb4b6ed15f3be1883e1aff6f01d797d08cb4c3288d57e88fb4e4ef8aaa899b9cbd77208725d80c36afe5
+  checksum: c8fcbd2541d7bc5f2bd1b7c595c58742d535bd7976f0620541e5730495113e4ffa74850b092106258fc63cbb7c3a475059226f786818e10fafbb99f3777a5f8b
   languageName: node
   linkType: hard
 
-"@lexical/devtools-core@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/devtools-core@npm:0.38.1"
+"@lexical/code@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/code@npm:0.43.0"
   dependencies:
-    "@lexical/html": 0.38.1
-    "@lexical/link": 0.38.1
-    "@lexical/mark": 0.38.1
-    "@lexical/table": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
+    "@lexical/code-core": 0.43.0
+    "@lexical/code-prism": 0.43.0
+    lexical: 0.43.0
+  checksum: f756ff54dba8c2791d72e03c1eb0a23f7e9c1e86d39d19e3288a9a7ad9c6fb18143066eb24aa7b03fdf573aa884f5e1cde630b60c052d5fea34314738b40d3d3
+  languageName: node
+  linkType: hard
+
+"@lexical/devtools-core@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/devtools-core@npm:0.43.0"
+  dependencies:
+    "@lexical/html": 0.43.0
+    "@lexical/link": 0.43.0
+    "@lexical/mark": 0.43.0
+    "@lexical/table": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
   peerDependencies:
     react: ">=17.x"
     react-dom: ">=17.x"
-  checksum: 00ed9e4c9b7dc0777ca80d219248286a7c91573d538a0146ec9c2aa7f320222653858ad9eb7be807036732598dab2108c84a3b54f2ada66d54c60becc990955c
+  checksum: 0728d7bc4e8e46ffe87a2a4e0ebdcfa246e30c3b0834a375b7d35599f0387ff61520955086e113d5c444cf4377585e2fa712b26cbf0e21b5c1989fd4981a8997
   languageName: node
   linkType: hard
 
-"@lexical/dragon@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/dragon@npm:0.38.1"
+"@lexical/dragon@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/dragon@npm:0.43.0"
   dependencies:
-    "@lexical/extension": 0.38.1
-    lexical: 0.38.1
-  checksum: 1771dc711d558658457995ef6f2a29a6fa5360abf202b3426cd403245ef59efd8ae9e3899130e92778980a03d7a9e4ff617228d20cc22da05ac2479b1c95e490
+    "@lexical/extension": 0.43.0
+    lexical: 0.43.0
+  checksum: 0d1578c21fbcf5fde1d77a811257394c344144357e3cbb435954406066d5954eacf2e021d21fc3274173d4628e5e1e96b2767733ce7560360d967732a3337307
   languageName: node
   linkType: hard
 
-"@lexical/extension@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/extension@npm:0.38.1"
+"@lexical/extension@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/extension@npm:0.43.0"
   dependencies:
-    "@lexical/utils": 0.38.1
-    "@preact/signals-core": ^1.11.0
-    lexical: 0.38.1
-  checksum: 36a2d22ee54e56556ae4c7a6cd3bedede7ae05b16f3d414e4a7a11a50cf5f1cbab72fc70a3a9301b6ecafe2c58d94fe123bbe7e515ccd221a5967d2850bb184b
+    "@lexical/utils": 0.43.0
+    "@preact/signals-core": ^1.14.1
+    lexical: 0.43.0
+  checksum: 009793428622c2a9fb819db7bbd97611b3903bd83465c515e80b11a97d22b1fbc1cfd5d1c4d415f5a088c5811e5b6ec0a3fed9c76e336b6fe71a691bedf7b1d0
   languageName: node
   linkType: hard
 
-"@lexical/hashtag@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/hashtag@npm:0.38.1"
+"@lexical/hashtag@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/hashtag@npm:0.43.0"
   dependencies:
-    "@lexical/text": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: 497655921878e6facb16cad3133b7f78d1fafdce5f30ea8a75dc5c9498f11c0a7ff45391a325cecdfdd7312fd7040bb1d0b35b2b012d70b7cde08db9366e8ea5
+    "@lexical/text": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 2762215fd8c12012c255b92531e90a0b684a01503b91667fb5bc03f68106d3388917b9682091172e202a4799d87bb86ff5f5e0693d65df83209ecf906e3260d0
   languageName: node
   linkType: hard
 
-"@lexical/headless@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/headless@npm:0.38.1"
+"@lexical/headless@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/headless@npm:0.43.0"
   dependencies:
-    happy-dom: ^20.0.0
-    lexical: 0.38.1
-  checksum: 994a1e3750f24c1650af77ec6151b101db8dce3f31975f25595058c586ed89d25ec7ec6172a9bf415d325e5e57fc5cdff24c4090dff931f01d3d9c5d06c28d48
+    happy-dom: ^20.8.9
+    lexical: 0.43.0
+  checksum: 87fca41717dc26397a61bf6fab454506f5fad439277e96daed19b63da4e3bc11c7479422e516c4468fb1750ef92e0c32c24dea2895d178144adcfd0f0452f88d
   languageName: node
   linkType: hard
 
-"@lexical/history@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/history@npm:0.38.1"
+"@lexical/history@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/history@npm:0.43.0"
   dependencies:
-    "@lexical/extension": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: 12fe92f72293b11a41c2c9696508c43339f4d80d7163223c601c3ecf2019fb0ee15a585b68eb576c25afd1260a73b996ae30f39670b63b63cf6e58b32e5bf5e2
+    "@lexical/extension": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 13ebbf8ddd2a4588114131cccf447e68dca8fba8afcbeb522072f58cd0bef64d808582d5fc5bc54b34f31d9ba6c312c775ad55d6a10ff04610499d6e3b1797c7
   languageName: node
   linkType: hard
 
-"@lexical/html@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/html@npm:0.38.1"
+"@lexical/html@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/html@npm:0.43.0"
   dependencies:
-    "@lexical/selection": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: effeae00d2bae266d08f21c54b98708d050ea75160295d03f732a540e1e41e4ee86242ffaa5de24abdaa0449a37f7cc488ca8b1ff1a0e1a8d95ee8a59a61924c
+    "@lexical/selection": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: d62a738fff0a2d3631149018cf626510a92b8bd6959cc8775c367713f8031836c523427fdffdfe1067eb371acc6db14e970cd02883fbd19263b4d685062ba0ac
   languageName: node
   linkType: hard
 
-"@lexical/link@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/link@npm:0.38.1"
+"@lexical/link@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/link@npm:0.43.0"
   dependencies:
-    "@lexical/extension": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: 18ffad2fe86f5abf35a019ce180f87586d4fc57ab3e07308711ac75b7c7ce0f10ad1c128f36ab477f568e370529cc0d207d8b3c32917cc31ec0cc3ce1fc48d06
+    "@lexical/extension": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: ff6db3c0734d6a1cebdd17d7c406bafeb6169d0c48b87486dc8db12a484dbe717ce01d36c9041ea1f408adc4e9d3d6101842b5d4b6356a053e82b81ae346af36
   languageName: node
   linkType: hard
 
-"@lexical/list@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/list@npm:0.38.1"
+"@lexical/list@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/list@npm:0.43.0"
   dependencies:
-    "@lexical/extension": 0.38.1
-    "@lexical/selection": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: d2b288d3a4003733e453fa1b90ac31a287fa3704259a00a3eb8faab2a4fa5a42d730e75c78beff2e15266a7831fb4a048d6fbacf218d1447a4818010198914d2
+    "@lexical/extension": 0.43.0
+    "@lexical/selection": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 00193c83c271f8d600fb7d4866c0f411cfd9e6df0ee20b6c4118160657aaa5d857c4118847eb016b02cef3a370f3f764b13b7a26320c53b21390298191ad6001
   languageName: node
   linkType: hard
 
-"@lexical/mark@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/mark@npm:0.38.1"
+"@lexical/mark@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/mark@npm:0.43.0"
   dependencies:
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: 3ec0f37e9ae505a8e0e5a304c00b2a36b17ebce0122a03a0a353e837b06397b066f6aa82d3796a1eeee00d1308d6804b2c5560d3c5a50b62039f818fbe1e8579
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: d3beaa250fe2098859efc88bae8ba5d9d55acc12c081c03f229a28a6dfd65e56b91ab2f56784e809e5686fe354247a015afd867767cb26506db6c23a3f53f750
   languageName: node
   linkType: hard
 
-"@lexical/markdown@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/markdown@npm:0.38.1"
+"@lexical/markdown@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/markdown@npm:0.43.0"
   dependencies:
-    "@lexical/code": 0.38.1
-    "@lexical/link": 0.38.1
-    "@lexical/list": 0.38.1
-    "@lexical/rich-text": 0.38.1
-    "@lexical/text": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: 9aab4eb6e9d5abf9a6970a19aee126c7f7168a7ddfbdcec008ccc4ae1afc8a9bae2252d636ef6ca26798e36eac2e95db024c40e64978863f2a530ca7a1bd1255
+    "@lexical/code-core": 0.43.0
+    "@lexical/link": 0.43.0
+    "@lexical/list": 0.43.0
+    "@lexical/rich-text": 0.43.0
+    "@lexical/text": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 2dbcbf2989f06cc2d0b29f5f7c3b60ce6781e372cf0970cd91c8ce170fd627daea1597e6850a2adfe16831497a4e916bd4b3c10fa7fab60a6d6bd28a2d400f28
   languageName: node
   linkType: hard
 
-"@lexical/offset@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/offset@npm:0.38.1"
+"@lexical/offset@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/offset@npm:0.43.0"
   dependencies:
-    lexical: 0.38.1
-  checksum: bf397bc3db282e2249a37518c2ec6c4a3bee47ad01aa22b70c25b1a6a4f9842c7bb32660c28603765b4e6c85cefb8d63edd852dc8507d41b5345b2e8ac2c93fb
+    lexical: 0.43.0
+  checksum: b4a11fd7831658923919ceacdde97690b474a641c981b369964b1d7e455e09268c08df489d33f5c877c4d21340569254833d9725618400ce756b96640a3754c0
   languageName: node
   linkType: hard
 
-"@lexical/overflow@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/overflow@npm:0.38.1"
+"@lexical/overflow@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/overflow@npm:0.43.0"
   dependencies:
-    lexical: 0.38.1
-  checksum: 3812795f83a3569ddea371a4afda38758b39db827ca8ba2349484bdde9c4508c01bb5f24b6980d42dfb142ce3ab1b6825b16472b1125226a03d307114bf97e23
+    lexical: 0.43.0
+  checksum: 4ac442c4af98926d6cbd1d4d1c3f1064e79b40b103696d457e6a74b388aea3b3a99085ccb5f663cf9378be4fdb86d83872f549e015abb556bdf634dcd542ec06
   languageName: node
   linkType: hard
 
-"@lexical/plain-text@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/plain-text@npm:0.38.1"
+"@lexical/plain-text@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/plain-text@npm:0.43.0"
   dependencies:
-    "@lexical/clipboard": 0.38.1
-    "@lexical/dragon": 0.38.1
-    "@lexical/selection": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: 4e2d79ced9dc2b2565738955161f8ca338dd70732e29e92e0b11ed6bab36606edaa01b48c3481d1d2c2bde8344f9c6e6030d1f32623c7854e1bc8762efff0a98
+    "@lexical/clipboard": 0.43.0
+    "@lexical/dragon": 0.43.0
+    "@lexical/selection": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 855460a77ac0fa81ff6a67476ad994c6faa741371f8e82177cc6c381dbf93cb721ea6a3d448fd934c2d7db86320e8df3f0b938d556563ff211417be4862451b4
   languageName: node
   linkType: hard
 
-"@lexical/react@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/react@npm:0.38.1"
+"@lexical/react@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/react@npm:0.43.0"
   dependencies:
     "@floating-ui/react": ^0.27.16
-    "@lexical/devtools-core": 0.38.1
-    "@lexical/dragon": 0.38.1
-    "@lexical/extension": 0.38.1
-    "@lexical/hashtag": 0.38.1
-    "@lexical/history": 0.38.1
-    "@lexical/link": 0.38.1
-    "@lexical/list": 0.38.1
-    "@lexical/mark": 0.38.1
-    "@lexical/markdown": 0.38.1
-    "@lexical/overflow": 0.38.1
-    "@lexical/plain-text": 0.38.1
-    "@lexical/rich-text": 0.38.1
-    "@lexical/table": 0.38.1
-    "@lexical/text": 0.38.1
-    "@lexical/utils": 0.38.1
-    "@lexical/yjs": 0.38.1
-    lexical: 0.38.1
+    "@lexical/devtools-core": 0.43.0
+    "@lexical/dragon": 0.43.0
+    "@lexical/extension": 0.43.0
+    "@lexical/hashtag": 0.43.0
+    "@lexical/history": 0.43.0
+    "@lexical/link": 0.43.0
+    "@lexical/list": 0.43.0
+    "@lexical/mark": 0.43.0
+    "@lexical/markdown": 0.43.0
+    "@lexical/overflow": 0.43.0
+    "@lexical/plain-text": 0.43.0
+    "@lexical/rich-text": 0.43.0
+    "@lexical/table": 0.43.0
+    "@lexical/text": 0.43.0
+    "@lexical/utils": 0.43.0
+    "@lexical/yjs": 0.43.0
+    lexical: 0.43.0
     react-error-boundary: ^6.0.0
   peerDependencies:
     react: ">=17.x"
     react-dom: ">=17.x"
-  checksum: a9488dc3f2d6207643d73b0b1dbbcd15abf5b0880db88c9befb4dfd0abd069be53e19c1647c8854e8fd63fd68732ab84556582f4690eb353c1f772fe50ff4387
+  checksum: ea9fd24fbc86e394f68abfbc69d802d5137e5b2e2299b7cb4db5b105112ad5adb6d0d05f2d4e5601abb9fed6aa9097fff384ce78cf2dd462ad9afe8fb93242a3
   languageName: node
   linkType: hard
 
-"@lexical/rich-text@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/rich-text@npm:0.38.1"
+"@lexical/rich-text@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/rich-text@npm:0.43.0"
   dependencies:
-    "@lexical/clipboard": 0.38.1
-    "@lexical/dragon": 0.38.1
-    "@lexical/selection": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: b8d2218d5ae0eb4570fe9004a32e99523ce67312cdeb10151c63595cc5c828475735394c811c2bfd83d518119bde84d4ad97888520b818429f00531e16797adb
+    "@lexical/clipboard": 0.43.0
+    "@lexical/dragon": 0.43.0
+    "@lexical/selection": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 89b5c3ef338b7695f7262caa166ce299441d4baf67bacfb56cee36b705aeb3b899cd2cd572ef2e6382e8fccc9f38777d570f488533028905b1b0232e7a2daca4
   languageName: node
   linkType: hard
 
-"@lexical/selection@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/selection@npm:0.38.1"
+"@lexical/selection@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/selection@npm:0.43.0"
   dependencies:
-    lexical: 0.38.1
-  checksum: 7e585e9149a6353937d89c9495b328b56c1cd64c2f70852dc02c3d38da6084e5ea835dc3cbcaa26975fb343c332c3efd08732032cd41c614275f9ee699a60a37
+    lexical: 0.43.0
+  checksum: 20a0896ffeee42b796e1fc2288e537c5f1d3f5529c99d373f8601069e2665e424dbde5cd7a8c3e186cc5c63b993b36132d706a0b44ca237e2ba35858aa99ab18
   languageName: node
   linkType: hard
 
-"@lexical/table@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/table@npm:0.38.1"
+"@lexical/table@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/table@npm:0.43.0"
   dependencies:
-    "@lexical/clipboard": 0.38.1
-    "@lexical/extension": 0.38.1
-    "@lexical/utils": 0.38.1
-    lexical: 0.38.1
-  checksum: 9ea4a6bee5c36d8306e6f905f081355ca3f1ce63db4117fbca11976d7c5c5cc93eac5a41c7ea9ac4aa4786d9be0d88d8b930d59ee23442fc7454d38c81a5315d
+    "@lexical/clipboard": 0.43.0
+    "@lexical/extension": 0.43.0
+    "@lexical/utils": 0.43.0
+    lexical: 0.43.0
+  checksum: 0b5a658978abb1737ed5f3ea8d3ceb315780382c7799c2c7154677333d155aaa285fe93991493f056aafd4d09d533038004672a401dbbf37a1715b2edd02a020
   languageName: node
   linkType: hard
 
-"@lexical/text@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/text@npm:0.38.1"
+"@lexical/text@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/text@npm:0.43.0"
   dependencies:
-    lexical: 0.38.1
-  checksum: abb9ff9045845e0114364108245ccebd46cd4df259308a07b565d670ab459d658d42dc842ab182d1f8bb71da5259a098cd3071cbb5022dabb29c1ef3179df8cf
+    lexical: 0.43.0
+  checksum: d76745405335c09fc43838e3f01c9ee6b419d9bae86c510c67b880d32ecab95e2e3fdd474dff4a7872a6f65c65e8e0e882f60520dd720724842be456103d6c84
   languageName: node
   linkType: hard
 
-"@lexical/utils@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/utils@npm:0.38.1"
+"@lexical/utils@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/utils@npm:0.43.0"
   dependencies:
-    "@lexical/list": 0.38.1
-    "@lexical/selection": 0.38.1
-    "@lexical/table": 0.38.1
-    lexical: 0.38.1
-  checksum: 121c1f2d4a341b1b7374315cc86f21cceb0193a77a066343cb5eb1e458a60fd21511c2285dd52001e9031b0242830d091c99df707ed5da2aea13a05e248549f2
+    "@lexical/selection": 0.43.0
+    lexical: 0.43.0
+  checksum: d16c04358238b47247d5798315759dab9cc8df9dca82228577824ccb9de9484a73e649fa7b436347a2816c27fc3a3ab8594241b14082405e7a4197ad7ade8cd1
   languageName: node
   linkType: hard
 
-"@lexical/yjs@npm:0.38.1":
-  version: 0.38.1
-  resolution: "@lexical/yjs@npm:0.38.1"
+"@lexical/yjs@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@lexical/yjs@npm:0.43.0"
   dependencies:
-    "@lexical/offset": 0.38.1
-    "@lexical/selection": 0.38.1
-    lexical: 0.38.1
+    "@lexical/offset": 0.43.0
+    "@lexical/selection": 0.43.0
+    lexical: 0.43.0
   peerDependencies:
     yjs: ">=13.5.22"
-  checksum: fb9ab146ba34323987886898a804a6f477530340404874b8548d3cb288cff792ec23690be63f7ff21d607ca07c0f7352e7e73aa1c7207e7c47e731f62eb6056a
+  checksum: b28f15eed25629735ec5e8710ff84e18a595157a0eb38827ac1cc9e3496b6fae5c03cdfca9cee642c720727f6e5d4ccce7c4e464aaf938b7b3d0b1f71f9822bc
   languageName: node
   linkType: hard
 
@@ -5289,6 +5307,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/ciphers@npm:^1.0.0":
+  version: 1.3.0
+  resolution: "@noble/ciphers@npm:1.3.0"
+  checksum: 19722c35475df9bc78db60d261d0b5ef8a6d722561efc2135453f943eaa421b492195dc666e3e4df2b755bca3739e04f04b9c660198559f5dd05d3cfbf1b9e92
+  languageName: node
+  linkType: hard
+
+"@noble/hashes@npm:^1.6.0":
+  version: 1.8.0
+  resolution: "@noble/hashes@npm:1.8.0"
+  checksum: c94e98b941963676feaba62475b1ccfa8341e3f572adbb3b684ee38b658df44100187fa0ef4220da580b13f8d27e87d5492623c8a02ecc61f23fb9960c7918f5
+  languageName: node
+  linkType: hard
+
 "@nodelib/fs.scandir@npm:2.1.5":
   version: 2.1.5
   resolution: "@nodelib/fs.scandir@npm:2.1.5"
@@ -6434,10 +6466,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@preact/signals-core@npm:^1.11.0":
-  version: 1.12.1
-  resolution: "@preact/signals-core@npm:1.12.1"
-  checksum: 55719713dc25fcb812dc1bdc6a4525f62287ec0a32364b902f925a8fe22dd3c2dc5f3f92734afd8a6ae7d7c28b0dbdf553ccb0b7e94ea386e283b800f9c15d35
+"@preact/signals-core@npm:^1.14.1":
+  version: 1.14.1
+  resolution: "@preact/signals-core@npm:1.14.1"
+  checksum: 796c718f4d766a2d061bede6cf8ed863a5cbb59a46d99760a4f3f2f54e4512a2b6faaec93637ec6d6842bbfbee90ad4cd7041ac9e8c0dce13cada8fe1f84e28b
   languageName: node
   linkType: hard
 
@@ -6979,171 +7011,174 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-pdf/fns@npm:3.1.2":
-  version: 3.1.2
-  resolution: "@react-pdf/fns@npm:3.1.2"
-  checksum: 4e8cdd32f223e4d3682b49a5539b1f9cf0a6b4e035f5e5ff9aa5a0c4235278820cc7f73c085aa696e46d61f22965c4f33ba1dd8335665c3e6e545dd7f4cde185
+"@react-pdf/fns@npm:3.1.3":
+  version: 3.1.3
+  resolution: "@react-pdf/fns@npm:3.1.3"
+  checksum: 0cd27ef6cde45a4fa45a664fb9ae568ae3b352082cf8fd480a110d1ec857a2d8e9550ee732941ce59fe409cf93889b909c1dbb23200ec4ca95c3cb972a70cb4c
   languageName: node
   linkType: hard
 
-"@react-pdf/font@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@react-pdf/font@npm:4.0.3"
+"@react-pdf/font@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "@react-pdf/font@npm:4.0.8"
   dependencies:
-    "@react-pdf/pdfkit": ^4.0.4
-    "@react-pdf/types": ^2.9.1
+    "@react-pdf/pdfkit": ^5.1.1
+    "@react-pdf/types": ^2.11.1
     fontkit: ^2.0.2
     is-url: ^1.2.4
-  checksum: 933e451381c6fcc77687318b8b193d0a81280f4f1499357b993853e4be5333d3a25db57a3662bb3548cedb98c990d53e49ea04b0462c193d33cc0480ce6958d6
+  checksum: 8343c363ea0c314fe136d67352144bdfde366fd095aaeb6ffe2d09191dd24f67627f81164f932f4fa68cf1a80bb74784610926142504035a6a0800a16285cbb5
   languageName: node
   linkType: hard
 
-"@react-pdf/image@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@react-pdf/image@npm:3.0.3"
+"@react-pdf/image@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@react-pdf/image@npm:3.1.0"
   dependencies:
-    "@react-pdf/png-js": ^3.0.0
+    "@react-pdf/svg": ^1.1.0
     jay-peg: ^1.1.1
-  checksum: 893ebef74d62d9d163af7035401c2bd0c5e43ceb7d6b9cc7e50d3ce2a2e7af7888b98e83e713a655ad6be5b0f246a1ac8a773a679ef30aaaac5b2579f0f8712f
+    png-js: ^2.0.0
+  checksum: 7054b84adad28c8f11575fd5c7d15b5336cbdb6f15cbee83cd338b0ccec5c11e01341ac67188427e098703ace40867c6af4240fdd4aa55897f07a4e3884adfdb
   languageName: node
   linkType: hard
 
-"@react-pdf/layout@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "@react-pdf/layout@npm:4.4.1"
+"@react-pdf/layout@npm:^4.6.1":
+  version: 4.6.1
+  resolution: "@react-pdf/layout@npm:4.6.1"
   dependencies:
-    "@react-pdf/fns": 3.1.2
-    "@react-pdf/image": ^3.0.3
-    "@react-pdf/primitives": ^4.1.1
-    "@react-pdf/stylesheet": ^6.1.1
-    "@react-pdf/textkit": ^6.0.0
-    "@react-pdf/types": ^2.9.1
+    "@react-pdf/fns": 3.1.3
+    "@react-pdf/image": ^3.1.0
+    "@react-pdf/primitives": ^4.3.0
+    "@react-pdf/stylesheet": ^6.2.1
+    "@react-pdf/textkit": ^6.3.0
+    "@react-pdf/types": ^2.11.1
     emoji-regex-xs: ^1.0.0
     queue: ^6.0.1
     yoga-layout: ^3.2.1
-  checksum: 5d7baa7f92cf569aa795af4b61690e2afa0e584481d983a50edc32462b8a909ad574f67c5ceca89219d74fa2becbfa317a43fd5190eb66b513e05830d0eea56f
+  checksum: 83ed94e0d03e559dbae958c3d111430bfd0a3071abfd58aca14071566d9462282ee965be4899dee52acf669cda1a9148e1ac594326497d5a4f68aa7b8edb3186
   languageName: node
   linkType: hard
 
-"@react-pdf/pdfkit@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@react-pdf/pdfkit@npm:4.0.4"
+"@react-pdf/pdfkit@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "@react-pdf/pdfkit@npm:5.1.1"
   dependencies:
     "@babel/runtime": ^7.20.13
-    "@react-pdf/png-js": ^3.0.0
+    "@noble/ciphers": ^1.0.0
+    "@noble/hashes": ^1.6.0
     browserify-zlib: ^0.2.0
-    crypto-js: ^4.2.0
     fontkit: ^2.0.2
     jay-peg: ^1.1.1
+    js-md5: ^0.8.3
     linebreak: ^1.1.0
+    png-js: ^2.0.0
     vite-compatible-readable-stream: ^3.6.1
-  checksum: 706cf5bc03b21f099c8b56771dba64a91efb2477dab8946ff803f971a8c6979d4d93372f56b09bd53abdc09468c8d623799d96c7f66763ff736a0a96dfaa82c3
+  checksum: 157af7e7656ca6374fcaa0e618eb2d41acd15d42ad3f626386351c3bf9c6997c4e4ec0fc21218c084c8166e663ed17ab580812c3e02d8f552adf9711ffdb926c
   languageName: node
   linkType: hard
 
-"@react-pdf/png-js@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@react-pdf/png-js@npm:3.0.0"
-  dependencies:
-    browserify-zlib: ^0.2.0
-  checksum: 90c1612d7576d83eaf3fef9d5714b7fedb8f3e83a9af199763c4d68f73652aecec7d9fa90f185224c412500849f44beb4a4c49828c097e93d2ad42336bb019d1
+"@react-pdf/primitives@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "@react-pdf/primitives@npm:4.3.0"
+  checksum: 391f48e09a9b13eb72f763398a792b59484637023afe1e19fba7b4bafde339af87b0d9142d50c0dcf980a81851f92f772fd27ce678af08c16552524da79e4f1b
   languageName: node
   linkType: hard
 
-"@react-pdf/primitives@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "@react-pdf/primitives@npm:4.1.1"
-  checksum: adadff1996daeca693aa59844ab613e597fdb674fce9f2c03f52573b593982ef49ff47d861290235861d02462ffbc87b7ed3da0d71af0d61c9226ce61b94ada8
-  languageName: node
-  linkType: hard
-
-"@react-pdf/reconciler@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "@react-pdf/reconciler@npm:1.1.4"
+"@react-pdf/reconciler@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@react-pdf/reconciler@npm:2.0.0"
   dependencies:
     object-assign: ^4.1.1
     scheduler: 0.25.0-rc-603e6108-20241029
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: d920898a1c6bee70fb257aad1d53c062fedd9d2ad6ca6c63902bfc03c71713f4ab01a18cbfba55724ab7ca74985a2bc4774c51f690471182a7622a8a48056054
+  checksum: 249df947f0dad304d43a69699419768db94422197004d0af66857630522dbd35041f4929726bfe1b46b9a28c042f8adb8fa6cb4f62691e502ada5ecc7a3af420
   languageName: node
   linkType: hard
 
-"@react-pdf/render@npm:^4.3.1":
-  version: 4.3.1
-  resolution: "@react-pdf/render@npm:4.3.1"
+"@react-pdf/render@npm:^4.5.1":
+  version: 4.5.1
+  resolution: "@react-pdf/render@npm:4.5.1"
   dependencies:
     "@babel/runtime": ^7.20.13
-    "@react-pdf/fns": 3.1.2
-    "@react-pdf/primitives": ^4.1.1
-    "@react-pdf/textkit": ^6.0.0
-    "@react-pdf/types": ^2.9.1
+    "@react-pdf/fns": 3.1.3
+    "@react-pdf/primitives": ^4.3.0
+    "@react-pdf/textkit": ^6.3.0
+    "@react-pdf/types": ^2.11.1
     abs-svg-path: ^0.1.1
-    color-string: ^1.9.1
+    color-string: ^2.1.4
     normalize-svg-path: ^1.1.0
     parse-svg-path: ^0.1.2
     svg-arc-to-cubic-bezier: ^3.2.0
-  checksum: 2dfea722c1251030868e5c0ac6fd83179d01027f1cea3848cc637c3f98aa6144eb0672211cdce6a13bd89d8b8dbeaf59b9d3d85ae91abe19ca615e1bfb8e5fcb
+  checksum: 2ece33377403f4bd5d1d1f7fe8030bd65a31a89400354622b01f7eb1fb505a67fb23039aa33b43963fa7e32f53c933a142a7aaf5aa64b51c16f30d9369051efb
   languageName: node
   linkType: hard
 
-"@react-pdf/renderer@npm:^4.3.0":
-  version: 4.3.1
-  resolution: "@react-pdf/renderer@npm:4.3.1"
+"@react-pdf/renderer@npm:^4.4.1":
+  version: 4.5.1
+  resolution: "@react-pdf/renderer@npm:4.5.1"
   dependencies:
     "@babel/runtime": ^7.20.13
-    "@react-pdf/fns": 3.1.2
-    "@react-pdf/font": ^4.0.3
-    "@react-pdf/layout": ^4.4.1
-    "@react-pdf/pdfkit": ^4.0.4
-    "@react-pdf/primitives": ^4.1.1
-    "@react-pdf/reconciler": ^1.1.4
-    "@react-pdf/render": ^4.3.1
-    "@react-pdf/types": ^2.9.1
+    "@react-pdf/fns": 3.1.3
+    "@react-pdf/font": ^4.0.8
+    "@react-pdf/layout": ^4.6.1
+    "@react-pdf/pdfkit": ^5.1.1
+    "@react-pdf/primitives": ^4.3.0
+    "@react-pdf/reconciler": ^2.0.0
+    "@react-pdf/render": ^4.5.1
+    "@react-pdf/types": ^2.11.1
     events: ^3.3.0
     object-assign: ^4.1.1
     prop-types: ^15.6.2
     queue: ^6.0.1
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 0e9e2d9b30fd238f9bebe3d2409496b6ea40c45f9960f7f72efd21cde9d8eda7fe835eeca0faf30511abc66cc62c8862f3114642901b1bce92fde89bc19d8516
+  checksum: 55046bcba438e935210f9eb0dc3bd4d9afe9bcefc39a423de0bea2f7c79965f40c3fb78b96e729378725cc45c36c813f9772ed75fd446f898a7e06d9ddee494a
   languageName: node
   linkType: hard
 
-"@react-pdf/stylesheet@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "@react-pdf/stylesheet@npm:6.1.1"
+"@react-pdf/stylesheet@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "@react-pdf/stylesheet@npm:6.2.1"
   dependencies:
-    "@react-pdf/fns": 3.1.2
-    "@react-pdf/types": ^2.9.1
-    color-string: ^1.9.1
+    "@react-pdf/fns": 3.1.3
+    "@react-pdf/types": ^2.11.1
+    color-string: ^2.1.4
     hsl-to-hex: ^1.0.0
     media-engine: ^1.0.3
     postcss-value-parser: ^4.1.0
-  checksum: 129d5e01eccd1dcde053d4fdae892a19999c4b3980b030d3356d0305ca40de587af08ba2268bc9beec09863743e249eacec92ecd01942629d9d281aaf2e205f2
+  checksum: b5fdedf2902b2cbf9c9a1a3c3329fb71e10a73bcaf32642e3b3cdae27c92e74d1610f48a77b4bd30e224ded741b15d2448dea312bbdf6e255cb4a0562780d553
   languageName: node
   linkType: hard
 
-"@react-pdf/textkit@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "@react-pdf/textkit@npm:6.0.0"
+"@react-pdf/svg@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@react-pdf/svg@npm:1.1.0"
   dependencies:
-    "@react-pdf/fns": 3.1.2
+    "@react-pdf/primitives": ^4.3.0
+  checksum: 23c3052ee057affa373d212d84e6478dbced19a57892d575009619359661579335b69c137d2339e3960c678d69fbacdbcd1fb1925227895af0a6d3bb8a9261e6
+  languageName: node
+  linkType: hard
+
+"@react-pdf/textkit@npm:^6.3.0":
+  version: 6.3.0
+  resolution: "@react-pdf/textkit@npm:6.3.0"
+  dependencies:
+    "@react-pdf/fns": 3.1.3
     bidi-js: ^1.0.2
     hyphen: ^1.6.4
     unicode-properties: ^1.4.1
-  checksum: 5bc087ad2da60d1c3c3a06f02639adaca3d059f526ee9ec79fc7877ef224813ec2eef8f064b36872b5a6e659c510813abe0d89b6fecc0c014833dd5437dc7ef9
+  checksum: d95f16dce9954d95e70837158066cd96723902501002fad942d0070806ea4d77a0457399f9d645272a81732d66bd39bdbefb5c0bd6f5e2fe39a8e358da6cd01d
   languageName: node
   linkType: hard
 
-"@react-pdf/types@npm:^2.9.1":
-  version: 2.9.1
-  resolution: "@react-pdf/types@npm:2.9.1"
+"@react-pdf/types@npm:^2.11.1":
+  version: 2.11.1
+  resolution: "@react-pdf/types@npm:2.11.1"
   dependencies:
-    "@react-pdf/font": ^4.0.3
-    "@react-pdf/primitives": ^4.1.1
-    "@react-pdf/stylesheet": ^6.1.1
-  checksum: 99b8dbc64ecc69115af2bb17e06d77c61639cb8f01b305dfbe05c57751cceae7b2e0b7a1b3c9ac6cc478ccb61a46d58b7b407d0408fe5025365c2a7dec626068
+    "@react-pdf/font": ^4.0.8
+    "@react-pdf/primitives": ^4.3.0
+    "@react-pdf/stylesheet": ^6.2.1
+  checksum: 54ede0941500a923d45a02473901d1a843d9c4e2cad13942268d48fd5376e2f6ceabd8ba09657504e32373cb23fd6321fec8c072a3cae552cf7f6468854d0e98
   languageName: node
   linkType: hard
 
@@ -9160,16 +9195,17 @@ __metadata:
     "@babel/plugin-transform-react-jsx": ^7.19.0
     "@babel/preset-env": "*"
     "@babel/preset-typescript": ^7.21.5
-    "@lexical/clipboard": 0.38.1
-    "@lexical/headless": 0.38.1
-    "@lexical/link": 0.38.1
-    "@lexical/list": 0.38.1
-    "@lexical/react": 0.38.1
-    "@lexical/rich-text": 0.38.1
-    "@lexical/utils": 0.38.1
+    "@lexical/clipboard": 0.43.0
+    "@lexical/code": 0.43.0
+    "@lexical/headless": 0.43.0
+    "@lexical/link": 0.43.0
+    "@lexical/list": 0.43.0
+    "@lexical/react": 0.43.0
+    "@lexical/rich-text": 0.43.0
+    "@lexical/utils": 0.43.0
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.10
     "@radix-ui/react-slot": ^1.0.1
-    "@react-pdf/renderer": ^4.3.0
+    "@react-pdf/renderer": ^4.4.1
     "@simplewebauthn/browser": ^8.0.2
     "@standardnotes/authenticator": ^2.4.12
     "@standardnotes/autobiography-theme": ^1.2.7
@@ -9218,7 +9254,7 @@ __metadata:
     identity-obj-proxy: ^3.0.0
     jest: ^29.3.1
     jest-environment-jsdom: ^29.3.1
-    lexical: 0.38.1
+    lexical: 0.43.0
     lint-staged: ">=13"
     mini-css-extract-plugin: ^2.7.2
     minimatch: ^5.1.1
@@ -9941,12 +9977,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^20.0.0":
-  version: 20.19.23
-  resolution: "@types/node@npm:20.19.23"
+"@types/node@npm:>=20.0.0":
+  version: 25.6.0
+  resolution: "@types/node@npm:25.6.0"
   dependencies:
-    undici-types: ~6.21.0
-  checksum: 1f213fa43821c59a0e00500e86a82e5d0e7eb912a4d216a7d9ebc59adef1aba734e3774d6fad9d213f97ba518fe3e0cd95b508e9e2b7c460f75c9bff6c957b70
+    undici-types: ~7.19.0
+  checksum: 98945eb59909a08868ccac203022f122b5549448ef8628de9eac3fe20481467cd6ec32af819fd432695f67ac21ebbbc69c8a141de6c6455edaf6e717e2cb89c9
   languageName: node
   linkType: hard
 
@@ -10222,6 +10258,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/ws@npm:^8.18.1":
+  version: 8.18.1
+  resolution: "@types/ws@npm:8.18.1"
+  dependencies:
+    "@types/node": "*"
+  checksum: 0331b14cde388e2805af66cad3e3f51857db8e68ed91e5b99750915e96fe7572e58296dc99999331bbcf08f0ff00a227a0bb214e991f53c2a5aca7b0e71173fa
+  languageName: node
+  linkType: hard
+
 "@types/ws@npm:^8.5.5":
   version: 8.5.5
   resolution: "@types/ws@npm:8.5.5"
@@ -13431,7 +13476,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-string@npm:^1.6.0, color-string@npm:^1.9.1":
+"color-name@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "color-name@npm:2.1.0"
+  checksum: eb014f71d87408e318e95d3f554f188370d354ba8e0ffa4341d0fd19de391bfe2bc96e563d4f6614644d676bc24f475560dffee3fe310c2d6865d007410a9a2b
+  languageName: node
+  linkType: hard
+
+"color-string@npm:^1.6.0":
   version: 1.9.1
   resolution: "color-string@npm:1.9.1"
   dependencies:
@@ -13441,6 +13493,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"color-string@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "color-string@npm:2.1.4"
+  dependencies:
+    color-name: ^2.0.0
+  checksum: f9caa29d529c549febeec813fcc0ecb184ff3dee92cec78f1fd3dfe2c4168fc1b74442efc40e34d2d677470967f570234d11086c3b137d6f9958a8fe12587fde
+  languageName: node
+  linkType: hard
+
 "color-support@npm:^1.1.2, color-support@npm:^1.1.3":
   version: 1.1.3
   resolution: "color-support@npm:1.1.3"
@@ -14160,13 +14221,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-js@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "crypto-js@npm:4.2.0"
-  checksum: f051666dbc077c8324777f44fbd3aaea2986f198fe85092535130d17026c7c2ccf2d23ee5b29b36f7a4a07312db2fae23c9094b644cc35f7858b1b4fcaf27774
-  languageName: node
-  linkType: hard
-
 "crypto-random-string@npm:^4.0.0":
   version: 4.0.0
   resolution: "crypto-random-string@npm:4.0.0"
@@ -15353,6 +15407,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "entities@npm:7.0.1"
+  checksum: 5ee49e52e64eafc63251585f74eae50f259ea2169dbbf5380843dcd97c79bfe430a58e7f34012ab67a8e258f6ef9f92d721d149ffc88c89039e155f1bcf48a53
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -16582,6 +16643,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fflate@npm:^0.8.2":
+  version: 0.8.3
+  resolution: "fflate@npm:0.8.3"
+  checksum: a2a417e8fb5128b946cb397ab59a90e089057cba492f2c17a89c4af6ba8568b3da72ed36ef1efe901df7858a20964ce56e84d282e60498be1947fcc6133bc891
+  languageName: node
+  linkType: hard
+
 "figures@npm:^5.0.0":
   version: 5.0.0
   resolution: "figures@npm:5.0.0"
@@ -17734,14 +17802,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"happy-dom@npm:^20.0.0":
-  version: 20.0.8
-  resolution: "happy-dom@npm:20.0.8"
+"happy-dom@npm:^20.8.9":
+  version: 20.9.0
+  resolution: "happy-dom@npm:20.9.0"
   dependencies:
-    "@types/node": ^20.0.0
+    "@types/node": ">=20.0.0"
     "@types/whatwg-mimetype": ^3.0.2
+    "@types/ws": ^8.18.1
+    entities: ^7.0.1
     whatwg-mimetype: ^3.0.0
-  checksum: 4d1131542ce1019ee83492ad2370069244a35884137783c3d6e89b609ab1a72d38349e80a4c321f33eddeea0c350abc6f0667eed22acdee21a8c0bbe0613dd0e
+    ws: ^8.18.3
+  checksum: 6cc02c95c21204abeb6f38e554d0dc9c91fe77b7ac43d4565ea4225689226de2fc0ba1a509447c9df6dea6c34f5a7c06bc5e539c643b2fc39e4a26d139614542
   languageName: node
   linkType: hard
 
@@ -20103,6 +20174,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-md5@npm:^0.8.3":
+  version: 0.8.3
+  resolution: "js-md5@npm:0.8.3"
+  checksum: b8578232d8004978036f114aa4d46ad7c06ca36b2a6889f241762263424cfea6099701ec5394a1b463ad95f18f74a2acb8c6033b5ebd6a188d67a9e704b41e05
+  languageName: node
+  linkType: hard
+
 "js-message@npm:1.0.7":
   version: 1.0.7
   resolution: "js-message@npm:1.0.7"
@@ -20693,10 +20771,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lexical@npm:0.38.1":
-  version: 0.38.1
-  resolution: "lexical@npm:0.38.1"
-  checksum: af080ba2445d1fde08ad75530b969e1311ec146f4fec1e4ceaf5e8e6ef6afde85a8c8f4cb0c25756c0331b78b0b2549fc988ed9d6f6c5d1afd2cf59c85a6bac4
+"lexical@npm:0.43.0":
+  version: 0.43.0
+  resolution: "lexical@npm:0.43.0"
+  checksum: 0cb9b22669cfc758bc38942b2267eba5b89a773c1dd7379cb031dae1413922484521d162e474f6c6335e243cab4592516ba59628afa926a400a89d3a38a5279b
   languageName: node
   linkType: hard
 
@@ -24234,6 +24312,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"png-js@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "png-js@npm:2.0.0"
+  dependencies:
+    fflate: ^0.8.2
+  checksum: a880131c0c8791dd2705e019d7d2b859a36dbabd16c4555b829d582d2ddda7495d757ca8a5fec2a944c7dad6fb27d2d1dd9ea246f0b2f61b8a700741970dbbf4
+  languageName: node
+  linkType: hard
+
 "pod-install@npm:^0.3.5":
   version: 0.3.7
   resolution: "pod-install@npm:0.3.7"
@@ -28810,6 +28897,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~7.19.0":
+  version: 7.19.2
+  resolution: "undici-types@npm:7.19.2"
+  checksum: f721026160e1f068a982401d0272b872819c335a2f64783c235ddd37a65ccd94327ec24489cee4556d57c77c14bd68ced60efa5def11cf11e3991f5ebf5e0e72
+  languageName: node
+  linkType: hard
+
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
@@ -29996,6 +30090,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^8.18.3":
+  version: 8.20.0
+  resolution: "ws@npm:8.20.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 2b31d24a53690770564a033c21ea48390f84d23fbc5abc14b2bbec4e112846f2f3ca66caee769a73fb8bc89ba16b452a6911a553e9742bbc75bccb79e203953e
+  languageName: node
+  linkType: hard
+
 "xdg-basedir@npm:^5.0.1, xdg-basedir@npm:^5.1.0":
   version: 5.1.0
   resolution: "xdg-basedir@npm:5.1.0"