diff --git a/concourse/book-scan/script.bash b/concourse/book-scan/script.bash
index 4ebd30710a..3fff4a8f6e 100755
--- a/concourse/book-scan/script.bash
+++ b/concourse/book-scan/script.bash
@@ -6,6 +6,6 @@ cloudfront_environment=$(< cloudfront-environment/version.txt)
 
 cd rex-web
 
-yarn
+yarn install --network-timeout 60000
 
 node script/entry.js domVisitor errorsExist --rootUrl="https://$cloudfront_environment" --queryString="validateLinks"
diff --git a/concourse/create-test-plan-configs/task.yml b/concourse/create-test-plan-configs/task.yml
index 41e2419d3d..861594db39 100644
--- a/concourse/create-test-plan-configs/task.yml
+++ b/concourse/create-test-plan-configs/task.yml
@@ -30,5 +30,5 @@ run:
     - |
       DEST=$(pwd)/test-plans
       cd rex-web/concourse/create-test-plan-configs
-      yarn install
+      yarn install --network-timeout 60000
       ./script.js $DEST
diff --git a/concourse/lighthouse/script.bash b/concourse/lighthouse/script.bash
new file mode 100755
index 0000000000..bbe032aee1
--- /dev/null
+++ b/concourse/lighthouse/script.bash
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+
+base_dir=$(pwd)
+
+cd rex-web
+
+yarn install --network-timeout 60000
+
+node script/entry.js lighthouse --pages="$LIGHTHOUSE_PAGES" \
+                                --mostRecentReportDir="$base_dir/$LIGHTHOUSE_MOST_RECENT_REPORT_DIR" \
+                                --reportDir="$base_dir/$LIGHTHOUSE_REPORT_DIR"
diff --git a/concourse/lighthouse/task.yml b/concourse/lighthouse/task.yml
new file mode 100644
index 0000000000..bd11e11979
--- /dev/null
+++ b/concourse/lighthouse/task.yml
@@ -0,0 +1,26 @@
+---
+platform: linux
+
+image_resource:
+  type: docker-image
+  source:
+    password: ((dockerhub-password))
+    username: ((dockerhub-username))
+    repository: openstax/rex-web
+    tag: CI-2023-08-10
+
+inputs:
+- name: rex-web
+- name: most-recent-lighthouse-report
+outputs:
+- name: lighthouse-report
+
+params:
+  AWS_ACCESS_KEY_ID: ((prod-aws-access-key-id))
+  AWS_SECRET_ACCESS_KEY: ((prod-aws-secret-access-key))
+  LIGHTHOUSE_PAGES: ((lighthouse-pages))
+  LIGHTHOUSE_MOST_RECENT_REPORT_DIR: most-recent-lighthouse-report
+  LIGHTHOUSE_REPORT_DIR: lighthouse-report
+
+run:
+  path: rex-web/concourse/lighthouse/script.bash
diff --git a/package.json b/package.json
index 853baf33e9..020c3dd526 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "test:prerender:specs": "REACT_APP_ENV=test SERVER_MODE=built jest --testPathPattern=\"(\\.|/)prerenderspec\\.tsx?\" --config jest-puppeteer.config.json",
     "test:prerender:browser": "REACT_APP_ENV=test SERVER_MODE=built jest --testPathPattern=\"(\\.|/)browserspec\\.tsx?\" --config jest-puppeteer.config.json -i",
     "test:prerender:screenshots": "REACT_APP_ENV=test SERVER_MODE=built jest --testPathPattern=\"(\\.|/)screenshotspec\\.tsx?\" --config jest-puppeteer.config.json",
-    "test:lighthouse-manual": "REACT_APP_ENV=test lighthouse --view --config-path=./src/test/audits/index.js",
+    "test:lighthouse:manual": "REACT_APP_ENV=test lighthouse --view --config-path=./src/test/audits/index.js",
     "analyze:bundle": "craco build && source-map-explorer 'build/static/js/*.js' -m",
     "analyze:dom": "node ./script/entry.js domVisitor",
     "heroku-postbuild": "npm run-script build:clean"
diff --git a/playwright/src/fixtures/content.page.ts b/playwright/src/fixtures/content.page.ts
index f47c972a8d..191bfd2dff 100644
--- a/playwright/src/fixtures/content.page.ts
+++ b/playwright/src/fixtures/content.page.ts
@@ -90,6 +90,13 @@ class ContentPage {
       .addCookies([{ name: 'nudge_study_guides_date', value: current_date, url: this.page.url() }])
   }
 
+  async canonical() {
+    // Return canonical link of the current page
+    let canonicalPageSelector = await this.page.$('[rel="canonical"]')
+    const canonicalPage = await canonicalPageSelector.evaluate((e) => e.getAttribute('href'))
+    return canonicalPage
+  }
+
   async colorLocator(color: string) {
     // Return locator of the color
     if (color === 'blue') {
diff --git a/playwright/src/fixtures/toc.ts b/playwright/src/fixtures/toc.ts
index 0b5f52c447..06e60a8584 100644
--- a/playwright/src/fixtures/toc.ts
+++ b/playwright/src/fixtures/toc.ts
@@ -89,7 +89,7 @@ class TOC {
       if ((await titleAfterClick) != (await titleBeforeClick)) {
         return
       } else {
-        sleep(1)
+        sleep(2)
       }
     } else {
       console.log('The page number specified exceeds the total pages in the book')
diff --git a/playwright/tests/rex-test/rex.behaviorspec.ts b/playwright/tests/rex-test/rex.behaviorspec.ts
index dc254353e1..29b73b1a7b 100644
--- a/playwright/tests/rex-test/rex.behaviorspec.ts
+++ b/playwright/tests/rex-test/rex.behaviorspec.ts
@@ -576,3 +576,101 @@ test('MH page dropdown filters', async ({ page, isMobile }) => {
   const highlightcount = await bookPage.highlightCount()
   expect(highlightcount).toBe(2)
 })
+
+
+test('C543224 canonicals for books with no shared content', async ({ page, isMobile, browserName }) => {
+  test.skip(isMobile as boolean, 'test only desktop resolution')
+  test.skip(browserName == 'webkit', 'test only chrome')
+  test.skip(browserName == 'firefox', 'test only chrome')
+
+  // GIVEN: Open Rex page
+  const bookPage = new ContentPage(page)
+  const path = '/books/chemistry-2e/pages/1-1-chemistry-in-context'
+  await bookPage.open(path)
+
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/chemistry-2e/pages/1-1-chemistry-in-context')
+
+  // WHEN: click EOC page
+  const Toc = new TOC(page)
+  await Toc.pageClick(9)
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/chemistry-2e/pages/1-key-equations')
+
+  // WHEN: Click EOB page
+  await Toc.pageClick(221)
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/chemistry-2e/pages/e-water-properties')
+
+  // WHEN: click nested EOB page
+  await Toc.pageClick(230)
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/chemistry-2e/pages/chapter-1')
+})
+
+
+test('C543225 canonicals for pages derived from another book', async ({ page, isMobile, browserName }) => {
+  test.skip(isMobile as boolean, 'test only desktop resolution')
+  test.skip(browserName == 'webkit', 'test only chrome')
+  test.skip(browserName == 'firefox', 'test only chrome')
+
+  // GIVEN: Open Rex page derived from another book
+  const bookPage = new ContentPage(page)
+  const path = '/books/preparing-for-college-success/pages/2-1-why-college'
+  await bookPage.open(path)
+
+  // THEN: Canonical page points to original content
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/college-success-concise/pages/1-1-why-college')
+
+  // WHEN: click EOC page from a chapter derived from another book
+  const Toc = new TOC(page)
+  await Toc.pageClick(14)
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/preparing-for-college-success/pages/2-summary')
+
+
+  // WHEN: Open page unique to this book
+  await Toc.pageClick(3)
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/preparing-for-college-success/pages/1-2-your-academic-journey-and-personal-story')
+
+  // WHEN: Open EOC page from the chapter unique to this book
+  await Toc.pageClick(6)
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/preparing-for-college-success/pages/1-family-friends-matter')
+  
+  // WHEN: Open EOB page from the chapter unique to this book
+  await Toc.pageClick(71)
+  // THEN: Canonical page points to itself
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/preparing-for-college-success/pages/index')
+})
+
+test('C543225 canonicals for old editions point to the latest edition', async ({ page, isMobile, browserName }) => {
+  test.skip(isMobile as boolean, 'test only desktop resolution')
+  test.skip(browserName == 'webkit', 'test only chrome')
+  test.skip(browserName == 'firefox', 'test only chrome')
+
+  // GIVEN: Open older edition of Rex page derived from another book
+  const bookPage = new ContentPage(page)
+  const path = '/books/principles-macroeconomics-2e/pages/1-introduction'
+  await bookPage.open(path)
+  // THEN: Canonical page points to latest edition of the original content
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/principles-economics-3e/pages/1-introduction')
+
+  // WHEN: Open older edition of EOC page of a book derived from another book
+  const Toc = new TOC(page)
+  await Toc.pageClick(7)
+  // THEN: Canonical page points to itself 
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/principles-macroeconomics-2e/pages/1-key-concepts-and-summary')
+
+  // WHEN: Open older edition of nested EOB page of a book derived from another book
+  await Toc.pageClick(243)
+  // THEN: Canonical page points to itself 
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/principles-macroeconomics-2e/pages/chapter-2')
+
+
+  // WHEN: Open older edition of appendix page of a book derived from another book
+  await Toc.pageClick(241)
+  // THEN: Canonical page points to latest edition of the original content
+  expect(await bookPage.canonical()).toBe('https://openstax.org/books/principles-economics-3e/pages/d-the-expenditure-output-model')
+})
diff --git a/public/index.html b/public/index.html
index f544983b2d..6832197527 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,26 +10,8 @@
     -->
     <link rel="manifest" href="/dist/assets/manifest.json">
 
-
-    <!--
-      this style shows the osano widget after a delay, giving the app
-      a chance to explicitly hide it but still defaulting to showing it
-      as a safety fallback
-    -->
-    <style>
-      .osano-cm-widget {
-        animation: fadeInAnimation 5s;
-        animation-iteration-count: 1;
-        animation-fill-mode: forwards;
-      }
-      @keyframes fadeInAnimation {
-        0% { opacity: 0; }
-        90% { opacity: 0; }
-        100% { opacity: 1; }
-      }
-    </style>
+    <link rel="stylesheet" href="https://ram.openstax.org/osano/osano.css">
     <script src="https://cmp.osano.com/AzZqbXTbzhHsU3cv1/68d8e8ae-4024-4489-a000-72766ad284a6/osano.js"></script>
-    <script src="https://chat.research.openstax.org/assets/static/loader.js" async></script>
 
     <!-- Google Tag Manager -->
     <script>
diff --git a/pytest-selenium/pages/content.py b/pytest-selenium/pages/content.py
index 985b9055a2..39d7a89769 100644
--- a/pytest-selenium/pages/content.py
+++ b/pytest-selenium/pages/content.py
@@ -28,6 +28,7 @@
 BOUNDING_RECTANGLE = "return arguments[0].getBoundingClientRect();"
 COMPUTED_STYLES = "return window.getComputedStyle(arguments[0]){field};"
 ELEMENT_SELECT = "return document.querySelector('{selector}');"
+FOCUSED_HIGHLIGHT_LOCATOR = "[data-highlight-id='{n}'][aria-current=true]"
 
 
 class ContentError(Exception):
@@ -746,6 +747,18 @@ def highlight_ids(self) -> List[str]:
                 set([highlight.get_attribute("data-highlight-id") for highlight in self.highlights])
             )
 
+        def highlight_focused(self, highlight_id) -> bool:
+            """Return True if the highlight is focused.
+
+            :return: ``True`` if the highlight is focused
+            :rtype: bool
+
+            """
+            focused_highlight_locator = self.find_elements(
+                By.CSS_SELECTOR, FOCUSED_HIGHLIGHT_LOCATOR.format(n=highlight_id)
+            )
+            return bool(focused_highlight_locator)
+
         @property
         def images(self) -> List[WebElement]:
             """Return the content images.
diff --git a/pytest-selenium/requirements-dev.txt b/pytest-selenium/requirements-dev.txt
index cd6bf2ad75..93b0bc012f 100644
--- a/pytest-selenium/requirements-dev.txt
+++ b/pytest-selenium/requirements-dev.txt
@@ -5,11 +5,11 @@ certifi==2023.7.22
 cffi==1.15.0
 cfgv==3.3.1
 chardet==4.0.0
-chromedriver-binary==122.0.6261.94
-cryptography==42.0.0
+chromedriver-binary==124.0.6367.78.0
+cryptography==42.0.4
 Faker==13.3.4
 identify==2.4.12
-idna==2.10 # pyup: ignore
+idna==3.7 # pyup: ignore
 importlib-metadata==4.11.3
 more-itertools==8.12.0
 nodeenv==1.6.0
diff --git a/pytest-selenium/tests/test_highlighting_56.py b/pytest-selenium/tests/test_highlighting_56.py
index dc3ffadef3..919660a54d 100644
--- a/pytest-selenium/tests/test_highlighting_56.py
+++ b/pytest-selenium/tests/test_highlighting_56.py
@@ -66,8 +66,7 @@ def test_modal_for_unsaved_notes_appears_on_clicking_another_highlight(
 
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=id_2)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(id_2), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: click the 1st highlight again
@@ -79,8 +78,7 @@ def test_modal_for_unsaved_notes_appears_on_clicking_another_highlight(
 
     # THEN: Unsaved note is abandoned and the highlight box is opened for the 1st highlight
     assert book.content.highlight_box.is_open, "Highlight box not open"
-    highlight = book.content.get_highlight(by_id=id_1)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(id_1), "highlight is not in focus"
     assert book.content.highlight_box.note == ""
 
 
@@ -127,8 +125,7 @@ def test_modal_for_unsaved_notes_appears_on_page_navigation_using_toc(
     # THEN: The modal is closed and the unsaved note is retained on the page
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=highlight_id)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(highlight_id), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Click the TOC link again
@@ -202,8 +199,7 @@ def test_modal_for_unsaved_notes_appears_on_page_navigation_using_prev_link(
     # THEN: The modal is closed and the unsaved note is retained on the page
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=highlight_id)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(highlight_id), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Click previous link again
@@ -277,8 +273,7 @@ def test_modal_for_unsaved_notes_appears_on_page_navigation_using_next_link(
     # THEN: The modal is closed and the unsaved note is retained on the page
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=highlight_id)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(highlight_id), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Click next link again
@@ -351,8 +346,7 @@ def test_modal_for_unsaved_notes_appears_on_clicking_book_title(
     # THEN: The modal is closed and the unsaved note is retained on the page
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=highlight_id)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(highlight_id), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Click on book title again
@@ -424,8 +418,7 @@ def test_modal_for_unsaved_notes_appears_on_selecting_new_text(
     # THEN: The modal is closed and the unsaved note is retained in the page
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=id_1)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(id_1), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Select some text in the page again
@@ -500,8 +493,7 @@ def test_modal_for_unsaved_notes_appears_on_clicking_search_result_same_page(
     # THEN: The modal is closed and the unsaved note is retained in the page
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=id_1)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(id_1), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Click the same search result again
@@ -512,6 +504,7 @@ def test_modal_for_unsaved_notes_appears_on_clicking_search_result_same_page(
     book.wait_for_page_to_load()
 
     # THEN: Unsaved note of the user highlight is abandoned
+    highlight = book.content.get_highlight(by_id=id_1)[0]
     assert not selenium.execute_script(HAS_INDICATOR, highlight), "note is saved for the highlight"
 
     # AND: The selected search result is highlighted
@@ -573,8 +566,7 @@ def test_modal_for_unsaved_notes_appears_on_clicking_search_result_different_pag
     # THEN: The modal is closed and the unsaved note is retained in the page
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
-    highlight = book.content.get_highlight(by_id=id_1)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(id_1), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Click the same search result again
@@ -654,7 +646,7 @@ def test_modal_for_unsaved_notes_appears_on_clicking_content_links(
     assert book.content.highlight_box.is_open, "Highlight box not open"
     assert book.content.highlight_box.is_edit_box
     highlight = book.content.get_highlight(by_id=id_1)[0]
-    assert "focus" in highlight.get_attribute("class"), "highlight is not in focus"
+    assert book.content.highlight_focused(id_1), "highlight is not in focus"
     assert book.content.highlight_box.note == note
 
     # WHEN: Click the same link again
diff --git a/pytest-selenium/utils/books.json b/pytest-selenium/utils/books.json
index 0e56d5077b..8813683f98 100644
--- a/pytest-selenium/utils/books.json
+++ b/pytest-selenium/utils/books.json
@@ -1,26 +1,26 @@
 {
     "algebra-and-trigonometry": {
         "default_page": "1-introduction-to-prerequisites",
-        "search_term": "Graphs of Parabolas",
-        "chapter_search_results_total": 6,
+        "search_term": "figure",
+        "chapter_search_results_total": 1011,
         "rkt_search_results_total": 0
     },
     "algebra-and-trigonometry-2e": {
         "default_page": "1-introduction-to-prerequisites",
         "search_term": "quadratic equations",
-        "chapter_search_results_total": 58,
-        "rkt_search_results_total": 2
+        "chapter_search_results_total": 157,
+        "rkt_search_results_total": 3
     },
     "american-government-2e": {
         "default_page": "1-introduction",
         "search_term": "hypodermic theory",
-        "chapter_search_results_total": 1,
+        "chapter_search_results_total": 3,
         "rkt_search_results_total": 1
     },
     "american-government-3e": {
         "default_page": "1-introduction",
         "search_term": "Commercial fishers",
-        "chapter_search_results_total": 2,
+        "chapter_search_results_total": 4,
         "rkt_search_results_total": 0
     },
     "anatomy-and-physiology": {
@@ -32,13 +32,13 @@
     "anatomy-and-physiology-2e": {
         "default_page": "1-introduction",
         "search_term": "Figure 2.22a",
-        "chapter_search_results_total": 3,
+        "chapter_search_results_total": 6,
         "rkt_search_results_total": 0
     },
     "astronomy": {
         "default_page": "1-introduction",
         "search_term": "leap year",
-        "chapter_search_results_total": 23,
+        "chapter_search_results_total": 12,
         "rkt_search_results_total": 0
     },
     "astronomy-2e": {
@@ -50,13 +50,13 @@
     "biology-2e": {
         "default_page": "1-introduction",
         "search_term": "evolution theory",
-        "chapter_search_results_total": 46,
+        "chapter_search_results_total": 341,
         "rkt_search_results_total": 0
     },
     "biology-ap-courses": {
         "default_page": "1-introduction",
         "search_term": "Virus",
-        "chapter_search_results_total": 177,
+        "chapter_search_results_total": 406,
         "rkt_search_results_total": 10
     },
     "business-ethics": {
@@ -74,19 +74,19 @@
     "chemistry-2e": {
         "default_page": "1-introduction",
         "search_term": "molecule",
-        "chapter_search_results_total": 422,
-        "rkt_search_results_total": 4
+        "chapter_search_results_total": 1554,
+        "rkt_search_results_total": 14
     },
     "chemistry-atoms-first-2e": {
         "default_page": "1-introduction",
         "search_term": "coffee",
-        "chapter_search_results_total": 31,
+        "chapter_search_results_total": 35,
         "rkt_search_results_total": 0
     },
     "college-algebra": {
         "default_page": "1-introduction-to-prerequisites",
         "search_term": "hyperbola",
-        "chapter_search_results_total": 113,
+        "chapter_search_results_total": 134,
         "rkt_search_results_total": 2
     },
     "college-algebra-2e": {
@@ -104,31 +104,31 @@
     "college-algebra-corequisite-support-2e": {
         "default_page": "1-introduction-to-prerequisites",
         "search_term": "table",
-        "chapter_search_results_total": 262,
+        "chapter_search_results_total": 283,
         "rkt_search_results_total": 0
     },
     "college-physics": {
         "default_page": "1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units",
         "search_term": "Newton's first law",
-        "chapter_search_results_total": 49,
-        "rkt_search_results_total": 3
+        "chapter_search_results_total": 18,
+        "rkt_search_results_total": 1
     },
     "college-physics-ap-courses": {
         "default_page": "1-connection-for-ap-r-courses",
         "search_term": "kinetic energy",
-        "chapter_search_results_total": 1025,
+        "chapter_search_results_total": 1061,
         "rkt_search_results_total": 11
     },
     "concepts-biology": {
         "default_page": "1-introduction",
         "search_term": "Cell",
-        "chapter_search_results_total": 792,
+        "chapter_search_results_total": 1633,
         "rkt_search_results_total": 23
     },
     "calculus-volume-1": {
         "default_page": "1-introduction",
         "search_term": "number",
-        "chapter_search_results_total": 210,
+        "chapter_search_results_total": 280,
         "rkt_search_results_total": 2
     },
     "calculus-volume-2": {
@@ -140,37 +140,37 @@
     "calculus-volume-3": {
         "default_page": "1-introduction",
         "search_term": "zero vector",
-        "chapter_search_results_total": 102,
+        "chapter_search_results_total": 9,
         "rkt_search_results_total": 1
     },
     "college-success": {
         "default_page": "1-introduction",
         "search_term": "Shira\u2019s career path",
-        "chapter_search_results_total": 9,
+        "chapter_search_results_total": 10,
         "rkt_search_results_total": 0
     },
     "entrepreneurship": {
         "default_page": "1-introduction",
         "search_term": "Business Model",
-        "chapter_search_results_total": 343,
-        "rkt_search_results_total": 8
+        "chapter_search_results_total": 399,
+        "rkt_search_results_total": 7
     },
     "elementary-algebra-2e": {
         "default_page": "1-introduction",
         "search_term": "common denominator",
-        "chapter_search_results_total": 66,
+        "chapter_search_results_total": 75,
         "rkt_search_results_total": 1
     },
     "intermediate-algebra-2e": {
         "default_page": "1-introduction",
         "search_term": "quadratic equations and functions",
-        "chapter_search_results_total": 6,
+        "chapter_search_results_total": 5,
         "rkt_search_results_total": 0
     },
     "introduction-anthropology": {
         "default_page": "1-introduction",
         "search_term": "orientalism",
-        "chapter_search_results_total": 13,
+        "chapter_search_results_total": 17,
         "rkt_search_results_total": 1
     },
     "introductory-business-statistics": {
@@ -182,19 +182,19 @@
     "introduction-business": {
         "default_page": "1-introduction",
         "search_term": "Buyer behavior",
-        "chapter_search_results_total": 15,
+        "chapter_search_results_total": 16,
         "rkt_search_results_total": 1
     },
     "introduction-intellectual-property": {
         "default_page": "1-introduction",
         "search_term": "plant patent",
-        "chapter_search_results_total": 15,
+        "chapter_search_results_total": 35,
         "rkt_search_results_total": 0
     },
     "introduction-sociology-2e": {
         "default_page": "1-introduction-to-sociology",
         "search_term": "certificates or degrees",
-        "chapter_search_results_total": 4,
+        "chapter_search_results_total": 2,
         "rkt_search_results_total": 0
     },
     "introduction-sociology-3e": {
@@ -211,92 +211,92 @@
     },
     "microbiology": {
         "default_page": "1-introduction",
-        "search_term": "ecosystems",
-        "chapter_search_results_total": 18,
+        "search_term": "halophile",
+        "chapter_search_results_total": 10,
         "rkt_search_results_total": 0
     },
     "organizational-behavior": {
         "default_page": "1-introduction",
         "search_term": "organizational development",
-        "chapter_search_results_total": 44,
-        "rkt_search_results_total": 2
+        "chapter_search_results_total": 154,
+        "rkt_search_results_total": 3
     },
     "physics": {
         "default_page": "1-introduction",
         "search_term": "linear relationship",
-        "chapter_search_results_total": 10,
-        "rkt_search_results_total": 0
+        "chapter_search_results_total": 25,
+        "rkt_search_results_total": 1
     },
     "precalculus": {
         "default_page": "1-introduction-to-functions",
         "search_term": "Pythagorean Identities",
-        "chapter_search_results_total": 18,
-        "rkt_search_results_total": 1
+        "chapter_search_results_total": 36,
+        "rkt_search_results_total": 2
     },
     "precalculus-2e": {
         "default_page": "1-introduction-to-functions",
         "search_term": "one-to-one function",
-        "chapter_search_results_total": 404,
-        "rkt_search_results_total": 3
+        "chapter_search_results_total": 41,
+        "rkt_search_results_total": 1
     },
     "prealgebra-2e": {
         "default_page": "1-introduction",
         "search_term": "Whole Numbers",
-        "chapter_search_results_total": 160,
+        "chapter_search_results_total": 148,
         "rkt_search_results_total": 1
     },
     "principles-financial-accounting": {
         "default_page": "1-why-it-matters",
         "search_term": "Explain the Pricing of Long-Term Liabilities",
-        "chapter_search_results_total": 7,
+        "chapter_search_results_total": 3,
         "rkt_search_results_total": 0
     },
     "principles-economics-2e": {
         "default_page": "1-introduction",
         "search_term": "Elasticity",
-        "chapter_search_results_total": 166,
+        "chapter_search_results_total": 182,
         "rkt_search_results_total": 11
     },
     "principles-macroeconomics-2e": {
         "default_page": "1-introduction",
         "search_term": "modern economic growth",
-        "chapter_search_results_total": 14,
+        "chapter_search_results_total": 87,
         "rkt_search_results_total": 1
     },
     "principles-microeconomics-2e": {
         "default_page": "1-introduction",
         "search_term": "Explicit costs",
-        "chapter_search_results_total": 18,
+        "chapter_search_results_total": 28,
         "rkt_search_results_total": 1
     },
     "principles-macroeconomics-ap-courses-2e": {
         "default_page": "1-introduction",
         "search_term": "adjustable-rate mortgage",
-        "chapter_search_results_total": 14,
+        "chapter_search_results_total": 16,
         "rkt_search_results_total": 1
     },
     "principles-microeconomics-ap-courses-2e": {
         "default_page": "1-introduction",
         "search_term": "positive externality",
-        "chapter_search_results_total": 24,
-        "rkt_search_results_total": 1
+        "chapter_search_results_total": 56,
+        "rkt_search_results_total": 3
     },
     "principles-managerial-accounting": {
         "default_page": "1-why-it-matters",
         "search_term": "relevant range",
-        "chapter_search_results_total": 51,
+        "chapter_search_results_total": 53,
         "rkt_search_results_total": 3
     },
     "principles-management": {
         "default_page": "1-introduction",
         "search_term": "plan is a decision to carry out a particular action",
-        "chapter_search_results_total": 11,
+        "chapter_search_results_total": 2,
         "rkt_search_results_total": 0
     },
     "psychology-2e": {
         "default_page": "1-introduction",
         "search_term": "event schema",
-        "chapter_search_results_total": 15,
+        "chapter_search_results_total": 25,
         "rkt_search_results_total": 1
     },
     "statistics": {
@@ -320,13 +320,13 @@
     "university-physics-volume-3": {
         "default_page": "1-introduction",
         "search_term": "interference fringes",
-        "chapter_search_results_total": 61,
-        "rkt_search_results_total": 1
+        "chapter_search_results_total": 73,
+        "rkt_search_results_total": 0
     },
     "us-history": {
         "default_page": "1-introduction",
         "search_term": "PATRIOTS",
-        "chapter_search_results_total": 20,
+        "chapter_search_results_total": 61,
         "rkt_search_results_total": 0
     },
     "writing-guide": {
@@ -338,13 +338,13 @@
     "college-physics-ap-courses-2e": {
         "default_page": "1-connection-for-ap-r-courses",
         "search_term": "Big Idea",
-        "chapter_search_results_total": 178,
+        "chapter_search_results_total": 154,
         "rkt_search_results_total": 0
     },
     "principles-economics-3e": {
         "default_page": "1-introduction",
         "search_term": "Age",
-        "chapter_search_results_total": 73,
+        "chapter_search_results_total": 80,
         "rkt_search_results_total": 0
     },
     "principles-finance": {
@@ -356,31 +356,31 @@
     "principles-macroeconomics-3e": {
         "default_page": "1-introduction",
         "search_term": "Age",
-        "chapter_search_results_total": 49,
+        "chapter_search_results_total": 54,
         "rkt_search_results_total": 0
     },
     "introduction-political-science": {
         "default_page": "1-introduction",
         "search_term": "China",
-        "chapter_search_results_total": 97,
+        "chapter_search_results_total": 104,
         "rkt_search_results_total": 0
     },
     "principles-microeconomics-3e": {
         "default_page": "1-introduction",
         "search_term": "Bring it Home",
-        "chapter_search_results_total": 10,
+        "chapter_search_results_total": 6,
         "rkt_search_results_total": 0
     },
     "introduction-philosophy": {
         "default_page": "1-introduction",
         "search_term": "high school",
-        "chapter_search_results_total": 4,
+        "chapter_search_results_total": 3,
         "rkt_search_results_total": 0
     },
     "world-history-volume-2": {
         "default_page": "1-introduction",
         "search_term": "Winston Churchill",
-        "chapter_search_results_total": 15,
+        "chapter_search_results_total": 16,
         "rkt_search_results_total": 0
     },
     "college-physics-2e": {
@@ -392,7 +392,7 @@
     "workplace-software-skills": {
         "default_page": "1-chapter-scenario",
         "search_term": "\"click and drag the file\"",
-        "chapter_search_results_total": 1,
+        "chapter_search_results_total": 10,
         "rkt_search_results_total": 0
     },
     "world-history-volume-1": {
@@ -404,50 +404,74 @@
     "organic-chemistry": {
         "default_page": "1-why-this-chapter",
         "search_term": "Zwitterion",
-        "chapter_search_results_total": 7,
+        "chapter_search_results_total": 12,
         "rkt_search_results_total": 0
     },
     "contemporary-mathematics": {
         "default_page": "1-introduction",
         "search_term": "well-defined sets",
-        "chapter_search_results_total": 8,
+        "chapter_search_results_total": 11,
         "rkt_search_results_total": 0
     },
     "introductory-statistics-2e": {
         "default_page": "1-introduction",
         "search_term": "Student's t-Distribution",
-        "chapter_search_results_total": 71,
+        "chapter_search_results_total": 43,
         "rkt_search_results_total": 2
     },
     "introductory-business-statistics-2e": {
         "default_page": "1-introduction",
         "search_term": "(df)",
-        "chapter_search_results_total": 69,
+        "chapter_search_results_total": 71,
         "rkt_search_results_total": 1
     },
     "college-success-concise": {
         "default_page": "1-introduction",
         "search_term": "résumé",
-        "chapter_search_results_total": 1,
+        "chapter_search_results_total": 42,
         "rkt_search_results_total": 0
     },
     "preparing-for-college-success": {
         "default_page": "1-introduction",
         "search_term": "liberal arts courses",
-        "chapter_search_results_total": 10,
+        "chapter_search_results_total": 2,
         "rkt_search_results_total": 0
     },
     "principles-marketing": {
         "default_page": "1-unit-introduction",
         "search_term": "Procter & Gamble",
-        "chapter_search_results_total": 16,
+        "chapter_search_results_total": 19,
         "rkt_search_results_total": 0
     },
     "introduction-python-programming": {
         "default_page": "1-introduction",
         "search_term": "print()",
-        "chapter_search_results_total": 75,
+        "chapter_search_results_total": 106,
         "rkt_search_results_total": 0
+    },
+    "pharmacology": {
+        "default_page": "1-introduction",
+        "search_term": "corticosteroids",
+        "chapter_search_results_total": 54,
+        "rkt_search_results_total": 1
+    },
+    "population-health": {
+        "default_page": "1-introduction",
+        "search_term": "population health",
+        "chapter_search_results_total": 3689,
+        "rkt_search_results_total": 11
+    },
+    "nutrition": {
+        "default_page": "1-introduction",
+        "search_term": "NIH, 2022d",
+        "chapter_search_results_total": 65,
+        "rkt_search_results_total": 0
+    },
+    "psychiatric-mental-health": {
+        "default_page": "1-introduction",
+        "search_term": "mental health",
+        "chapter_search_results_total": 2674,
+        "rkt_search_results_total": 4
     }
 }
 
diff --git a/pytest-selenium/utils/intlbooks.json b/pytest-selenium/utils/intlbooks.json
index f82ff99e14..16c60ffac7 100644
--- a/pytest-selenium/utils/intlbooks.json
+++ b/pytest-selenium/utils/intlbooks.json
@@ -8,19 +8,19 @@
       "psychologia-polska": {
           "default_page": "1-wprowadzenie",
           "search_term": "MIT",
-          "chapter_search_results_total": 18,
+          "chapter_search_results_total": 20,
           "rkt_search_results_total": 0
       },
       "fizyka-dla-szkół-wyższych-tom-1": {
           "default_page": "1-wstep",
           "search_term": "galaktyka",
-          "chapter_search_results_total": 5,
+          "chapter_search_results_total": 48,
           "rkt_search_results_total": 0
       },
       "fizyka-dla-szkół-wyższych-tom-2": {
           "default_page": "1-wstep",
           "search_term": "gwiazdy",
-          "chapter_search_results_total": 2,
+          "chapter_search_results_total": 4,
           "rkt_search_results_total": 0
       },
       "fizyka-dla-szkół-wyższych-tom-3": {
@@ -32,13 +32,13 @@
       "física-universitaria-volumen-1": {
           "default_page": "1-introduccion",
           "search_term": "ambos",
-          "chapter_search_results_total": 149,
+          "chapter_search_results_total": 221,
           "rkt_search_results_total": 0
       },
       "física-universitaria-volumen-2": {
           "default_page": "1-introduccion",
           "search_term": "del Sol",
-          "chapter_search_results_total": 112,
+          "chapter_search_results_total": 131,
           "rkt_search_results_total": 0
       },
       "física-universitaria-volumen-3": {
@@ -50,13 +50,13 @@
       "química-2ed": {
           "default_page": "1-introduccion",
           "search_term": "Hacer café",
-          "chapter_search_results_total": 1,
+          "chapter_search_results_total": 8,
           "rkt_search_results_total": 0
       },
       "química-comenzando-átomos-2ed": {
           "default_page": "1-introduccion",
           "search_term": "el jabón",
-          "chapter_search_results_total": 25,
+          "chapter_search_results_total": 93,
           "rkt_search_results_total": 0
       },
       "cálculo-volumen-1": {
@@ -80,19 +80,25 @@
       "introducción-estadística": {
           "default_page": "1-introduccion",
           "search_term": "mejor estimación",
-          "chapter_search_results_total": 16,
+          "chapter_search_results_total": 11,
           "rkt_search_results_total": 0
       },
       "introducción-estadística-empresarial": {
           "default_page": "1-introduccion",
           "search_term": "Informática",
-          "chapter_search_results_total": 3,
-          "rkt_search_results_total": 0
+          "chapter_search_results_total": 220,
+          "rkt_search_results_total": 1
       },
       "precálculo-2ed": {
           "default_page": "1-introduccion",
           "search_term": "las empresas",
-          "chapter_search_results_total": 12,
+          "chapter_search_results_total": 4,
           "rkt_search_results_total": 0
+      },
+      "makroekonomia-podstawy": {
+          "default_page": "1-wprowadzenie-do-rozdzialu",
+          "search_term": "Funkcja",
+          "chapter_search_results_total": 141,
+          "rkt_search_results_total": 2
       }
 }
diff --git a/script/lighthouse.ts b/script/lighthouse.ts
new file mode 100755
index 0000000000..386c863c06
--- /dev/null
+++ b/script/lighthouse.ts
@@ -0,0 +1,42 @@
+import { readFile, writeFile } from 'fs';
+import puppeteer from 'puppeteer';
+import asyncPool from 'tiny-async-pool';
+import argv from 'yargs';
+import { checkLighthouse, ScoreTargets } from '../src/test/lighthouse';
+
+const {
+  pages, mostRecentReportDir, reportDir,
+} = argv.string('pages').string('mostRecentReportDir').string('reportDir').argv;
+
+async function run() {
+  if (!pages) { throw new Error('You must specify some --pages to test'); }
+
+  const browser = await puppeteer.launch({ args: ['--no-sandbox'] });
+
+  const pageArray: string[] = JSON.parse(pages);
+
+  await asyncPool(1, pageArray, async(pageUrl) => {
+    const filename = `${pageUrl.replace(/[^a-z0-9]+/gi, '-').replace(/^-+/i, '')}.json`;
+    const targets = mostRecentReportDir ? await new Promise<ScoreTargets | undefined>(
+      (resolve) => readFile(
+        `${mostRecentReportDir}/${filename}`,
+        { encoding: 'utf8' },
+        (err, data) => err ? resolve(undefined) : resolve(JSON.parse(data))
+      )
+    ) : undefined;
+
+    const result = await checkLighthouse(browser, pageUrl, targets);
+
+    if (reportDir) {
+      await new Promise<void>((resolve) => writeFile(
+        `${reportDir}/${filename}`,
+        JSON.stringify(result), () => resolve()
+      ));
+    }
+  });
+}
+
+run().then(() => process.exit(), (err) => {
+  console.error(err); // tslint:disable-line:no-console
+  process.exit(1);
+});
diff --git a/script/prerender/cfn.yml b/script/prerender/cfn.yml
index d471186fe2..d858fc524d 100644
--- a/script/prerender/cfn.yml
+++ b/script/prerender/cfn.yml
@@ -20,17 +20,17 @@ Parameters:
     ConstraintDescription: Must be a valid Rex code version
 
   PublicUrl:
-    Description: Public URL to use, for example "/rex/releases/${ReleaseId}"
+    Description: Public URL to use, for example "/rex/releases/ReleaseId"
     Type: String
     ConstraintDescription: Must be a path starting with /
 
   ReleaseId:
-    Description: Release ID to use, for example "v4/${someHash}"
+    Description: Release ID to use, for example "v4/someHash"
     Type: String
     ConstraintDescription: Must be a valid Rex Release ID
 
   ImageTag:
-    Description: Prerender Docker container image tag, for example "v4-${someHash}"
+    Description: Prerender Docker container image tag, for example "v4-someHash"
     Type: String
     AllowedPattern: ^[_0-9A-Za-z][-_.0-9A-Za-z]{0,127}$
     ConstraintDescription: >-
@@ -198,12 +198,6 @@ Resources:
           Tags:
             - Key: Name
               Value: !Sub ${AWS::StackName}-fleet
-            - Key: Project
-              Value: Unified
-            - Key: Application
-              Value: Rex Prerender
-            - Key: Environment
-              Value: production
       TargetCapacitySpecification:
         DefaultTargetCapacityType: spot
         TotalTargetCapacity: 8
diff --git a/src/app/components/Layout.tsx b/src/app/components/Layout.tsx
index 7d7d440819..2613a8d908 100644
--- a/src/app/components/Layout.tsx
+++ b/src/app/components/Layout.tsx
@@ -6,11 +6,13 @@ import theme from '../theme';
 import AccessibilityButtonsWrapper from './AccessibilityButtonsWrapper';
 import NavBar from './NavBar';
 import OnEsc from './OnEsc';
+import PageTitleConfirmation from './PageTitleConfirmation';
 
 // tslint:disable-next-line:variable-name
 const Layout: SFC = ({ children }) => <AccessibilityButtonsWrapper>
   <NavBar />
   <OnEsc />
+  <PageTitleConfirmation />
   <ErrorModal />
   <ErrorBoundary>
     {children}
diff --git a/src/app/components/PageTitleConfirmation.spec.tsx b/src/app/components/PageTitleConfirmation.spec.tsx
new file mode 100644
index 0000000000..ad2be45612
--- /dev/null
+++ b/src/app/components/PageTitleConfirmation.spec.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { renderToDom } from '../../test/reactutils';
+// import { act } from 'react-dom/test-utils';
+import { initialState } from '../reducer';
+import createTestStore from '../../test/createTestStore';
+import PageTitleConfirmation from './PageTitleConfirmation';
+import TestContainer from '../../test/TestContainer';
+import { setHead } from '../head/actions';
+
+describe('PageTitleConfirmation', () => {
+  it('skips blank, skips first non-blank, announces subsequent', async() => {
+    const state = {
+      ...initialState,
+    };
+
+    state.head.title = 'initial';
+    const store = createTestStore(state);
+
+    store.dispatch(setHead({...initialState.head, title: ''}));
+    const component = renderToDom(
+      <TestContainer store={store}>
+        <PageTitleConfirmation className='any' />
+      </TestContainer>
+    );
+
+    expect(component.node.textContent).toBe('');
+    store.dispatch(setHead({...initialState.head, title: 'initial'}));
+    expect(component.node.textContent).toBe('');
+    store.dispatch(setHead({...initialState.head, title: 'something'}));
+    expect(component.node.textContent).toBe('Loaded page something');
+    component.unmount();
+  });
+});
diff --git a/src/app/components/PageTitleConfirmation.tsx b/src/app/components/PageTitleConfirmation.tsx
new file mode 100644
index 0000000000..0b990ff5fd
--- /dev/null
+++ b/src/app/components/PageTitleConfirmation.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { hiddenButAccessible } from '../theme';
+import { AppState } from '../types';
+import styled from 'styled-components';
+import { connect } from 'react-redux';
+import { title as titleSelector } from '../head/selectors';
+
+function PageTitleConfirmation({
+  className,
+  title,
+}: {
+  className: string;
+  title: string;
+}) {
+  const skipFirst = React.useRef(true);
+  const message = React.useMemo(() => {
+    if (!title) {
+      return '';
+    }
+    if (skipFirst.current) {
+      skipFirst.current = false;
+      return '';
+    }
+    return `Loaded page ${title}`;
+  }, [title]);
+
+  return (
+    <div id='page-title-confirmation' className={className} aria-live='polite'>
+      {message}
+    </div>
+  );
+}
+
+export default connect((state: AppState) => ({title: titleSelector(state)}))(styled(
+  PageTitleConfirmation
+)`
+  ${hiddenButAccessible}
+`);
diff --git a/src/app/content/__snapshots__/routes.spec.tsx.snap b/src/app/content/__snapshots__/routes.spec.tsx.snap
index aecb785d56..e35265bff3 100644
--- a/src/app/content/__snapshots__/routes.spec.tsx.snap
+++ b/src/app/content/__snapshots__/routes.spec.tsx.snap
@@ -246,6 +246,7 @@ Array [
       className="c2 c3 c4"
     >
       <button
+        aria-expanded={false}
         aria-label="Change text size"
         className="c5 c6 c7 c8"
         data-analytics-label="Change text size"
diff --git a/src/app/content/components/Page.spec.tsx b/src/app/content/components/Page.spec.tsx
index 5dd3e1083c..16a35d54ea 100644
--- a/src/app/content/components/Page.spec.tsx
+++ b/src/app/content/components/Page.spec.tsx
@@ -1081,7 +1081,7 @@ describe('Page', () => {
     await new Promise((resolve) => setImmediate(resolve));
 
     expect(dispatch).toHaveBeenCalledWith(
-      addToast(toastMessageKeys.higlights.failure.search, {destination: 'page'}));
+      addToast(toastMessageKeys.highlights.failure.search, {destination: 'page'}));
     dispatch.mockClear();
 
     const errorModalCloseButton = root.querySelector('[data-testid=banner-body] button');
@@ -1099,7 +1099,7 @@ describe('Page', () => {
     await new Promise((resolve) => setImmediate(resolve));
 
     expect(dispatch).not.toHaveBeenCalledWith(
-      addToast(toastMessageKeys.higlights.failure.search, {destination: 'page'}));
+      addToast(toastMessageKeys.highlights.failure.search, {destination: 'page'}));
 
     dateMock.mockRestore();
   });
diff --git a/src/app/content/components/Page/PageComponent.tsx b/src/app/content/components/Page/PageComponent.tsx
index 0684c7c719..da426581ff 100644
--- a/src/app/content/components/Page/PageComponent.tsx
+++ b/src/app/content/components/Page/PageComponent.tsx
@@ -81,6 +81,7 @@ export default class PageComponent extends Component<PagePropTypes> {
       });
     }
     this.scrollToTopOrHashManager(null, this.props.scrollToTopOrHash);
+    lazyResources.checkLazyResources();
   }
 
   public async componentDidUpdate(prevProps: PagePropTypes) {
@@ -126,7 +127,7 @@ export default class PageComponent extends Component<PagePropTypes> {
 
   public onHighlightSelect: HighlightUpdateOptions['onSelect'] = (selectedHighlight) => {
     if (!selectedHighlight) {
-      this.props.addToast(toastMessageKeys.higlights.failure.search, {destination: 'page'});
+      this.props.addToast(toastMessageKeys.highlights.failure.search, {destination: 'page'});
     }
   };
 
diff --git a/src/app/content/components/Page/PageToasts.spec.tsx b/src/app/content/components/Page/PageToasts.spec.tsx
index 5ba4a53c12..47d1a12688 100644
--- a/src/app/content/components/Page/PageToasts.spec.tsx
+++ b/src/app/content/components/Page/PageToasts.spec.tsx
@@ -30,7 +30,7 @@ describe('PageToasts', () => {
   });
 
   it('matches snapshots with toasts', () => {
-    store.dispatch(addToast(toastMessageKeys.higlights.failure.create, {destination: 'page'}));
+    store.dispatch(addToast(toastMessageKeys.highlights.failure.create, {destination: 'page'}));
     const toasts = groupedToastNotifications(store.getState()).page;
 
     if (!toasts) {
@@ -48,7 +48,7 @@ describe('PageToasts', () => {
   });
 
   it('matches snapshot with toasts when mobile toolbar is open', () => {
-    store.dispatch(addToast(toastMessageKeys.higlights.failure.create, {destination: 'page'}));
+    store.dispatch(addToast(toastMessageKeys.highlights.failure.create, {destination: 'page'}));
     store.dispatch(openMobileToolbar());
 
     const component = renderer.create(<TestContainer store={store}>
diff --git a/src/app/content/components/Page/highlightManager.ts b/src/app/content/components/Page/highlightManager.ts
index e2f2445367..090cda9021 100644
--- a/src/app/content/components/Page/highlightManager.ts
+++ b/src/app/content/components/Page/highlightManager.ts
@@ -24,11 +24,11 @@ import * as select from '../../selectors';
 import { expandClosestSolution } from '../../utils/domUtils';
 import attachHighlight from '../utils/attachHighlight';
 import { erase, highlightData, insertPendingCardInOrder, isUnknownHighlightData, updateStyle } from './highlightUtils';
+import { addToast } from '../../../notifications/actions';
 
 export interface HighlightManagerServices {
   getProp: () => HighlightProp;
   setPendingHighlight: (highlight: Highlight) => void;
-  clearPendingHighlight: () => void;
   highlighter: Highlighter;
   container: HTMLElement;
 }
@@ -94,6 +94,11 @@ const onSelectHighlight = (
   highlight: Highlight | undefined
 ) => defer(async() => {
   if (highlights.length > 0 || !highlight) {
+    appServices.dispatch(
+      addToast('i18n:notification:toast:highlights:select-overlap', {
+        destination: 'page',
+      })
+    );
     return;
   }
 
@@ -107,7 +112,7 @@ const onSelectHighlight = (
 });
 
 const createHighlighter = (
-  highlightManagerServices: Omit<HighlightManagerServices, 'highlighter' | 'intl'>,
+  highlightManagerServices: Omit<HighlightManagerServices, 'highlighter'>,
   appServices: AppServices & MiddlewareAPI,
   intl: IntlShape
 ) => {
@@ -152,7 +157,6 @@ export interface UpdateOptions {
 
 // tslint:disable-next-line: max-line-length
 export default (container: HTMLElement, getProp: () => HighlightProp, appServices: AppServices & MiddlewareAPI, intl: IntlShape) => {
-  let highlighter: Highlighter;
   let pendingHighlight: Highlight | undefined;
   let scrollTargetHighlightIdThatWasHandled: string;
   let setListHighlighter = (_highlighter: Highlighter): void => undefined;
@@ -209,13 +213,12 @@ export default (container: HTMLElement, getProp: () => HighlightProp, appService
   };
 
   const highlightManagerServices = {
-    clearPendingHighlight,
     container,
     getProp,
     setPendingHighlight,
   };
 
-  highlighter = createHighlighter(highlightManagerServices, appServices, intl);
+  const highlighter = createHighlighter(highlightManagerServices, appServices, intl);
   setListHighlighter(highlighter);
 
   return {
diff --git a/src/app/content/components/Page/lazyResourceManager.ts b/src/app/content/components/Page/lazyResourceManager.ts
index 713b2ee837..cc3aed2d1a 100644
--- a/src/app/content/components/Page/lazyResourceManager.ts
+++ b/src/app/content/components/Page/lazyResourceManager.ts
@@ -23,7 +23,6 @@ export const checkLazyResources = () => {
         element.setAttribute('src', src);
       }
       element.removeAttribute('data-lazy-src');
-
     }
   });
 };
diff --git a/src/app/content/components/SectionHighlights.tsx b/src/app/content/components/SectionHighlights.tsx
index 796df21d91..ecad3df1d3 100644
--- a/src/app/content/components/SectionHighlights.tsx
+++ b/src/app/content/components/SectionHighlights.tsx
@@ -30,7 +30,7 @@ export const HighlightsChapterWrapper = styled.div`
 `;
 
 // tslint:disable-next-line:variable-name
-const HighlightsChapter = styled.div`
+const HighlightsChapter = styled.h2`
   ${h4Style}
   font-weight: bold;
   display: flex;
@@ -66,7 +66,7 @@ export const HighlightWrapper = styled.div`
 `;
 
 // tslint:disable-next-line:variable-name
-export const HighlightSection = styled.div`
+export const HighlightSection = styled.h3`
   ${labelStyle}
   padding: 0 ${popupBodyPadding}rem 0 ${popupPadding}rem;
   background: ${theme.color.neutral.darkest};
diff --git a/src/app/content/components/Topbar/__snapshots__/index.spec.tsx.snap b/src/app/content/components/Topbar/__snapshots__/index.spec.tsx.snap
index 73af0edde5..16ba148ea0 100644
--- a/src/app/content/components/Topbar/__snapshots__/index.spec.tsx.snap
+++ b/src/app/content/components/Topbar/__snapshots__/index.spec.tsx.snap
@@ -1627,6 +1627,7 @@ exports[`text resizer opens menu when clicking menu button 1`] = `
       className="c13 c14 c15"
     >
       <button
+        aria-expanded={true}
         aria-label="Change text size"
         className="c16 c17 c18 c19"
         data-analytics-label="Change text size"
@@ -1771,6 +1772,7 @@ exports[`text resizer opens menu when clicking menu button 1`] = `
         className="c13 c14 c15"
       >
         <button
+          aria-expanded={false}
           aria-label="Change text size"
           className="c16 c28 c18 c19"
           data-analytics-label="Change text size"
diff --git a/src/app/content/components/__snapshots__/AssignedTopBar.spec.tsx.snap b/src/app/content/components/__snapshots__/AssignedTopBar.spec.tsx.snap
index f8aee8c534..d0540bcba3 100644
--- a/src/app/content/components/__snapshots__/AssignedTopBar.spec.tsx.snap
+++ b/src/app/content/components/__snapshots__/AssignedTopBar.spec.tsx.snap
@@ -155,6 +155,7 @@ exports[`AssignedTopBar renders 1`] = `
     className="c2 c3 c4"
   >
     <button
+      aria-expanded={false}
       aria-label="Change text size"
       className="c5 c6 c7 c8"
       data-analytics-label="Change text size"
diff --git a/src/app/content/components/__snapshots__/Content.spec.tsx.snap b/src/app/content/components/__snapshots__/Content.spec.tsx.snap
index 45359352bf..da08515acd 100644
--- a/src/app/content/components/__snapshots__/Content.spec.tsx.snap
+++ b/src/app/content/components/__snapshots__/Content.spec.tsx.snap
@@ -169,6 +169,26 @@ Array [
         />
       </a>
     </div>
+  </div>,
+  .c0 {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  -webkit-clip: rect(0,0,0,0);
+  clip: rect(0,0,0,0);
+  white-space: nowrap;
+  border: 0;
+}
+
+<div
+    aria-live="polite"
+    className="c0"
+    id="page-title-confirmation"
+  >
+    
   </div>,
   .c4 {
   display: inline-block;
@@ -3205,6 +3225,7 @@ li[aria-label="Current Page"] .c60 {
             className="c23 c24 c25"
           >
             <button
+              aria-expanded={false}
               aria-label="Change text size"
               className="c26 c27 c28 c29"
               data-analytics-label="Change text size"
@@ -3301,6 +3322,7 @@ li[aria-label="Current Page"] .c60 {
               className="c23 c24 c25"
             >
               <button
+                aria-expanded={false}
                 aria-label="Change text size"
                 className="c26 c27 c28 c29"
                 data-analytics-label="Change text size"
@@ -4865,6 +4887,26 @@ Array [
         />
       </a>
     </div>
+  </div>,
+  .c0 {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  -webkit-clip: rect(0,0,0,0);
+  clip: rect(0,0,0,0);
+  white-space: nowrap;
+  border: 0;
+}
+
+<div
+    aria-live="polite"
+    className="c0"
+    id="page-title-confirmation"
+  >
+    
   </div>,
   .c4 {
   display: inline-block;
@@ -7748,6 +7790,7 @@ li[aria-label="Current Page"] .c60 {
             className="c23 c24 c25"
           >
             <button
+              aria-expanded={false}
               aria-label="Change text size"
               className="c26 c27 c28 c29"
               data-analytics-label="Change text size"
@@ -7844,6 +7887,7 @@ li[aria-label="Current Page"] .c60 {
               className="c23 c24 c25"
             >
               <button
+                aria-expanded={false}
                 aria-label="Change text size"
                 className="c26 c27 c28 c29"
                 data-analytics-label="Change text size"
diff --git a/src/app/content/components/popUp/ChapterFilter.tsx b/src/app/content/components/popUp/ChapterFilter.tsx
index 0548a2ede9..a6cedf622c 100644
--- a/src/app/content/components/popUp/ChapterFilter.tsx
+++ b/src/app/content/components/popUp/ChapterFilter.tsx
@@ -65,6 +65,7 @@ interface ChapterFilterProps {
   selectedLocationFilters: Set<string>;
   multiselect: boolean;
   setFilters: (filters: FiltersChange<LinkedArchiveTreeNode>) => void;
+  id: string;
 }
 
 // tslint:disable-next-line:variable-name
@@ -107,7 +108,7 @@ const ChapterFilter = (props: ChapterFilterProps) => {
   const hasFiltersWithChildren = Boolean(values.find((filter) => filter.children));
   const sectionChunks = hasFiltersWithChildren ? [values] : chunk(values);
 
-  return <div className={props.className} tabIndex={-1}>
+  return <div className={props.className} tabIndex={-1} id={props.id}>
     {props.multiselect
       ? (
         <AllOrNone
diff --git a/src/app/content/components/popUp/ColorFilter.spec.tsx b/src/app/content/components/popUp/ColorFilter.spec.tsx
index d6ca5a4047..1ebd302383 100644
--- a/src/app/content/components/popUp/ColorFilter.spec.tsx
+++ b/src/app/content/components/popUp/ColorFilter.spec.tsx
@@ -29,6 +29,7 @@ describe('ColorFilter', () => {
       ]),
       styles: highlightStyles,
       updateSummaryFilters: jest.fn(),
+      id: 'color-filter',
     };
   });
 
diff --git a/src/app/content/components/popUp/ColorFilter.tsx b/src/app/content/components/popUp/ColorFilter.tsx
index b00d1b1add..66a89569cb 100644
--- a/src/app/content/components/popUp/ColorFilter.tsx
+++ b/src/app/content/components/popUp/ColorFilter.tsx
@@ -27,6 +27,7 @@ export interface ColorFilterProps {
   colorFiltersWithContent: Set<HighlightColorEnum>;
   updateSummaryFilters: (change: FiltersChange<HighlightColorEnum>) => void;
   labelKey: (label: HighlightColorEnum) => string;
+  id: string;
 }
 
 // tslint:disable-next-line:variable-name
@@ -38,6 +39,7 @@ const ColorFilter = ({
   colorFiltersWithContent,
   updateSummaryFilters,
   labelKey,
+  id,
 }: ColorFilterProps) => {
 
   const setSelectedColors = (change: FiltersChange<HighlightColorEnum>) => {
@@ -52,7 +54,7 @@ const ColorFilter = ({
     }
   };
 
-  return <div className={className} tabIndex={-1}>
+  return <div className={className} tabIndex={-1} id={id}>
     <AllOrNone
       onNone={() => setSelectedColors({ remove: Array.from(colorFiltersWithContent), new: [] })}
       onAll={() => setSelectedColors({ remove: [], new: Array.from(colorFiltersWithContent) })}
diff --git a/src/app/content/components/popUp/Filters.tsx b/src/app/content/components/popUp/Filters.tsx
index d0868cbcfb..a785df1e9c 100644
--- a/src/app/content/components/popUp/Filters.tsx
+++ b/src/app/content/components/popUp/Filters.tsx
@@ -35,26 +35,50 @@ interface ToggleProps {
   isOpen: boolean;
   ariaLabelId: string;
   showAngleIcon: boolean;
+  controlsId: string;
 }
 // tslint:disable-next-line:variable-name
-const Toggle = styled(React.forwardRef<HTMLButtonElement, ToggleProps>(
-  ({label, isOpen, ariaLabelId, showAngleIcon = true, showLabel = true, toggleChildren, ...props}, ref) => (
-    <PlainButton ref={ref} {...props} aria-label={useIntl().formatMessage({id: ariaLabelId}, {filter: label})}>
-      <div tabIndex={-1}>
-        {showLabel && label}
-        {toggleChildren}
-        {showAngleIcon && <AngleIcon direction={isOpen ? 'up' : 'down'} />}
-      </div>
-    </PlainButton>
+const Toggle = styled(
+  React.forwardRef<HTMLButtonElement, ToggleProps>(
+    (
+      {
+        label,
+        isOpen,
+        ariaLabelId,
+        showAngleIcon = true,
+        showLabel = true,
+        toggleChildren,
+        controlsId,
+        ...props
+      },
+      ref
+    ) => (
+      <PlainButton
+        ref={ref}
+        {...props}
+        aria-label={useIntl().formatMessage(
+          { id: ariaLabelId },
+          { filter: label }
+        )}
+        aria-expanded={isOpen}
+        aria-controls={controlsId}
+      >
+        <div tabIndex={-1}>
+          {showLabel && label}
+          {toggleChildren}
+          {showAngleIcon && <AngleIcon direction={isOpen ? 'up' : 'down'} />}
+        </div>
+      </PlainButton>
+    )
   )
-))`
+)`
   position: relative;
   border-left: ${filters.border}rem solid transparent;
   border-right: ${filters.border}rem solid transparent;
   ${(props: ToggleProps) => props.isOpen
     ? css`
       z-index: 2;
-      box-shadow: 0 0 0.6rem 0 rgba(0,0,0,0.2);
+      box-shadow: 0 0 0.6rem 0 rgba(0, 0, 0, 0.2);
       clip-path: inset(0 -0.6rem 0px -0.6rem);
       background-color: ${theme.color.white};
       border-left: ${filters.border}rem solid ${theme.color.neutral.formBorder};
@@ -85,6 +109,7 @@ type FilterDropdownProps = {
   dataAnalyticsLabel: string;
   showAngleIcon?: boolean;
   toggleChildren?: JSX.Element;
+  controlsId: string;
 } & Partial<TabHiddenDropdownProps>;
 
 // tslint:disable-next-line:variable-name
@@ -97,7 +122,8 @@ React.PropsWithChildren<FilterDropdownProps>) => (
       toggleChildren={toggleChildren}
       ariaLabelId={ariaLabelId}
       data-analytics-label={dataAnalyticsLabel}
-      showAngleIcon={props.showAngleIcon} />}
+      showAngleIcon={props.showAngleIcon}
+      controlsId={props.controlsId} />}
     transparentTab={false}
     {...props}
   >
diff --git a/src/app/content/components/popUp/ToastNotifications.spec.tsx b/src/app/content/components/popUp/ToastNotifications.spec.tsx
index 51cd39c616..540534d26d 100644
--- a/src/app/content/components/popUp/ToastNotifications.spec.tsx
+++ b/src/app/content/components/popUp/ToastNotifications.spec.tsx
@@ -26,13 +26,13 @@ describe('ToastNotifications', () => {
   it('matches snapshots with toasts', () => {
     const toasts: ToastNotification[] = [{
       destination: 'myHighlights',
-      messageKey: toastMessageKeys.higlights.failure.delete,
+      messageKey: toastMessageKeys.highlights.failure.delete,
       shouldAutoDismiss: true,
       timestamp: 1,
     }, {
       destination: 'myHighlights',
       errorId: 'error-id',
-      messageKey: toastMessageKeys.higlights.failure.update.annotation,
+      messageKey: toastMessageKeys.highlights.failure.update.annotation,
       shouldAutoDismiss: true,
       timestamp: 2,
     }];
diff --git a/src/app/content/components/popUp/__snapshots__/ColorFilter.spec.tsx.snap b/src/app/content/components/popUp/__snapshots__/ColorFilter.spec.tsx.snap
index a37e313f6a..f44870b0dc 100644
--- a/src/app/content/components/popUp/__snapshots__/ColorFilter.spec.tsx.snap
+++ b/src/app/content/components/popUp/__snapshots__/ColorFilter.spec.tsx.snap
@@ -478,6 +478,7 @@ input:checked + .c8 .c10 {
 
 <div
   className="c0"
+  id="color-filter"
   tabIndex={-1}
 >
   <div
diff --git a/src/app/content/components/popUp/__snapshots__/Filters.spec.tsx.snap b/src/app/content/components/popUp/__snapshots__/Filters.spec.tsx.snap
index f90daf312b..076b03ff3f 100644
--- a/src/app/content/components/popUp/__snapshots__/Filters.spec.tsx.snap
+++ b/src/app/content/components/popUp/__snapshots__/Filters.spec.tsx.snap
@@ -349,6 +349,8 @@ exports[`Filters matches snapshot 1`] = `
       className="c2 c3 c4"
     >
       <button
+        aria-controls="summary-filter-chapter"
+        aria-expanded={false}
         aria-label="Filter highlights by Chapter"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter highlights by Chapter"
@@ -379,6 +381,8 @@ exports[`Filters matches snapshot 1`] = `
       className="c2 c3 c4"
     >
       <button
+        aria-controls="summary-filter-color"
+        aria-expanded={false}
         aria-label="Filter highlights by Color"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter highlights by Color"
@@ -1000,6 +1004,8 @@ exports[`Filters matches snapshot when open color filters 1`] = `
       className="c2 c3 c4"
     >
       <button
+        aria-controls="summary-filter-chapter"
+        aria-expanded={false}
         aria-label="Filter highlights by Chapter"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter highlights by Chapter"
@@ -1030,6 +1036,8 @@ exports[`Filters matches snapshot when open color filters 1`] = `
       className="c2 c3 c4"
     >
       <button
+        aria-controls="summary-filter-color"
+        aria-expanded={true}
         aria-label="Filter highlights by Color"
         className="c5 c11 c7 c8"
         data-analytics-label="Filter highlights by Color"
@@ -1057,6 +1065,7 @@ exports[`Filters matches snapshot when open color filters 1`] = `
       </button>
       <div
         colorFiltersWithContent={Set {}}
+        id="summary-filter-color"
         labelKey={[Function]}
         mock-color-filter={true}
         selectedColorFilters={Set {}}
diff --git a/src/app/content/content.browserspec.ts b/src/app/content/content.browserspec.ts
index 37f09a601e..3f14a20d8c 100644
--- a/src/app/content/content.browserspec.ts
+++ b/src/app/content/content.browserspec.ts
@@ -40,7 +40,12 @@ describe('content', () => {
   });
 
   it('a11y lighthouse check', async() => {
-    await checkLighthouse(browser, TEST_LONG_PAGE_URL);
+    await checkLighthouse(browser, TEST_LONG_PAGE_URL, {
+      accessibility: 1,
+      'best-practices': 0.88,
+      customAccessibility: 1,
+      seo: 1,
+    });
   });
 
   it(`when clicking a toc link:
diff --git a/src/app/content/highlights/components/ColorPicker.spec.tsx b/src/app/content/highlights/components/ColorPicker.spec.tsx
index 3780cb5d16..1b5c1d3123 100644
--- a/src/app/content/highlights/components/ColorPicker.spec.tsx
+++ b/src/app/content/highlights/components/ColorPicker.spec.tsx
@@ -4,7 +4,7 @@ import { renderToDom, dispatchKeyDownEvent } from '../../../../test/reactutils';
 import TestContainer from '../../../../test/TestContainer';
 import { highlightStyles } from '../../constants';
 import ColorPicker from './ColorPicker';
-import { HTMLElement, HTMLDivElement, HTMLInputElement } from '@openstax/types/lib.dom';
+import { HTMLElement, HTMLFieldSetElement, HTMLInputElement } from '@openstax/types/lib.dom';
 import { assertDocument } from '../../../utils';
 
 describe('ColorPicker', () => {
@@ -89,10 +89,10 @@ describe('ColorPicker', () => {
     const onRemove = jest.fn();
     const {root} = renderToDom(
       <TestContainer>
-        <ColorPicker onChange={onChange} onRemove={onRemove} />
+        <ColorPicker color={highlightStyles[0].label} onChange={onChange} onRemove={onRemove} />
       </TestContainer>
     );
-    const rg = root.querySelector('[role="radiogroup"]') as HTMLDivElement;
+    const rg = root.querySelector('fieldset') as HTMLFieldSetElement;
 
     expect(rg).toBeTruthy();
     rg?.focus();
@@ -148,7 +148,7 @@ describe('ColorPicker', () => {
         <ColorPicker color={highlightStyles[0].label} onChange={onChange} onRemove={onRemove} />
       </TestContainer>
     );
-    const rg = root.querySelector('[role="radiogroup"]') as HTMLDivElement;
+    const rg = root.querySelector('fieldset') as HTMLFieldSetElement;
 
     expect(rg).toBeTruthy();
     rg?.focus();
diff --git a/src/app/content/highlights/components/ColorPicker.tsx b/src/app/content/highlights/components/ColorPicker.tsx
index efb0a1110a..415ae6f8c2 100644
--- a/src/app/content/highlights/components/ColorPicker.tsx
+++ b/src/app/content/highlights/components/ColorPicker.tsx
@@ -104,32 +104,27 @@ const ColorPicker = ({className, ...props}: Props) => {
     },
     []
   );
-  const initialFocus = React.useCallback(
-    (event: React.FocusEvent) => {
-      if (!ref.current || event.currentTarget !== event.target) {
-        return;
-      }
-      const firstChecked = ref.current.querySelector<HTMLInputElement>('input[checked]');
-
-      if (firstChecked) {
-        firstChecked.focus();
-      } else {
-        ref.current.querySelector<HTMLInputElement>('input')?.focus();
+  const color = (props as SingleSelectProps).color;
+  const focusOnSelected = React.useCallback(
+    () => {
+      if (color && document?.activeElement === ref.current) {
+        ref.current?.querySelector<HTMLInputElement>(`input[name="${color}"]`)?.focus();
       }
     },
-    []
+    [color]
   );
 
+  React.useEffect(focusOnSelected, [focusOnSelected]);
+
   return (
-    <div
+    <fieldset
       className={className}
       tabIndex={0}
-      role='radiogroup'
-      aria-label='colors'
       ref={ref}
       onKeyDown={handleKeyNavigation}
-      onFocus={initialFocus}
+      onFocus={focusOnSelected}
     >
+      <legend>Choose highlight color</legend>
       {highlightStyles.map((style) => <ColorButton key={style.label}
         name={style.label}
         checked={props.multiple ? props.selected.includes(style.label) : props.color === style.label}
@@ -144,15 +139,24 @@ const ColorPicker = ({className, ...props}: Props) => {
             ? props.onRemove ? props.onRemove() : null
             : props.onChange(style.label)}
       />)}
-    </div>
+    </fieldset>
   );
 };
 
 export default styled(ColorPicker)`
+  border: 0;
   outline: none;
   display: flex;
   flex-direction: row;
   overflow: visible;
   gap: ${cardPadding}rem;
   padding: ${cardPadding}rem 0.3rem;
+
+  legend {
+    position: absolute;
+    height: 1px;
+    width: 1px;
+    overflow: hidden;
+    clip: rect(1px, 1px, 1px, 1px);
+  }
 `;
diff --git a/src/app/content/highlights/components/HighlightsPopUp.tsx b/src/app/content/highlights/components/HighlightsPopUp.tsx
index 79d0c9351e..1a70cd4805 100644
--- a/src/app/content/highlights/components/HighlightsPopUp.tsx
+++ b/src/app/content/highlights/components/HighlightsPopUp.tsx
@@ -128,9 +128,11 @@ const HighlightsPopUp = ({ closeMyHighlights, ...props }: Props) => {
       }}
     >
       <Header colorSchema={props.bookTheme}>
-        <FormattedMessage id='i18n:toolbar:highlights:popup:heading'>
-          {(msg) => msg}
-        </FormattedMessage>
+        <h1>
+          <FormattedMessage id='i18n:toolbar:highlights:popup:heading'>
+            {(msg) => msg}
+          </FormattedMessage>
+        </h1>
         <CloseIconWrapper
           data-testid='close-highlights-popup'
           aria-label={intl.formatMessage({id: 'i18n:toolbar:highlights:popup:close-button:aria-label'})}
@@ -140,7 +142,7 @@ const HighlightsPopUp = ({ closeMyHighlights, ...props }: Props) => {
           <CloseIcon colorSchema={props.bookTheme}/>
         </CloseIconWrapper>
       </Header>
-      {props.user ? <ShowMyHighlights /> : <LoginForHighlights />}
+      {props.user ? <ShowMyHighlights topElRef={popUpRef} /> : <LoginForHighlights />}
       <HighlightsHelpInfo />
     </Modal>
     : null;
diff --git a/src/app/content/highlights/components/Note.tsx b/src/app/content/highlights/components/Note.tsx
index 1c9a66e984..2a59d8a26b 100644
--- a/src/app/content/highlights/components/Note.tsx
+++ b/src/app/content/highlights/components/Note.tsx
@@ -84,7 +84,7 @@ const Note = ({onChange, onFocus, note, textareaRef, edit = false}: Props) => {
   React.useEffect(setTextAreaHeight, [note, setTextAreaHeight]);
 
   return (
-    <WrapperLabel for='note-textarea'>
+    <WrapperLabel htmlFor='note-textarea'>
       <TextArea
         id='note-textarea'
         ref={textareaRef}
diff --git a/src/app/content/highlights/components/ShowMyHighlights.spec.tsx b/src/app/content/highlights/components/ShowMyHighlights.spec.tsx
index 115475f97a..a2cc1e5697 100644
--- a/src/app/content/highlights/components/ShowMyHighlights.spec.tsx
+++ b/src/app/content/highlights/components/ShowMyHighlights.spec.tsx
@@ -267,8 +267,9 @@ describe('Show my highlights', () => {
       }));
     });
 
+    const container = window.document.createElement('div');
     const {root} = renderToDom(<TestContainer store={store}>
-      <ShowMyHighlights/>
+      <ShowMyHighlights topElRef={container} />
     </TestContainer>);
 
     const target = root.querySelector('[data-testid="show-myhighlights-body"]');
diff --git a/src/app/content/highlights/components/ShowMyHighlights.tsx b/src/app/content/highlights/components/ShowMyHighlights.tsx
index 6c9294786c..a806993c96 100644
--- a/src/app/content/highlights/components/ShowMyHighlights.tsx
+++ b/src/app/content/highlights/components/ShowMyHighlights.tsx
@@ -25,6 +25,7 @@ interface ShowMyHighlightsProps {
   loadMore: () => void;
   initMyHighlights: () => void;
   services: AppServices;
+  topElRef: React.RefObject<HTMLElement>;
 }
 
 class ShowMyHighlights extends Component<ShowMyHighlightsProps, { showGoToTop: boolean }> {
@@ -41,6 +42,7 @@ class ShowMyHighlights extends Component<ShowMyHighlightsProps, { showGoToTop: b
       return;
     }
 
+    this.props.topElRef.current?.focus();
     highlightsBodyRef.scrollTop = 0;
   };
 
diff --git a/src/app/content/highlights/components/SummaryPopup/Filters.tsx b/src/app/content/highlights/components/SummaryPopup/Filters.tsx
index 59316d73da..eb65fb5d6d 100644
--- a/src/app/content/highlights/components/SummaryPopup/Filters.tsx
+++ b/src/app/content/highlights/components/SummaryPopup/Filters.tsx
@@ -81,15 +81,18 @@ export default () =>
         label='i18n:highlighting:filters:chapters'
         ariaLabelId='i18n:highlighting:filters:filter-by:aria-label'
         dataAnalyticsLabel='Filter highlights by Chapter'
+        controlsId='summary-filter-chapter'
       >
-        <ConnectedChapterFilter multiselect={true} />
+        <ConnectedChapterFilter multiselect={true} id='summary-filter-chapter' />
       </FilterDropdown>
       <FilterDropdown
         label='i18n:highlighting:filters:colors'
         ariaLabelId='i18n:highlighting:filters:filter-by:aria-label'
         dataAnalyticsLabel='Filter highlights by Color'
+        controlsId='summary-filter-color'
       >
         <ConnectedColorFilter
+          id='summary-filter-color'
           styles={highlightStyles}
           labelKey={(label: HighlightColorEnum) => `i18n:highlighting:colors:${label}`}
         />
diff --git a/src/app/content/highlights/components/SummaryPopup/__snapshots__/ContextMenu.spec.tsx.snap b/src/app/content/highlights/components/SummaryPopup/__snapshots__/ContextMenu.spec.tsx.snap
index 6510de67d1..2511af78af 100644
--- a/src/app/content/highlights/components/SummaryPopup/__snapshots__/ContextMenu.spec.tsx.snap
+++ b/src/app/content/highlights/components/SummaryPopup/__snapshots__/ContextMenu.spec.tsx.snap
@@ -408,6 +408,7 @@ exports[`ContextMenu match snapshot when open 1`] = `
 }
 
 .c14 {
+  border: 0;
   outline: none;
   display: -webkit-box;
   display: -webkit-flex;
@@ -421,6 +422,15 @@ exports[`ContextMenu match snapshot when open 1`] = `
   padding: 0.8rem 0.3rem;
 }
 
+.c14 legend {
+  position: absolute;
+  height: 1px;
+  width: 1px;
+  overflow: hidden;
+  -webkit-clip: rect(1px,1px,1px,1px);
+  clip: rect(1px,1px,1px,1px);
+}
+
 .c4 {
   cursor: pointer;
   border: none;
@@ -629,14 +639,15 @@ exports[`ContextMenu match snapshot when open 1`] = `
     <div
       className="c12"
     >
-      <div
-        aria-label="colors"
+      <fieldset
         className="c13 c14"
         onFocus={[Function]}
         onKeyDown={[Function]}
-        role="radiogroup"
         tabIndex={0}
       >
+        <legend>
+          Choose highlight color
+        </legend>
         <label
           aria-label="Apply yellow highlight"
           checked={false}
@@ -942,7 +953,7 @@ exports[`ContextMenu match snapshot when open 1`] = `
             }
           />
         </label>
-      </div>
+      </fieldset>
       <ol
         className="c30"
       >
diff --git a/src/app/content/highlights/components/SummaryPopup/__snapshots__/Filters.spec.tsx.snap b/src/app/content/highlights/components/SummaryPopup/__snapshots__/Filters.spec.tsx.snap
index d426c77133..e4abcf53f0 100644
--- a/src/app/content/highlights/components/SummaryPopup/__snapshots__/Filters.spec.tsx.snap
+++ b/src/app/content/highlights/components/SummaryPopup/__snapshots__/Filters.spec.tsx.snap
@@ -835,6 +835,8 @@ input:checked + .c21 .c22 {
       className="c2 c3 c4"
     >
       <button
+        aria-controls="summary-filter-chapter"
+        aria-expanded={true}
         aria-label="Filter highlights by Chapter"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter highlights by Chapter"
@@ -862,6 +864,7 @@ input:checked + .c21 .c22 {
       </button>
       <div
         className="c11"
+        id="summary-filter-chapter"
         tabIndex={-1}
       >
         <div
@@ -892,6 +895,8 @@ input:checked + .c21 .c22 {
       className="c2 c3 c4"
     >
       <button
+        aria-controls="summary-filter-color"
+        aria-expanded={true}
         aria-label="Filter highlights by Color"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter highlights by Color"
@@ -919,6 +924,7 @@ input:checked + .c21 .c22 {
       </button>
       <div
         className="c17"
+        id="summary-filter-color"
         tabIndex={-1}
       >
         <div
diff --git a/src/app/content/highlights/components/__snapshots__/ColorPicker.spec.tsx.snap b/src/app/content/highlights/components/__snapshots__/ColorPicker.spec.tsx.snap
index 7a60c74b0e..087ebd073c 100644
--- a/src/app/content/highlights/components/__snapshots__/ColorPicker.spec.tsx.snap
+++ b/src/app/content/highlights/components/__snapshots__/ColorPicker.spec.tsx.snap
@@ -275,6 +275,7 @@ exports[`ColorPicker matches snapshot no selection 1`] = `
 }
 
 .c0 {
+  border: 0;
   outline: none;
   display: -webkit-box;
   display: -webkit-flex;
@@ -288,14 +289,24 @@ exports[`ColorPicker matches snapshot no selection 1`] = `
   padding: 0.8rem 0.3rem;
 }
 
-<div
-  aria-label="colors"
+.c0 legend {
+  position: absolute;
+  height: 1px;
+  width: 1px;
+  overflow: hidden;
+  -webkit-clip: rect(1px,1px,1px,1px);
+  clip: rect(1px,1px,1px,1px);
+}
+
+<fieldset
   className="c0"
   onFocus={[Function]}
   onKeyDown={[Function]}
-  role="radiogroup"
   tabIndex={0}
 >
+  <legend>
+    Choose highlight color
+  </legend>
   <label
     aria-label="Apply yellow highlight"
     checked={false}
@@ -586,5 +597,5 @@ exports[`ColorPicker matches snapshot no selection 1`] = `
       }
     />
   </label>
-</div>
+</fieldset>
 `;
diff --git a/src/app/content/highlights/components/__snapshots__/Note.spec.tsx.snap b/src/app/content/highlights/components/__snapshots__/Note.spec.tsx.snap
index ff16bfe444..21f9fb1ae5 100644
--- a/src/app/content/highlights/components/__snapshots__/Note.spec.tsx.snap
+++ b/src/app/content/highlights/components/__snapshots__/Note.spec.tsx.snap
@@ -50,7 +50,7 @@ exports[`Note matches snapshot 1`] = `
 
 <label
   className="c0"
-  for="note-textarea"
+  htmlFor="note-textarea"
 >
   <textarea
     className="c1"
diff --git a/src/app/content/highlights/errors.ts b/src/app/content/highlights/errors.ts
index d800265a46..bf29ea7789 100644
--- a/src/app/content/highlights/errors.ts
+++ b/src/app/content/highlights/errors.ts
@@ -2,26 +2,26 @@ import { makeToastMessageError } from '../../../helpers/applicationMessageError'
 import { toastMessageKeys } from '../../notifications/components/ToastNotifications/constants';
 
 // tslint:disable-next-line: variable-name
-export const HighlightCreateError = makeToastMessageError(toastMessageKeys.higlights.failure.create);
+export const HighlightCreateError = makeToastMessageError(toastMessageKeys.highlights.failure.create);
 
 // tslint:disable-next-line: variable-name
-export const HighlightDeleteError = makeToastMessageError(toastMessageKeys.higlights.failure.delete);
+export const HighlightDeleteError = makeToastMessageError(toastMessageKeys.highlights.failure.delete);
 
 // tslint:disable-next-line: variable-name
-export const HighlightLoadError = makeToastMessageError(toastMessageKeys.higlights.failure.load);
+export const HighlightLoadError = makeToastMessageError(toastMessageKeys.highlights.failure.load);
 
 // tslint:disable-next-line: variable-name
-export const HighlightPopupLoadError = makeToastMessageError(toastMessageKeys.higlights.failure.popUp.load);
+export const HighlightPopupLoadError = makeToastMessageError(toastMessageKeys.highlights.failure.popUp.load);
 
 // tslint:disable-next-line: variable-name
-export const HighlightPopupPrintError = makeToastMessageError(toastMessageKeys.higlights.failure.popUp.print);
+export const HighlightPopupPrintError = makeToastMessageError(toastMessageKeys.highlights.failure.popUp.print);
 
 // tslint:disable-next-line: variable-name
 export const HighlightUpdateAnnotationError = makeToastMessageError(
-  toastMessageKeys.higlights.failure.update.annotation);
+  toastMessageKeys.highlights.failure.update.annotation);
 
 // tslint:disable-next-line: variable-name
-export const HighlightUpdateColorError = makeToastMessageError(toastMessageKeys.higlights.failure.update.color);
+export const HighlightUpdateColorError = makeToastMessageError(toastMessageKeys.highlights.failure.update.color);
 
 // tslint:disable-next-line: variable-name
 export const StudyGuidesLoadError = makeToastMessageError(toastMessageKeys.studyGuides.failure.load);
diff --git a/src/app/content/highlights/hooks/createHighlight.spec.ts b/src/app/content/highlights/hooks/createHighlight.spec.ts
index f2d4b8cbb7..0bf705409d 100644
--- a/src/app/content/highlights/hooks/createHighlight.spec.ts
+++ b/src/app/content/highlights/hooks/createHighlight.spec.ts
@@ -103,7 +103,7 @@ describe('createHighlight', () => {
       await hook(createHighlight(mock, meta));
     } catch (error: any) {
       expect(createHighlightClient).toHaveBeenCalledWith({ highlight: mock });
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.create);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.create);
       expect(error.meta).toEqual({ destination: 'page' });
     }
   });
diff --git a/src/app/content/highlights/hooks/initializeMyHighlightsSummary.spec.ts b/src/app/content/highlights/hooks/initializeMyHighlightsSummary.spec.ts
index e501c0bef9..6e1fe99a9f 100644
--- a/src/app/content/highlights/hooks/initializeMyHighlightsSummary.spec.ts
+++ b/src/app/content/highlights/hooks/initializeMyHighlightsSummary.spec.ts
@@ -101,7 +101,7 @@ describe('initializeMyHighlightsSummaryHook', () => {
     } catch (error: any) {
       expect(getHighlightsSummaryClient).toHaveBeenCalled();
       expect(dispatch).toHaveBeenCalledWith(toggleSummaryHighlightsLoading(false));
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.popUp.load);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.popUp.load);
       expect(error.meta).toEqual({ destination: 'myHighlights' });
     }
   });
@@ -140,7 +140,7 @@ describe('initializeMyHighlightsSummaryHook', () => {
     } catch (error: any) {
       expect(getHighlightsClient).toHaveBeenCalled();
       expect(dispatch).toHaveBeenCalledWith(toggleSummaryHighlightsLoading(false));
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.popUp.load);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.popUp.load);
       expect(error.meta).toEqual({ destination: 'myHighlights' });
     }
   });
diff --git a/src/app/content/highlights/hooks/loadHighlights.spec.ts b/src/app/content/highlights/hooks/loadHighlights.spec.ts
index bbee67623a..59c3dfb631 100644
--- a/src/app/content/highlights/hooks/loadHighlights.spec.ts
+++ b/src/app/content/highlights/hooks/loadHighlights.spec.ts
@@ -188,7 +188,7 @@ describe('loadHighlights', () => {
       try {
         await hook(receivePage({...page, references: []}));
       } catch (error: any) {
-        expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.load);
+        expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.load);
         expect(error.meta).toEqual({destination: 'page', shouldAutoDismiss: false});
       }
     });
diff --git a/src/app/content/highlights/hooks/loadMore.spec.ts b/src/app/content/highlights/hooks/loadMore.spec.ts
index 7be4705b38..a7c47704d3 100644
--- a/src/app/content/highlights/hooks/loadMore.spec.ts
+++ b/src/app/content/highlights/hooks/loadMore.spec.ts
@@ -334,7 +334,7 @@ describe('filtersChange errors', () => {
       await hook(store.dispatch(setSummaryFilters({locationIds})));
     } catch (error: any) {
       expect(dispatch).toHaveBeenCalledWith(toggleSummaryHighlightsLoading(false));
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.popUp.load);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.popUp.load);
       expect(error.meta).toEqual({ destination: 'myHighlights' });
     }
   });
diff --git a/src/app/content/highlights/hooks/printHighlights.spec.ts b/src/app/content/highlights/hooks/printHighlights.spec.ts
index e53603a4ec..f826aa0141 100644
--- a/src/app/content/highlights/hooks/printHighlights.spec.ts
+++ b/src/app/content/highlights/hooks/printHighlights.spec.ts
@@ -224,7 +224,7 @@ describe('printHighlights', () => {
         await asyncHelper(helpers);
       } catch (error: any) {
         expect(dispatch).toHaveBeenCalledWith(toggleSummaryHighlightsLoading(false));
-        expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.popUp.print);
+        expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.popUp.print);
         expect(error.meta).toEqual({ destination: 'myHighlights' });
       }
     });
diff --git a/src/app/content/highlights/hooks/receiveDeleteHighlight.spec.ts b/src/app/content/highlights/hooks/receiveDeleteHighlight.spec.ts
index 68cd488c6b..6d0b12ee2a 100644
--- a/src/app/content/highlights/hooks/receiveDeleteHighlight.spec.ts
+++ b/src/app/content/highlights/hooks/receiveDeleteHighlight.spec.ts
@@ -81,7 +81,7 @@ describe('receiveDeleteHighlight', () => {
       await hook(receiveDeleteHighlight(highlight as unknown as HighlightData, meta));
     } catch (error: any) {
       expect(deleteHighlightClient).toHaveBeenCalled();
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.delete);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.delete);
       expect(error.meta).toEqual({ destination: 'page' });
     }
   });
diff --git a/src/app/content/highlights/hooks/updateHighlight.spec.ts b/src/app/content/highlights/hooks/updateHighlight.spec.ts
index a461a91d80..ca97ab888d 100644
--- a/src/app/content/highlights/hooks/updateHighlight.spec.ts
+++ b/src/app/content/highlights/hooks/updateHighlight.spec.ts
@@ -147,7 +147,7 @@ describe('updateHighlight', () => {
       await hook(updateHighlight(colorUpdate, meta));
     } catch (error: any) {
       expect(updateHighlightClient).toHaveBeenCalledWith(colorUpdate);
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.update.color);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.update.color);
       expect(error.meta).toEqual({ destination: 'page' });
     }
   });
@@ -169,7 +169,7 @@ describe('updateHighlight', () => {
       await hook(updateHighlight(annotationUpdate, meta));
     } catch (error: any) {
       expect(updateHighlightClient).toHaveBeenCalledWith(annotationUpdate);
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.update.annotation);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.update.annotation);
       expect(error.meta).toEqual({ destination: 'page' });
     }
 
@@ -180,7 +180,7 @@ describe('updateHighlight', () => {
       await hook(updateHighlight(annotationUpdate, meta));
     } catch (error: any) {
       expect(updateHighlightClient).toHaveBeenCalledWith(annotationUpdate);
-      expect(error.messageKey).toBe(toastMessageKeys.higlights.failure.update.annotation);
+      expect(error.messageKey).toBe(toastMessageKeys.highlights.failure.update.annotation);
       expect(error.meta).toEqual({ destination: 'myHighlights' });
     }
   });
diff --git a/src/app/content/keyboardShortcuts/components/KeyboardShortcutsPopup.tsx b/src/app/content/keyboardShortcuts/components/KeyboardShortcutsPopup.tsx
index 775fbc419e..9412d12e82 100644
--- a/src/app/content/keyboardShortcuts/components/KeyboardShortcutsPopup.tsx
+++ b/src/app/content/keyboardShortcuts/components/KeyboardShortcutsPopup.tsx
@@ -60,9 +60,11 @@ const KeyboardShortcutsPopup = () => {
       }}
     >
       <Header colorSchema={bookTheme}>
-        <FormattedMessage id='i18n:a11y:keyboard-shortcuts:heading'>
-          {(msg) => msg}
-        </FormattedMessage>
+        <h1>
+          <FormattedMessage id='i18n:a11y:keyboard-shortcuts:heading'>
+            {(msg) => msg}
+          </FormattedMessage>
+        </h1>
         <CloseIconWrapper
           data-testid='close-keyboard-shortcuts-popup'
           aria-label={intl.formatMessage({id: 'i18n:a11y:keyboard-shortcuts:close'})}
diff --git a/src/app/content/keyboardShortcuts/components/__snapshots__/KeyboardShortcutsPopup.spec.tsx.snap b/src/app/content/keyboardShortcuts/components/__snapshots__/KeyboardShortcutsPopup.spec.tsx.snap
index 1172a91b8a..3eb9960853 100644
--- a/src/app/content/keyboardShortcuts/components/__snapshots__/KeyboardShortcutsPopup.spec.tsx.snap
+++ b/src/app/content/keyboardShortcuts/components/__snapshots__/KeyboardShortcutsPopup.spec.tsx.snap
@@ -57,6 +57,14 @@ exports[`KeyboardShortcuts renders keyboard shortcuts modal if it is open 1`] =
   z-index: 5;
 }
 
+.c4 h1 {
+  font-size: inherit;
+  -webkit-letter-spacing: inherit;
+  -moz-letter-spacing: inherit;
+  -ms-letter-spacing: inherit;
+  letter-spacing: inherit;
+}
+
 .c2 {
   top: 0;
   z-index: 110;
@@ -286,10 +294,12 @@ exports[`KeyboardShortcuts renders keyboard shortcuts modal if it is open 1`] =
     data-testid="keyboard-shortcuts-popup-wrapper"
     tabIndex="-1"
   >
-    <h3
+    <div
       className="c4"
     >
-      Keyboard Shortcuts
+      <h1>
+        Keyboard Shortcuts
+      </h1>
       <button
         aria-label="Click to close Keyboard Shortcuts menu"
         className="c5"
@@ -327,7 +337,7 @@ exports[`KeyboardShortcuts renders keyboard shortcuts modal if it is open 1`] =
           </g>
         </svg>
       </button>
-    </h3>
+    </div>
     <div
       className="c7"
       data-analytics-region="KS popup"
diff --git a/src/app/content/practiceQuestions/components/Filters.tsx b/src/app/content/practiceQuestions/components/Filters.tsx
index 3e1d3a51d2..d0e9175263 100644
--- a/src/app/content/practiceQuestions/components/Filters.tsx
+++ b/src/app/content/practiceQuestions/components/Filters.tsx
@@ -40,8 +40,10 @@ export default () => {
         dataAnalyticsLabel='Filter PQ by Chapter & Section'
         open={open}
         setOpen={(isOpen: boolean) => setOpen(isOpen)}
+        controlsId='practice-filter-chapter'
       >
         <StyledChapterFilters
+          id='practice-filter-chapter'
           locationFilters={locationFilters}
           selectedLocationFilters={selectedLocationFilters}
           setFilters={setFilters}
diff --git a/src/app/content/practiceQuestions/components/PracticeQuestionsPopup.tsx b/src/app/content/practiceQuestions/components/PracticeQuestionsPopup.tsx
index a224e73333..aee88a234d 100644
--- a/src/app/content/practiceQuestions/components/PracticeQuestionsPopup.tsx
+++ b/src/app/content/practiceQuestions/components/PracticeQuestionsPopup.tsx
@@ -59,9 +59,11 @@ const PracticeQuestionsPopup = () => {
       }}
     >
       <Header colorSchema={bookTheme}>
-        <FormattedMessage id='i18n:practice-questions:popup:heading'>
-          {(msg) => msg}
-        </FormattedMessage>
+        <h1>
+          <FormattedMessage id='i18n:practice-questions:popup:heading'>
+            {(msg) => msg}
+          </FormattedMessage>
+        </h1>
         <CloseIconWrapper
           data-testid='close-practice-questions-popup'
           aria-label={intl.formatMessage({id: 'i18n:practice-questions:popup:close'})}
diff --git a/src/app/content/practiceQuestions/components/__snapshots__/Filters.spec.tsx.snap b/src/app/content/practiceQuestions/components/__snapshots__/Filters.spec.tsx.snap
index fb3b7406b6..e7ee5d4817 100644
--- a/src/app/content/practiceQuestions/components/__snapshots__/Filters.spec.tsx.snap
+++ b/src/app/content/practiceQuestions/components/__snapshots__/Filters.spec.tsx.snap
@@ -158,6 +158,8 @@ exports[`Filters ChapterFilter matches snapshot when it is closed 1`] = `
       className="c2 c3 c4"
     >
       <button
+        aria-controls="practice-filter-chapter"
+        aria-expanded={false}
         aria-label="Filter PQ by Chapter & Section"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter PQ by Chapter & Section"
@@ -557,6 +559,8 @@ exports[`Filters ChapterFilter matches snapshot when open with selected section
       className="c2 c3 c4"
     >
       <button
+        aria-controls="practice-filter-chapter"
+        aria-expanded={true}
         aria-label="Filter PQ by Chapter & Section"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter PQ by Chapter & Section"
@@ -584,6 +588,7 @@ exports[`Filters ChapterFilter matches snapshot when open with selected section
       </button>
       <div
         className="c12"
+        id="practice-filter-chapter"
         tabIndex={-1}
       >
         <div
@@ -1054,6 +1059,8 @@ exports[`Filters ChapterFilter matches snapshot when open without selected secti
       className="c2 c3 c4"
     >
       <button
+        aria-controls="practice-filter-chapter"
+        aria-expanded={true}
         aria-label="Filter PQ by Chapter & Section"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter PQ by Chapter & Section"
@@ -1081,6 +1088,7 @@ exports[`Filters ChapterFilter matches snapshot when open without selected secti
       </button>
       <div
         className="c12"
+        id="practice-filter-chapter"
         tabIndex={-1}
       >
         <div
diff --git a/src/app/content/practiceQuestions/components/__snapshots__/PracticeQuestionsPopup.spec.tsx.snap b/src/app/content/practiceQuestions/components/__snapshots__/PracticeQuestionsPopup.spec.tsx.snap
index 5265629296..04468ef520 100644
--- a/src/app/content/practiceQuestions/components/__snapshots__/PracticeQuestionsPopup.spec.tsx.snap
+++ b/src/app/content/practiceQuestions/components/__snapshots__/PracticeQuestionsPopup.spec.tsx.snap
@@ -71,6 +71,14 @@ exports[`PracticeQuestions renders practice questions modal if it is open 1`] =
   z-index: 5;
 }
 
+.c3 h1 {
+  font-size: inherit;
+  -webkit-letter-spacing: inherit;
+  -moz-letter-spacing: inherit;
+  -ms-letter-spacing: inherit;
+  letter-spacing: inherit;
+}
+
 .c2 {
   top: 0;
   z-index: 110;
@@ -412,10 +420,12 @@ exports[`PracticeQuestions renders practice questions modal if it is open 1`] =
     data-testid="practice-questions-popup-wrapper"
     tabIndex="-1"
   >
-    <h3
+    <div
       className="c3"
     >
-      Practice Questions
+      <h1>
+        Practice Questions
+      </h1>
       <button
         aria-label="Click to close Practice Questions modal"
         className="c4"
@@ -453,7 +463,7 @@ exports[`PracticeQuestions renders practice questions modal if it is open 1`] =
           </g>
         </svg>
       </button>
-    </h3>
+    </div>
     <div
       className="c6"
       data-analytics-location="section not loaded"
@@ -470,6 +480,8 @@ exports[`PracticeQuestions renders practice questions modal if it is open 1`] =
             className="c9 c10 c11"
           >
             <button
+              aria-controls="practice-filter-chapter"
+              aria-expanded={false}
               aria-label="Filter PQ by Chapter & Section"
               className="c12 c13 c14 c15"
               data-analytics-label="Filter PQ by Chapter & Section"
diff --git a/src/app/content/studyGuides/components/Filters.tsx b/src/app/content/studyGuides/components/Filters.tsx
index f7d6132ad6..a7fcb009db 100644
--- a/src/app/content/studyGuides/components/Filters.tsx
+++ b/src/app/content/studyGuides/components/Filters.tsx
@@ -124,8 +124,10 @@ export default () => {
         label='i18n:highlighting:filters:chapters'
         ariaLabelId='i18n:studyguides:popup:filters:filter-by:aria-label'
         dataAnalyticsLabel='Filter study guides by Chapter'
+        controlsId='guide-filter-chapter'
       >
         <ConnectedChapterFilter
+          id='guide-filter-chapter'
           disabled={userLoggedOut}
           multiselect={true}
           setFilters={(change: FiltersChange<LinkedArchiveTreeNode>) =>
@@ -136,8 +138,10 @@ export default () => {
         label='i18n:highlighting:filters:colors'
         ariaLabelId='i18n:studyguides:popup:filters:filter-by:aria-label'
         dataAnalyticsLabel='Filter study guides by Color'
+        controlsId='guide-filter-color'
       >
         <ConnectedColorFilter
+          id='guide-filter-color'
           disabled={userLoggedOut}
           styles={highlightStyles}
           labelKey={(label: HighlightColorEnum) => `i18n:studyguides:popup:filters:${label}`}
diff --git a/src/app/content/studyGuides/components/ShowStudyGuides.spec.tsx b/src/app/content/studyGuides/components/ShowStudyGuides.spec.tsx
index d8e3a20738..d479671c3c 100644
--- a/src/app/content/studyGuides/components/ShowStudyGuides.spec.tsx
+++ b/src/app/content/studyGuides/components/ShowStudyGuides.spec.tsx
@@ -10,6 +10,7 @@ import GoToTopButton from '../../../components/GoToTopButton';
 import { Store } from '../../../types';
 import { assertWindow } from '../../../utils';
 import { loadMoreStudyGuides } from '../actions';
+import { HTMLElement } from '@openstax/types/lib.dom';
 import * as selectors from '../selectors';
 import ShowStudyGuides, { StudyGuidesBody } from './ShowStudyGuides';
 
@@ -23,6 +24,14 @@ describe('ShowStudyGuides', () => {
     window = assertWindow();
   });
 
+  function createComponent(container: HTMLElement) {
+    const ref: React.RefObject<HTMLElement> = {current: container};
+
+    return renderer.create(<TestContainer store={store}>
+      <ShowStudyGuides topElRef={ref}/>
+    </TestContainer>, { createNodeMock: () => container });
+  }
+
   it('doesn\'t request more if not at bottom', () => {
     const container = window.document.createElement('div');
     const dispatch = jest.spyOn(store, 'dispatch');
@@ -30,9 +39,7 @@ describe('ShowStudyGuides', () => {
     jest.spyOn(selectors, 'hasMoreResults')
       .mockReturnValue(true);
 
-    const component = renderer.create(<TestContainer store={store}>
-      <ShowStudyGuides />
-    </TestContainer>, { createNodeMock: () => container });
+    const component = createComponent(container);
 
     Object.defineProperty(container, 'scrollHeight', { value: 1000 });
     Object.defineProperty(container, 'offsetHeight', { value: 100 });
@@ -54,9 +61,7 @@ describe('ShowStudyGuides', () => {
     jest.spyOn(selectors, 'hasMoreResults')
       .mockReturnValue(true);
 
-    const component = renderer.create(<TestContainer store={store}>
-      <ShowStudyGuides />
-    </TestContainer>, { createNodeMock: () => container});
+    const component = createComponent(container);
 
     Object.defineProperty(container, 'scrollHeight', { value: 1000 });
     Object.defineProperty(container, 'offsetHeight', { value: 100 });
@@ -79,9 +84,7 @@ describe('ShowStudyGuides', () => {
     jest.spyOn(selectors, 'summaryIsLoading').mockReturnValue(false);
     jest.spyOn(selectors, 'summaryStudyGuides').mockReturnValue({});
 
-    renderer.create(<TestContainer store={store}>
-      <ShowStudyGuides />
-    </TestContainer>, { createNodeMock: () => container});
+    createComponent(container);
 
     runHooks(renderer);
 
@@ -95,9 +98,7 @@ describe('ShowStudyGuides', () => {
     jest.spyOn(selectors, 'hasMoreResults')
       .mockReturnValue(false);
 
-    const component = renderer.create(<TestContainer store={store}>
-      <ShowStudyGuides />
-    </TestContainer>, { createNodeMock: () => container});
+    const component = createComponent(container);
 
     Object.defineProperty(container, 'scrollHeight', { value: 1000 });
     Object.defineProperty(container, 'offsetHeight', { value: 100 });
@@ -122,9 +123,7 @@ describe('ShowStudyGuides', () => {
     jest.spyOn(selectors, 'hasMoreResults')
       .mockReturnValue(true);
 
-    const component = renderer.create(<TestContainer store={store}>
-      <ShowStudyGuides />
-    </TestContainer>, { createNodeMock: () => container});
+    const component = createComponent(container);
 
     Object.defineProperty(container, 'scrollHeight', { value: 1000 });
     Object.defineProperty(container, 'offsetHeight', { value: 100 });
@@ -148,9 +147,7 @@ describe('ShowStudyGuides', () => {
   it('shows back to top button on scroll and works on click', async() => {
     const container = window.document.createElement('div');
 
-    const component = renderer.create(<TestContainer store={store}>
-      <ShowStudyGuides />
-    </TestContainer>, { createNodeMock: () => container });
+    const component = createComponent(container);
 
     Object.defineProperty(container, 'height', { value: 1000 });
     Object.defineProperty(container, 'scrollTop', { value: 10, writable: true });
@@ -175,7 +172,7 @@ describe('ShowStudyGuides', () => {
 
   it('does not scroll to top without ref', () => {
     const {root} = renderToDom(<TestContainer store={store}>
-      <ShowStudyGuides />
+      <ShowStudyGuides topElRef={{} as React.RefObject<HTMLElement>} />
     </TestContainer>);
 
     const target = root.querySelector('[data-testid="show-studyguides-body"]');
diff --git a/src/app/content/studyGuides/components/ShowStudyGuides.tsx b/src/app/content/studyGuides/components/ShowStudyGuides.tsx
index ec1743a11e..0f73859460 100644
--- a/src/app/content/studyGuides/components/ShowStudyGuides.tsx
+++ b/src/app/content/studyGuides/components/ShowStudyGuides.tsx
@@ -32,7 +32,7 @@ export const StudyGuidesBody = styled(PopupBody)`
 `;
 
 // tslint:disable-next-line: variable-name
-const ShowStudyGuides = () => {
+const ShowStudyGuides = ({topElRef}: {topElRef: React.RefObject<HTMLElement>}) => {
   const ref = React.useRef<HTMLElement>(null);
   const [showGoToTop, setShowGoToTop] = React.useState(false);
   const dispatch = useDispatch();
@@ -54,6 +54,7 @@ const ShowStudyGuides = () => {
     }
 
     refElement.scrollTop = 0;
+    topElRef.current?.focus();
     setShowGoToTop(false);
   };
 
diff --git a/src/app/content/studyGuides/components/StudyGuidesPopUp.tsx b/src/app/content/studyGuides/components/StudyGuidesPopUp.tsx
index 2c25c3ca61..c2a0e5aa83 100644
--- a/src/app/content/studyGuides/components/StudyGuidesPopUp.tsx
+++ b/src/app/content/studyGuides/components/StudyGuidesPopUp.tsx
@@ -51,9 +51,11 @@ const StudyguidesPopUp = () => {
       }}
     >
       <Header colorSchema={bookTheme}>
-        <FormattedMessage id='i18n:toolbar:studyguides:popup:heading'>
-          {(msg) => msg}
-        </FormattedMessage>
+        <h1>
+          <FormattedMessage id='i18n:toolbar:studyguides:popup:heading'>
+            {(msg) => msg}
+          </FormattedMessage>
+        </h1>
         <CloseIconWrapper
           data-testid='close-studyguides-popup'
           aria-label={intl.formatMessage({id: 'i18n:toolbar:studyguides:popup:close-button:aria-label'})}
@@ -63,7 +65,7 @@ const StudyguidesPopUp = () => {
           <CloseIcon colorSchema={bookTheme} />
         </CloseIconWrapper>
       </Header>
-      <ShowStudyGuides />
+      <ShowStudyGuides topElRef={popUpRef} />
     </Modal>
     : null;
 };
diff --git a/src/app/content/studyGuides/components/UsingThisGuide/UsingThisGuideButton.tsx b/src/app/content/studyGuides/components/UsingThisGuide/UsingThisGuideButton.tsx
index c2225119a3..8458e33a6c 100644
--- a/src/app/content/studyGuides/components/UsingThisGuide/UsingThisGuideButton.tsx
+++ b/src/app/content/studyGuides/components/UsingThisGuide/UsingThisGuideButton.tsx
@@ -19,7 +19,7 @@ const QuestionIcon = styled(QuestionCircle)`
 `;
 
 // tslint:disable-next-line:variable-name
-const UsingThisGuideButtonInnerStyles = styled.div`
+export const UsingThisGuideButtonWrapper = styled(PlainButton)`
   display: flex;
   align-items: center;
   justify-content: center;
@@ -28,29 +28,19 @@ const UsingThisGuideButtonInnerStyles = styled.div`
   color: ${theme.color.primary.gray.base};
   position: relative;
   padding: ${buttonPaddingTopDesktop}rem ${mobilePaddingSides}rem ${buttonPaddingBottomDesktop}rem;
-  outline: none;
-  ${({isOpen}) => isOpen && css`
-    color: ${theme.color.white};
-  `}
-  ${theme.breakpoints.mobile(css`
-    padding-right: 1.4rem;
-    padding-left: 1.4rem;
-  `)}
-  ${disablePrint}
-`;
-
-// tslint:disable-next-line:variable-name
-export const UsingThisGuideButtonWrapper = styled(PlainButton)`
-  position: relative;
   height: 100%;
   margin-right: 3.2rem;
   margin-top: ${buttonMarginTopDesktop}rem;
   ${({isOpen}) => isOpen && css`
     background: ${theme.color.black};
+    color: ${theme.color.white};
   `}
   ${theme.breakpoints.mobile(css`
     margin-right: 0.8rem;
+    padding-right: 1.4rem;
+    padding-left: 1.4rem;
   `)}
+  ${disablePrint}
 `;
 
 // tslint:disable-next-line:variable-name
@@ -73,15 +63,16 @@ const UsingThisGuideButton = (props: Props) => {
   const text = useIntl().formatMessage({id: 'i18n:studyguides:popup:using-this-guide'});
 
   return <UsingThisGuideButtonWrapper
+    type='button'
     aria-label={text}
+    aria-expanded={props.open}
+    aria-controls='using-this-guide-text'
     onClick={props.onClick}
     isOpen={props.open}
     data-analytics-disable-track={true}
   >
-    <UsingThisGuideButtonInnerStyles isOpen={props.open} tabIndex={-1}>
-      <QuestionIcon/>
-      <UsingThisGuideText>{text}</UsingThisGuideText>
-    </UsingThisGuideButtonInnerStyles>
+    <QuestionIcon/>
+    <UsingThisGuideText id='using-this-guide-text'>{text}</UsingThisGuideText>
   </UsingThisGuideButtonWrapper>;
 };
 
diff --git a/src/app/content/studyGuides/components/UsingThisGuide/__snapshots__/UsingThisGuide.spec.tsx.snap b/src/app/content/studyGuides/components/UsingThisGuide/__snapshots__/UsingThisGuide.spec.tsx.snap
index f6dba4ce88..b754c1bf3e 100644
--- a/src/app/content/studyGuides/components/UsingThisGuide/__snapshots__/UsingThisGuide.spec.tsx.snap
+++ b/src/app/content/studyGuides/components/UsingThisGuide/__snapshots__/UsingThisGuide.spec.tsx.snap
@@ -191,18 +191,23 @@ exports[`Using this guide renders using this guide banner correctly 1`] = `
 `;
 
 exports[`Using this guide renders using this guide button correctly (when banner closed) 1`] = `
-.c2 {
+.c1 {
   display: inline-block;
   vertical-align: -.125em;
   overflow: hidden;
 }
 
-.c3 {
+.c2 {
   height: 1.7rem;
   width: 1.7rem;
 }
 
-.c1 {
+.c0 {
+  cursor: pointer;
+  border: none;
+  margin: 0;
+  padding: 0;
+  background: none;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -220,22 +225,12 @@ exports[`Using this guide renders using this guide button correctly (when banner
   color: #5e6062;
   position: relative;
   padding: 1.2rem 1.6rem 1.8rem;
-  outline: none;
-}
-
-.c0 {
-  cursor: pointer;
-  border: none;
-  margin: 0;
-  padding: 0;
-  background: none;
-  position: relative;
   height: 100%;
   margin-right: 3.2rem;
   margin-top: 0.6rem;
 }
 
-.c4 {
+.c3 {
   font-size: 1.6rem;
   line-height: 2.5rem;
   font-weight: 600;
@@ -243,75 +238,74 @@ exports[`Using this guide renders using this guide button correctly (when banner
 }
 
 @media screen and (max-width:75em) {
-  .c1 {
+  .c0 {
+    margin-right: 0.8rem;
     padding-right: 1.4rem;
     padding-left: 1.4rem;
   }
 }
 
 @media print {
-  .c1 {
-    display: none;
-  }
-}
-
-@media screen and (max-width:75em) {
   .c0 {
-    margin-right: 0.8rem;
+    display: none;
   }
 }
 
 @media screen and (max-width:75em) {
-  .c4 {
+  .c3 {
     display: none;
   }
 }
 
 <button
+  aria-controls="using-this-guide-text"
+  aria-expanded={false}
   aria-label="Using This Guide"
   className="c0"
   data-analytics-disable-track={true}
   onClick={[MockFunction]}
+  type="button"
 >
-  <div
-    className="c1"
-    tabIndex={-1}
+  <svg
+    aria-hidden="true"
+    className="c1 c2"
+    fill="currentColor"
+    focusable="false"
+    viewBox="0 0 512 512"
+    xmlns="http://www.w3.org/2000/svg"
   >
-    <svg
-      aria-hidden="true"
-      className="c2 c3"
+    <path
+      d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
       fill="currentColor"
-      focusable="false"
-      viewBox="0 0 512 512"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
-        fill="currentColor"
-      />
-    </svg>
-    <span
-      className="c4"
-    >
-      Using This Guide
-    </span>
-  </div>
+    />
+  </svg>
+  <span
+    className="c3"
+    id="using-this-guide-text"
+  >
+    Using This Guide
+  </span>
 </button>
 `;
 
 exports[`Using this guide renders using this guide button correctly (when banner open) 1`] = `
-.c2 {
+.c1 {
   display: inline-block;
   vertical-align: -.125em;
   overflow: hidden;
 }
 
-.c3 {
+.c2 {
   height: 1.7rem;
   width: 1.7rem;
 }
 
-.c1 {
+.c0 {
+  cursor: pointer;
+  border: none;
+  margin: 0;
+  padding: 0;
+  background: none;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -329,24 +323,14 @@ exports[`Using this guide renders using this guide button correctly (when banner
   color: #5e6062;
   position: relative;
   padding: 1.2rem 1.6rem 1.8rem;
-  outline: none;
-  color: #fff;
-}
-
-.c0 {
-  cursor: pointer;
-  border: none;
-  margin: 0;
-  padding: 0;
-  background: none;
-  position: relative;
   height: 100%;
   margin-right: 3.2rem;
   margin-top: 0.6rem;
   background: #000;
+  color: #fff;
 }
 
-.c4 {
+.c3 {
   font-size: 1.6rem;
   line-height: 2.5rem;
   font-weight: 600;
@@ -354,58 +338,52 @@ exports[`Using this guide renders using this guide button correctly (when banner
 }
 
 @media screen and (max-width:75em) {
-  .c1 {
+  .c0 {
+    margin-right: 0.8rem;
     padding-right: 1.4rem;
     padding-left: 1.4rem;
   }
 }
 
 @media print {
-  .c1 {
-    display: none;
-  }
-}
-
-@media screen and (max-width:75em) {
   .c0 {
-    margin-right: 0.8rem;
+    display: none;
   }
 }
 
 @media screen and (max-width:75em) {
-  .c4 {
+  .c3 {
     display: none;
   }
 }
 
 <button
+  aria-controls="using-this-guide-text"
+  aria-expanded={true}
   aria-label="Using This Guide"
   className="c0"
   data-analytics-disable-track={true}
   onClick={[MockFunction]}
+  type="button"
 >
-  <div
-    className="c1"
-    tabIndex={-1}
+  <svg
+    aria-hidden="true"
+    className="c1 c2"
+    fill="currentColor"
+    focusable="false"
+    viewBox="0 0 512 512"
+    xmlns="http://www.w3.org/2000/svg"
   >
-    <svg
-      aria-hidden="true"
-      className="c2 c3"
+    <path
+      d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
       fill="currentColor"
-      focusable="false"
-      viewBox="0 0 512 512"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
-        fill="currentColor"
-      />
-    </svg>
-    <span
-      className="c4"
-    >
-      Using This Guide
-    </span>
-  </div>
+    />
+  </svg>
+  <span
+    className="c3"
+    id="using-this-guide-text"
+  >
+    Using This Guide
+  </span>
 </button>
 `;
diff --git a/src/app/content/studyGuides/components/__snapshots__/Filters.spec.tsx.snap b/src/app/content/studyGuides/components/__snapshots__/Filters.spec.tsx.snap
index 5d74f91572..74fd9b917c 100644
--- a/src/app/content/studyGuides/components/__snapshots__/Filters.spec.tsx.snap
+++ b/src/app/content/studyGuides/components/__snapshots__/Filters.spec.tsx.snap
@@ -180,7 +180,7 @@ input:checked + .c21 .c22 {
   color: #0064A0;
 }
 
-.c61 {
+.c60 {
   cursor: pointer;
   border: none;
   margin: 0;
@@ -190,13 +190,13 @@ input:checked + .c21 .c22 {
   margin-right: 0.4rem;
 }
 
-.c61 svg {
+.c60 svg {
   height: 0.8rem;
   width: 0.8rem;
   color: #5e6062;
 }
 
-.c62 {
+.c61 {
   color: #424242;
   font-weight: 300;
   color: #5e6062;
@@ -208,7 +208,7 @@ input:checked + .c21 .c22 {
   line-height: 1.5rem;
 }
 
-.c60 {
+.c59 {
   margin-right: 3.2rem;
   display: -webkit-box;
   display: -webkit-flex;
@@ -222,7 +222,7 @@ input:checked + .c21 .c22 {
   height: 4rem;
 }
 
-.c59 {
+.c58 {
   color: #424242;
   font-size: 1.4rem;
   display: -webkit-box;
@@ -633,7 +633,7 @@ input:checked + .c21 .c22 {
   margin: 0 1.6rem 0 1.6rem;
 }
 
-.c11 .c63:last-child {
+.c11 .c62:last-child {
   border-bottom: none;
 }
 
@@ -716,7 +716,7 @@ input:checked + .c21 .c22 {
   margin: 0px 0px 0px 0.5rem;
 }
 
-.c51 {
+.c50 {
   outline: none;
   position: relative;
   padding: 2rem 2.4rem;
@@ -725,12 +725,12 @@ input:checked + .c21 .c22 {
   margin-bottom: 1rem;
 }
 
-.c55 {
+.c54 {
   width: 100%;
   padding: 0 4.2rem;
 }
 
-.c53 {
+.c52 {
   color: #424242;
   font-size: 3.6rem;
   line-height: 4rem;
@@ -745,7 +745,7 @@ input:checked + .c21 .c22 {
   color: #fff;
 }
 
-.c56 {
+.c55 {
   cursor: pointer;
   border: none;
   margin: 0;
@@ -770,14 +770,14 @@ input:checked + .c21 .c22 {
   right: 2.4rem;
 }
 
-.c57 {
+.c56 {
   color: #000;
   height: 2.8rem;
   width: 2.8rem;
   padding: 0.4rem;
 }
 
-.c52 {
+.c51 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -788,7 +788,7 @@ input:checked + .c21 .c22 {
   align-items: center;
 }
 
-.c54 {
+.c53 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -799,12 +799,17 @@ input:checked + .c21 .c22 {
   justify-content: center;
 }
 
-.c49 {
+.c48 {
   height: 1.7rem;
   width: 1.7rem;
 }
 
-.c48 {
+.c47 {
+  cursor: pointer;
+  border: none;
+  margin: 0;
+  padding: 0;
+  background: none;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -822,24 +827,14 @@ input:checked + .c21 .c22 {
   color: #5e6062;
   position: relative;
   padding: 1.2rem 1.6rem 1.8rem;
-  outline: none;
-  color: #fff;
-}
-
-.c47 {
-  cursor: pointer;
-  border: none;
-  margin: 0;
-  padding: 0;
-  background: none;
-  position: relative;
   height: 100%;
   margin-right: 3.2rem;
   margin-top: 0.6rem;
   background: #000;
+  color: #fff;
 }
 
-.c50 {
+.c49 {
   font-size: 1.6rem;
   line-height: 2.5rem;
   font-weight: 600;
@@ -890,13 +885,13 @@ input:checked + .c21 .c22 {
 }
 
 @media print {
-  .c61 {
+  .c60 {
     display: none;
   }
 }
 
 @media print {
-  .c62 {
+  .c61 {
     max-width: -webkit-max-content;
     max-width: -moz-max-content;
     max-width: max-content;
@@ -904,13 +899,13 @@ input:checked + .c21 .c22 {
 }
 
 @media screen and (max-width:75em) {
-  .c59 {
+  .c58 {
     padding: 0 2.4rem 0.4rem 2.4rem;
   }
 }
 
 @media print {
-  .c59 {
+  .c58 {
     margin: 0;
   }
 }
@@ -945,7 +940,7 @@ input:checked + .c21 .c22 {
 }
 
 @media print {
-  .c0 > *:not(.c58) {
+  .c0 > *:not(.c57) {
     display: none;
   }
 }
@@ -1001,26 +996,26 @@ input:checked + .c21 .c22 {
 }
 
 @media screen and (max-width:30em) {
-  .c51 {
+  .c50 {
     padding: 1rem 1.6rem;
   }
 }
 
 @media print {
-  .c51 {
+  .c50 {
     display: none;
   }
 }
 
 @media screen and (max-width:50em) {
-  .c55 {
+  .c54 {
     max-width: 30rem;
     padding: 0;
   }
 }
 
 @media screen and (max-width:75em) {
-  .c53 {
+  .c52 {
     color: #424242;
     font-size: 1.6rem;
     line-height: 2rem;
@@ -1035,40 +1030,35 @@ input:checked + .c21 .c22 {
 }
 
 @media screen and (max-width:30em) {
-  .c56 {
+  .c55 {
     top: 1rem;
     right: 1.6rem;
   }
 }
 
 @media screen and (max-width:75em) {
-  .c57 {
+  .c56 {
     height: 1.6rem;
     width: 1.6rem;
   }
 }
 
 @media screen and (max-width:75em) {
-  .c48 {
+  .c47 {
+    margin-right: 0.8rem;
     padding-right: 1.4rem;
     padding-left: 1.4rem;
   }
 }
 
 @media print {
-  .c48 {
-    display: none;
-  }
-}
-
-@media screen and (max-width:75em) {
   .c47 {
-    margin-right: 0.8rem;
+    display: none;
   }
 }
 
 @media screen and (max-width:75em) {
-  .c50 {
+  .c49 {
     display: none;
   }
 }
@@ -1089,6 +1079,8 @@ input:checked + .c21 .c22 {
       className="c2 c3 c4"
     >
       <button
+        aria-controls="guide-filter-chapter"
+        aria-expanded={true}
         aria-label="Filter study guides by Chapter"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter study guides by Chapter"
@@ -1116,6 +1108,7 @@ input:checked + .c21 .c22 {
       </button>
       <div
         className="c11"
+        id="guide-filter-chapter"
         tabIndex={-1}
       >
         <div
@@ -1398,6 +1391,8 @@ input:checked + .c21 .c22 {
       className="c2 c3 c4"
     >
       <button
+        aria-controls="guide-filter-color"
+        aria-expanded={true}
         aria-label="Filter study guides by Color"
         className="c5 c6 c7 c8"
         data-analytics-label="Filter study guides by Color"
@@ -1425,6 +1420,7 @@ input:checked + .c21 .c22 {
       </button>
       <div
         className="c26"
+        id="guide-filter-color"
         tabIndex={-1}
       >
         <div
@@ -1773,51 +1769,50 @@ input:checked + .c21 .c22 {
         </span>
       </button>
       <button
+        aria-controls="using-this-guide-text"
+        aria-expanded={true}
         aria-label="Using This Guide"
         className="c47"
         data-analytics-disable-track={true}
         onClick={[Function]}
+        type="button"
       >
-        <div
-          className="c48"
-          tabIndex={-1}
+        <svg
+          aria-hidden="true"
+          className="c9 c48"
+          fill="currentColor"
+          focusable="false"
+          viewBox="0 0 512 512"
+          xmlns="http://www.w3.org/2000/svg"
         >
-          <svg
-            aria-hidden="true"
-            className="c9 c49"
+          <path
+            d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
             fill="currentColor"
-            focusable="false"
-            viewBox="0 0 512 512"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="c50"
-          >
-            Using This Guide
-          </span>
-        </div>
+          />
+        </svg>
+        <span
+          className="c49"
+          id="using-this-guide-text"
+        >
+          Using This Guide
+        </span>
       </button>
     </div>
   </div>
   <div
-    className="c51"
+    className="c50"
   >
     <div
-      className="c52"
+      className="c51"
     >
       <h2
-        className="c53"
+        className="c52"
       >
         Using This Guide
       </h2>
     </div>
     <div
-      className="c54"
+      className="c53"
     >
       <picture>
         <source
@@ -1826,7 +1821,7 @@ input:checked + .c21 .c22 {
         />
         <img
           alt="The image presents the structure of study guides. The first element of each block summarizes, clarifies, or enriches key content. The second element is taken directly from the book. On the left side, there is a color label depending on the content."
-          className="c55"
+          className="c54"
           src="banner.png"
           tabIndex={0}
         />
@@ -1834,14 +1829,14 @@ input:checked + .c21 .c22 {
     </div>
     <button
       aria-label="Closes the image describing the structure of study guides."
-      className="c56"
+      className="c55"
       data-analytics-disable-track={true}
       data-testid="close-utg"
       onClick={[Function]}
     >
       <svg
         aria-hidden="true"
-        className="c9 c57"
+        className="c9 c56"
         fill="currentColor"
         focusable="false"
         viewBox="0 0 352 512"
@@ -1857,14 +1852,14 @@ input:checked + .c21 .c22 {
   <ul
     aria-atomic="true"
     aria-live="polite"
-    className="c58 c59"
+    className="c57 c58"
   >
     <li
-      className="c60"
+      className="c59"
     >
       <button
         aria-label="Remove breadcrumb for chapter 2 Test Chapter 2"
-        className="c61"
+        className="c60"
         data-analytics-label="Remove breadcrumb for chapter 2 Test Chapter 2"
         onClick={[Function]}
       >
@@ -1896,7 +1891,7 @@ input:checked + .c21 .c22 {
         </svg>
       </button>
       <span
-        className="c62"
+        className="c61"
         dangerouslySetInnerHTML={
           Object {
             "__html": "<span class=\\"os-number\\">2</span><span class=\\"os-divider\\"> </span><span class=\\"os-text\\">Test Chapter 2</span>",
@@ -1905,11 +1900,11 @@ input:checked + .c21 .c22 {
       />
     </li>
     <li
-      className="c60"
+      className="c59"
     >
       <button
         aria-label="Remove breadcrumb for label Important Concepts"
-        className="c61"
+        className="c60"
         data-analytics-label="Remove breadcrumb for label Important Concepts"
         onClick={[Function]}
       >
@@ -1941,17 +1936,17 @@ input:checked + .c21 .c22 {
         </svg>
       </button>
       <span
-        className="c62"
+        className="c61"
       >
         Important Concepts
       </span>
     </li>
     <li
-      className="c60"
+      className="c59"
     >
       <button
         aria-label="Remove breadcrumb for label Connections & Relationships"
-        className="c61"
+        className="c60"
         data-analytics-label="Remove breadcrumb for label Connections & Relationships"
         onClick={[Function]}
       >
@@ -1983,17 +1978,17 @@ input:checked + .c21 .c22 {
         </svg>
       </button>
       <span
-        className="c62"
+        className="c61"
       >
         Connections & Relationships
       </span>
     </li>
     <li
-      className="c60"
+      className="c59"
     >
       <button
         aria-label="Remove breadcrumb for label Enrichment"
-        className="c61"
+        className="c60"
         data-analytics-label="Remove breadcrumb for label Enrichment"
         onClick={[Function]}
       >
@@ -2025,17 +2020,17 @@ input:checked + .c21 .c22 {
         </svg>
       </button>
       <span
-        className="c62"
+        className="c61"
       >
         Enrichment
       </span>
     </li>
     <li
-      className="c60"
+      className="c59"
     >
       <button
         aria-label="Remove breadcrumb for label Key Terms"
-        className="c61"
+        className="c60"
         data-analytics-label="Remove breadcrumb for label Key Terms"
         onClick={[Function]}
       >
@@ -2067,7 +2062,7 @@ input:checked + .c21 .c22 {
         </svg>
       </button>
       <span
-        className="c62"
+        className="c61"
       >
         Key Terms
       </span>
diff --git a/src/app/content/studyGuides/components/__snapshots__/StudyGuides.spec.tsx.snap b/src/app/content/studyGuides/components/__snapshots__/StudyGuides.spec.tsx.snap
index aba59aa508..437f1bef09 100644
--- a/src/app/content/studyGuides/components/__snapshots__/StudyGuides.spec.tsx.snap
+++ b/src/app/content/studyGuides/components/__snapshots__/StudyGuides.spec.tsx.snap
@@ -372,7 +372,7 @@ exports[`StudyGuides properly display summary highlights 1`] = `
     <div
       className="c2 c3"
     >
-      <div
+      <h2
         className="c4"
         dangerouslySetInnerHTML={
           Object {
@@ -385,7 +385,7 @@ exports[`StudyGuides properly display summary highlights 1`] = `
     <div
       className="c5 c6"
     >
-      <div
+      <h3
         className="c7 c8"
         dangerouslySetInnerHTML={
           Object {
@@ -516,7 +516,7 @@ exports[`StudyGuides properly display summary highlights 1`] = `
     <div
       className="c2 c3"
     >
-      <div
+      <h2
         className="c4"
         dangerouslySetInnerHTML={
           Object {
@@ -529,7 +529,7 @@ exports[`StudyGuides properly display summary highlights 1`] = `
     <div
       className="c5 c6"
     >
-      <div
+      <h3
         className="c7 c8"
         dangerouslySetInnerHTML={
           Object {
diff --git a/src/app/content/styles/PopupStyles.tsx b/src/app/content/styles/PopupStyles.tsx
index 4427fe7589..93b724c920 100644
--- a/src/app/content/styles/PopupStyles.tsx
+++ b/src/app/content/styles/PopupStyles.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled, { css } from 'styled-components/macro';
 import Times from '../../../../src/app/components/Times';
 import { PlainButton } from '../../components/Button';
-import { H3 } from '../../components/Typography/headings';
+import { h3Style } from '../../components/Typography/headings';
 import theme from '../../theme';
 import { contentWrapperMaxWidth } from '../components/constants';
 import { applyBookTextColor } from '../components/utils/applyBookTextColor';
@@ -42,7 +42,8 @@ export const PopupWrapper = styled.div`
 `;
 
 // tslint:disable-next-line:variable-name
-export const Header = styled(H3)`
+export const Header = styled.div`
+  ${h3Style}
   ${disablePrint}
   ${applyBookTextColor}
   background: ${({colorSchema}: {colorSchema: BookWithOSWebData['theme']}) => theme.color.primary[colorSchema].base};
@@ -56,6 +57,11 @@ export const Header = styled(H3)`
   ${theme.breakpoints.mobile(css`
     padding: ${mobilePaddingSides}rem;
   `)}
+
+  h1 {
+    font-size: inherit;
+    letter-spacing: inherit;
+  }
 `;
 
 // tslint:disable-next-line:variable-name
diff --git a/src/app/developer/components/__snapshots__/Home.spec.tsx.snap b/src/app/developer/components/__snapshots__/Home.spec.tsx.snap
index 2c81ba1cbf..4c095338a4 100644
--- a/src/app/developer/components/__snapshots__/Home.spec.tsx.snap
+++ b/src/app/developer/components/__snapshots__/Home.spec.tsx.snap
@@ -169,6 +169,26 @@ Array [
         />
       </a>
     </div>
+  </div>,
+  .c0 {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  -webkit-clip: rect(0,0,0,0);
+  clip: rect(0,0,0,0);
+  white-space: nowrap;
+  border: 0;
+}
+
+<div
+    aria-live="polite"
+    className="c0"
+    id="page-title-confirmation"
+  >
+    
   </div>,
   .c19 {
   display: inline-block;
diff --git a/src/app/errors/routes.ts b/src/app/errors/routes.ts
index aaf2763fa5..2141308606 100644
--- a/src/app/errors/routes.ts
+++ b/src/app/errors/routes.ts
@@ -7,7 +7,7 @@ type Params = {
   url: string;
 };
 
-const loadableOptions = {
+const loadableArgs = {
   loader: () => import(/* webpackChunkName: "LoaderCentered" */ './components/LoaderCentered'),
   loading: () => null,
   modules: ['LoaderCentered'],
@@ -15,7 +15,7 @@ const loadableOptions = {
 };
 
 export const notFound: Route<Params> = {
-  component: Loadable(loadableOptions),
+  component: Loadable(loadableArgs),
   getSearch: (params: Params): string => `path=${params.url}`,
   getUrl: (_params: Params) => '/error/404',
   name: 'NotFound',
@@ -23,7 +23,7 @@ export const notFound: Route<Params> = {
 };
 
 export const external: Route<Params> = {
-  component: Loadable(loadableOptions),
+  component: Loadable(loadableArgs),
   getUrl: (params: Params) => params.url,
   name: 'External',
   paths: [':url(/.*)'],
diff --git a/src/app/messages/en/messages.json b/src/app/messages/en/messages.json
index e7ecc11074..cc9e8ee538 100644
--- a/src/app/messages/en/messages.json
+++ b/src/app/messages/en/messages.json
@@ -66,8 +66,10 @@
   "i18n:highlighter:edit-note:label": "Edit highlighted note",
   "i18n:highlighter:highlight:end": "End of {style} highlight",
   "i18n:highlighter:highlight:start": "Start {style} highlight",
+  "i18n:highlighter:highlight:start-selected": "Start selected {style} highlight",
   "i18n:highlighter:highlight:end:search": "End of search result",
   "i18n:highlighter:highlight:start:search": "Start search result",
+  "i18n:highlighter:highlight:start-selected:search": "Start selected search result",
   "i18n:highlighting:button:cancel": "Cancel",
   "i18n:highlighting:button:delete": "Delete",
   "i18n:highlighting:button:save": "Save",
@@ -125,6 +127,7 @@
   "i18n:notification:toast:highlights:update-failure:color": "The highlight color could not be changed. Please check your connection and try again.",
   "i18n:notification:toast:highlights:update-failure:annotation": "The note could not be saved. Please check your connection and try again.",
   "i18n:notification:toast:highlights:load-failure": "We're unable to load Highlights on this page. Please check your connection and try again.",
+  "i18n:notification:toast:highlights:select-overlap": "Overlapping highlights are not supported.",
   "i18n:notification:toast:highlights:popup:load-failure": "Some highlights could not be loaded. Please check your connection and try again.",
   "i18n:notification:toast:highlights:popup:print-failure": "We're unable to print this page. Please check your connection and try again.",
   "i18n:notification:toast:study-guides:load-failure": "We're unable to load Study Guides on this page. Please check your connection and try again.",
diff --git a/src/app/messages/es/messages.json b/src/app/messages/es/messages.json
index cfc3101047..cd5b649ee9 100644
--- a/src/app/messages/es/messages.json
+++ b/src/app/messages/es/messages.json
@@ -63,8 +63,10 @@
   "i18n:highlighter:edit-note:label": "Editar nota resaltada",
   "i18n:highlighter:highlight:end": "Final de texto resaltado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}",
   "i18n:highlighter:highlight:start": "Comienzo de texto resaltado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}",
+  "i18n:highlighter:highlight:start-selected": "Comienzo de texto resaltado seleccionado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}",
   "i18n:highlighter:highlight:end:search": "Final de resultado de búsqueda",
   "i18n:highlighter:highlight:start:search": "Comienzo de resultado de búsqueda",
+  "i18n:highlighter:highlight:start-selected:search": "Comienzo de resultado de búsqueda seleccionado",
   "i18n:highlighting:button:cancel": "Cancelar",
   "i18n:highlighting:button:delete": "Eliminar",
   "i18n:highlighting:button:save": "Guardar",
@@ -125,6 +127,7 @@
   "i18n:notification:toast:highlights:popup:load-failure": "No se pudo cargar algunos textos resaltados. Por favor, compruebe su conexión y vuelva a intentarlo.",
   "i18n:notification:toast:highlights:popup:print-failure": "No podemos imprimir esta página. Por favor, compruebe su conexión y vuelva a intentarlo.",
   "i18n:notification:toast:study-guides:load-failure": "No podemos cargar las guías de estudio en esta página. Por favor, compruebe su conexión y vuelva a intentarlo.",
+  "i18n:notification:toast:highlights:select-overlap": "No se admiten resaltados superpuestos.",
   "i18n:notification:toast:study-guides:popup:load-failure": "No podemos cargar el contenido de esta página. Por favor, compruebe su conexión y vuelva a intentarlo",
   "i18n:notification:toast:study-guides:popup:print-failure": "No podemos imprimir esta página. Por favor, compruebe su conexión y vuelva a intentarlo.",
   "i18n:nudge:study-tools:heading": "Las herramientas de estudio que necesita. <strong>¡100 % GRATIS!</strong>",
diff --git a/src/app/messages/pl/messages.json b/src/app/messages/pl/messages.json
index 2dc00e9043..817128b2c3 100644
--- a/src/app/messages/pl/messages.json
+++ b/src/app/messages/pl/messages.json
@@ -63,8 +63,10 @@
   "i18n:highlighter:edit-note:label": "edytuj notatkę",
   "i18n:highlighter:highlight:end": "Koniec {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} zakreślenia",
   "i18n:highlighter:highlight:start": "Początek {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} zakreślenia",
+  "i18n:highlighter:highlight:start-selected": "Początek {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} wybranego",
   "i18n:highlighter:highlight:end:search": "Koniec zakreślenia wyniku wyszukiwania",
   "i18n:highlighter:highlight:start:search": "Początek zakreślenia wyniku wyszukiwania",
+  "i18n:highlighter:highlight:start-selected:search": "Początek wybranego wyniku wyszukiwania",
   "i18n:highlighting:button:cancel": "Anuluj",
   "i18n:highlighting:button:delete": "Usuń",
   "i18n:highlighting:button:save": "Zachowaj",
@@ -125,6 +127,7 @@
   "i18n:notification:toast:highlights:popup:load-failure": "Niektóre zakreślenia na tej stronie nie mogą zostać załadowane. Sprawdź połączenie z internetem i spróbuj ponownie.",
   "i18n:notification:toast:highlights:popup:print-failure": "Nie możemy wydrukować tej strony. Sprawdź połączenie z internetem i spróbuj ponownie.",
   "i18n:notification:toast:study-guides:load-failure": "Nie możemy załadować zawartości Kompendium na tej stronie. Sprawdź połączenie z internetem i spróbuj ponownie.",
+  "i18n:notification:toast:highlights:select-overlap": "Nakładające się zaznaczenia nie są obsługiwane.",
   "i18n:notification:toast:study-guides:popup:load-failure": "Nie możemy załadować zawartości strony. Sprawdź połączenie z internetem i spróbuj ponownie.",
   "i18n:notification:toast:study-guides:popup:print-failure": "Nie możemy wydrukować tej strony. Sprawdź połączenie z internetem i spróbuj ponownie.",
   "i18n:nudge:study-tools:heading": "Narzędzia, których potrzebujesz. <strong>100% ZA DARMO!</strong>",
diff --git a/src/app/notifications/components/ToastNotifications/constants.ts b/src/app/notifications/components/ToastNotifications/constants.ts
index 31332a35fa..9f71df4558 100644
--- a/src/app/notifications/components/ToastNotifications/constants.ts
+++ b/src/app/notifications/components/ToastNotifications/constants.ts
@@ -9,7 +9,7 @@ export const toastMessageKeys = {
       load: 'i18n:notification:toast:archive:load-failure',
     },
   },
-  higlights: {
+  highlights: {
     failure: {
       create: 'i18n:notification:toast:highlights:create-failure',
       delete: 'i18n:notification:toast:highlights:delete-failure',
diff --git a/src/app/notifications/components/ToastNotifications/index.spec.tsx b/src/app/notifications/components/ToastNotifications/index.spec.tsx
index d874b637a2..90269819eb 100644
--- a/src/app/notifications/components/ToastNotifications/index.spec.tsx
+++ b/src/app/notifications/components/ToastNotifications/index.spec.tsx
@@ -50,8 +50,8 @@ describe('ToastNotifications', () => {
       .mockReturnValueOnce(1)
       .mockReturnValueOnce(2);
 
-    store.dispatch(addToast(toastMessageKeys.higlights.failure.create, {destination}));
-    store.dispatch(addToast(toastMessageKeys.higlights.failure.delete, {destination}));
+    store.dispatch(addToast(toastMessageKeys.highlights.failure.create, {destination}));
+    store.dispatch(addToast(toastMessageKeys.highlights.failure.delete, {destination}));
 
     const component = renderer.create(<TestContainer store={store}>
       <ToastNotifications />
diff --git a/src/app/theme.ts b/src/app/theme.ts
index c43ac98245..141ca5ffe8 100644
--- a/src/app/theme.ts
+++ b/src/app/theme.ts
@@ -9,6 +9,18 @@ export interface ColorSet {
   darkest?: string;
 }
 
+export const hiddenButAccessible = `
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  white-space: nowrap;
+  border: 0;
+`;
+
 const textColors = {
   black: '#000',
   default: '#424242',
diff --git a/src/config.archive-url.json b/src/config.archive-url.json
index c578f7568e..eb5e4d3cdc 100644
--- a/src/config.archive-url.json
+++ b/src/config.archive-url.json
@@ -1,4 +1,4 @@
 {
-  "REACT_APP_ARCHIVE": "20240226.174525",
+  "REACT_APP_ARCHIVE": "20240603.181933",
   "REACT_APP_ARCHIVE_URL_BASE": "/apps/archive/"
 }
diff --git a/src/config.books.json b/src/config.books.json
index 1f8ec32d91..f4a4e27407 100644
--- a/src/config.books.json
+++ b/src/config.books.json
@@ -327,9 +327,18 @@
     "defaultVersion": "aaf07d5"
   },
   "7db4d55f-5c0e-4c05-8b72-841685444165": {
-    "defaultVersion": "a770108"
+    "defaultVersion": "ba2f95c"
   },
   "9331ec14-7ea7-4415-a8dd-ee34f0c5f9c4": {
-    "defaultVersion": "a770108"
+    "defaultVersion": "ba2f95c"
+  },
+  "2f805b43-bce4-4379-add2-4fbf46700e4c": {
+    "defaultVersion": "ba2f95c"
+  },
+  "652f4496-b33e-4b0f-8c8c-a712da36c7a3": {
+    "defaultVersion": "7982d3f"
+  },
+  "63229ab9-f9ed-4be4-9d2b-ad5035a02f72": {
+    "defaultVersion": "71e73c5"
   }
 }
diff --git a/src/index.browserspec.ts b/src/index.browserspec.ts
index 66a1694b54..af2db7dd6e 100644
--- a/src/index.browserspec.ts
+++ b/src/index.browserspec.ts
@@ -46,5 +46,10 @@ describe('Browser sanity tests', () => {
 });
 
 it('a11y lighthouse check', async() => {
-  await checkLighthouse(browser, TEST_PAGE_URL);
+  await checkLighthouse(browser, TEST_PAGE_URL, {
+    accessibility: 1,
+    'best-practices': 0.79,
+    customAccessibility: 1,
+    seo: 0.69,
+  });
 });
diff --git a/src/index.prerenderspec.ts b/src/index.prerenderspec.ts
index d09ca58f05..0b9564af69 100644
--- a/src/index.prerenderspec.ts
+++ b/src/index.prerenderspec.ts
@@ -3,7 +3,6 @@ import fetch from 'node-fetch';
 import { url } from './test/browserutils';
 
 describe('Prerender sanity tests', () => {
-
   it('has a release manifest', async() => {
     const release = await fetch(url('rex/release.json'))
       .then((response) => response.text());
diff --git a/src/lighthouse.prerenderspec.ts b/src/lighthouse.prerenderspec.ts
new file mode 100644
index 0000000000..7d849398c2
--- /dev/null
+++ b/src/lighthouse.prerenderspec.ts
@@ -0,0 +1,23 @@
+/** @jest-environment puppeteer */
+import asyncPool from 'tiny-async-pool';
+import { checkLighthouse } from './test/browserutils';
+
+const TEST_PAGE_WITHOUT_MATH = '/books/book-slug-1/pages/2-test-page-3';
+const TEST_PAGE_WITH_LINKS_NAME = '1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units';
+const TEST_PAGE_WITH_LINKS = '/books/book-slug-1/pages/' + TEST_PAGE_WITH_LINKS_NAME;
+const TEST_PAGE_WITH_FIGURE = '/books/book-slug-1/pages/test-page-for-generic-styles';
+const LIGHTHOUSE_PAGES = [ TEST_PAGE_WITHOUT_MATH, TEST_PAGE_WITH_LINKS, TEST_PAGE_WITH_FIGURE ];
+const LIGHTHOUSE_TARGETS = {
+  accessibility: 0.97,
+  'best-practices': 0.88,
+  customAccessibility: 1,
+  seo: 0.9,
+};
+
+describe('lighthouse', () => {
+  it('matches or exceeds target scores', async() => {
+    await asyncPool(1, LIGHTHOUSE_PAGES, async(pageUrl) => {
+      await checkLighthouse(browser, pageUrl, LIGHTHOUSE_TARGETS);
+    });
+  });
+});
diff --git a/src/test/browserutils.ts b/src/test/browserutils.ts
index 3aada85864..efb48f4a45 100644
--- a/src/test/browserutils.ts
+++ b/src/test/browserutils.ts
@@ -1,6 +1,9 @@
-import lighthouse from 'lighthouse';
 import puppeteer from 'puppeteer';
-import * as lighthouseConfig from './audits';
+import url from './url';
+import { checkLighthouse, ScoreTargets } from './lighthouse';
+
+export { checkLighthouse, url };
+export type { ScoreTargets };
 
 // jest-puppeteer will expose the `page` and `browser` globals to Jest tests.
 declare global {
@@ -42,8 +45,6 @@ export const setTallerDesktopViewport = (target: puppeteer.Page) =>
 export const setDesktopViewport = (target: puppeteer.Page) => target.setViewport({height: 874, width: desktopWidth});
 export const setMobileViewport = (target: puppeteer.Page) => target.setViewport({height: 731, width: 411});
 
-export const url = (path: string) => `http://localhost:${puppeteerConfig.server.port}/${path.replace(/^\/+/, '')}`;
-
 const calmHooks = (target: puppeteer.Page) => target.evaluate(() => {
   if (window && window.__APP_ASYNC_HOOKS) {
     return window.__APP_ASYNC_HOOKS.calm();
@@ -114,14 +115,3 @@ export const h1Content = (target: puppeteer.Page) => target.evaluate(() => {
   const h1 = document && document.querySelector('h1');
   return h1 && h1.textContent;
 });
-
-export const checkLighthouse = async(target: puppeteer.Browser, urlPath: string) => {
-
-  const port = Number((new URL(target.wsEndpoint())).port);
-  const { lhr } = await lighthouse(url(urlPath), {port}, lighthouseConfig);
-
-  expect(lhr.categories.customAccessibility.score).toBeGreaterThanOrEqual(1);
-  expect(lhr.categories.accessibility.score).toBeGreaterThanOrEqual(1);
-  expect(lhr.categories.seo.score).toBeGreaterThanOrEqual(0.69);
-  expect(lhr.categories['best-practices'].score).toBeGreaterThanOrEqual(0.79);
-};
diff --git a/src/test/lighthouse.ts b/src/test/lighthouse.ts
new file mode 100644
index 0000000000..1e26b7c76b
--- /dev/null
+++ b/src/test/lighthouse.ts
@@ -0,0 +1,32 @@
+import lighthouse from 'lighthouse';
+import { Browser } from 'puppeteer';
+import * as lighthouseConfig from './audits';
+import url from './url';
+
+type Categories = Awaited<ReturnType<typeof lighthouse>>['lhr']['categories'];
+export type ScoreTargets = { [key in keyof Categories]?: number };
+
+const testedCategories: Array<keyof Categories> = [
+  'accessibility', 'best-practices', 'customAccessibility', 'pwa', 'seo',
+];
+
+export const checkLighthouse = async(target: Browser, urlPath: string, scoreTargets?: ScoreTargets) => {
+  const absoluteUrl = urlPath.startsWith('https://') || urlPath.startsWith('http://') ? urlPath : url(urlPath);
+  const port = Number((new URL(target.wsEndpoint())).port);
+  const { lhr } = await lighthouse(absoluteUrl, {port}, lighthouseConfig);
+
+  const result: ScoreTargets = {};
+  testedCategories.forEach((category) => {
+    const { score } = lhr.categories[category];
+    if (scoreTargets) {
+      const minScore = scoreTargets[category];
+
+      if (minScore && score < minScore) {
+        throw new Error(`${category} score of ${score} was less than the minimum of ${minScore}`);
+      }
+    }
+    result[category] = score;
+  });
+
+  return result;
+};
diff --git a/src/test/url.ts b/src/test/url.ts
new file mode 100644
index 0000000000..efc1c45984
--- /dev/null
+++ b/src/test/url.ts
@@ -0,0 +1,5 @@
+import { PORT } from '../config';
+
+const url = (path: string) => `http://localhost:${PORT}/${path.replace(/^\/+/, '')}`;
+
+export default url;