diff --git a/src/app/content/__snapshots__/routes.spec.tsx.snap b/src/app/content/__snapshots__/routes.spec.tsx.snap
index 83ad5f7e71..45860a1cbd 100644
--- a/src/app/content/__snapshots__/routes.spec.tsx.snap
+++ b/src/app/content/__snapshots__/routes.spec.tsx.snap
@@ -581,83 +581,83 @@ Array [
 }
 
 @media screen {
-  .c4 .highlight.yellow.focus {
+  .c4 .highlight.yellow[aria-current] {
     background-color: #fed200;
     border-bottom: 0.2rem solid #8f7700;
     padding: 0.2rem 0 0;
   }
 
-  .c4 .highlight.yellow.focus.block:after {
+  .c4 .highlight.yellow[aria-current].block:after {
     background-color: #fed200;
   }
 
-  .c4 .highlight.yellow.focus.first.text.has-note:after {
+  .c4 .highlight.yellow[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c4 .highlight.green.focus {
+  .c4 .highlight.green[aria-current] {
     background-color: #92d101;
     border-bottom: 0.2rem solid #4e6f01;
     padding: 0.2rem 0 0;
   }
 
-  .c4 .highlight.green.focus.block:after {
+  .c4 .highlight.green[aria-current].block:after {
     background-color: #92d101;
   }
 
-  .c4 .highlight.green.focus.first.text.has-note:after {
+  .c4 .highlight.green[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c4 .highlight.blue.focus {
+  .c4 .highlight.blue[aria-current] {
     background-color: #00c3ed;
     border-bottom: 0.2rem solid #006880;
     padding: 0.2rem 0 0;
   }
 
-  .c4 .highlight.blue.focus.block:after {
+  .c4 .highlight.blue[aria-current].block:after {
     background-color: #00c3ed;
   }
 
-  .c4 .highlight.blue.focus.first.text.has-note:after {
+  .c4 .highlight.blue[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c4 .highlight.purple.focus {
+  .c4 .highlight.purple[aria-current] {
     background-color: #545ec8;
     border-bottom: 0.2rem solid #141a3e;
     padding: 0.2rem 0 0;
     color: #fff;
   }
 
-  .c4 .highlight.purple.focus.block:after {
+  .c4 .highlight.purple[aria-current].block:after {
     background-color: #545ec8;
   }
 
-  .c4 .highlight.purple.focus.first.text.has-note:after {
+  .c4 .highlight.purple[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c4 .highlight.pink.focus {
+  .c4 .highlight.pink[aria-current] {
     background-color: #de017e;
     border-bottom: 0.2rem solid #560131;
     padding: 0.2rem 0 0;
     color: #fff;
   }
 
-  .c4 .highlight.pink.focus.block:after {
+  .c4 .highlight.pink[aria-current].block:after {
     background-color: #de017e;
   }
 
-  .c4 .highlight.pink.focus.first.text.has-note:after {
+  .c4 .highlight.pink[aria-current].first.text.has-note:after {
     display: none;
   }
 }
@@ -672,13 +672,13 @@ Array [
     background-color: #ffea00;
   }
 
-  .c4 .search-highlight.focus,
-  .c4 .search-highlight.focus .math {
+  .c4 .search-highlight[aria-current],
+  .c4 .search-highlight[aria-current] .math {
     background-color: #ff9e4b;
     padding: 0.2rem 0;
   }
 
-  .c4 .search-highlight.focus .search-highlight {
+  .c4 .search-highlight[aria-current] .search-highlight {
     background-color: unset;
   }
 }
diff --git a/src/app/content/components/Page/PageContent.tsx b/src/app/content/components/Page/PageContent.tsx
index a50a0198e5..b780df1100 100644
--- a/src/app/content/components/Page/PageContent.tsx
+++ b/src/app/content/components/Page/PageContent.tsx
@@ -109,7 +109,7 @@ export default styled(MainContent)`
       }
 
       @media screen {
-        &.focus {
+        &[aria-current] {
           background-color: ${style.focused};
           border-bottom: 0.2rem solid ${style.focusBorder};
           padding: 0.2rem 0 0;
@@ -138,7 +138,7 @@ export default styled(MainContent)`
         background-color: #ffea00;
       }
 
-      &.focus {
+      &[aria-current] {
         ${SELF_AND_CHILD_MATH_SELECTOR} {
           background-color: #ff9e4b;
           padding: 0.2rem 0;
diff --git a/src/app/content/components/__snapshots__/Content.spec.tsx.snap b/src/app/content/components/__snapshots__/Content.spec.tsx.snap
index b82c8ae6e6..bf6979a903 100644
--- a/src/app/content/components/__snapshots__/Content.spec.tsx.snap
+++ b/src/app/content/components/__snapshots__/Content.spec.tsx.snap
@@ -2215,83 +2215,83 @@ li[aria-label="Current Page"] .c60 {
 }
 
 @media screen {
-  .c78 .highlight.yellow.focus {
+  .c78 .highlight.yellow[aria-current] {
     background-color: #fed200;
     border-bottom: 0.2rem solid #8f7700;
     padding: 0.2rem 0 0;
   }
 
-  .c78 .highlight.yellow.focus.block:after {
+  .c78 .highlight.yellow[aria-current].block:after {
     background-color: #fed200;
   }
 
-  .c78 .highlight.yellow.focus.first.text.has-note:after {
+  .c78 .highlight.yellow[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.green.focus {
+  .c78 .highlight.green[aria-current] {
     background-color: #92d101;
     border-bottom: 0.2rem solid #4e6f01;
     padding: 0.2rem 0 0;
   }
 
-  .c78 .highlight.green.focus.block:after {
+  .c78 .highlight.green[aria-current].block:after {
     background-color: #92d101;
   }
 
-  .c78 .highlight.green.focus.first.text.has-note:after {
+  .c78 .highlight.green[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.blue.focus {
+  .c78 .highlight.blue[aria-current] {
     background-color: #00c3ed;
     border-bottom: 0.2rem solid #006880;
     padding: 0.2rem 0 0;
   }
 
-  .c78 .highlight.blue.focus.block:after {
+  .c78 .highlight.blue[aria-current].block:after {
     background-color: #00c3ed;
   }
 
-  .c78 .highlight.blue.focus.first.text.has-note:after {
+  .c78 .highlight.blue[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.purple.focus {
+  .c78 .highlight.purple[aria-current] {
     background-color: #545ec8;
     border-bottom: 0.2rem solid #141a3e;
     padding: 0.2rem 0 0;
     color: #fff;
   }
 
-  .c78 .highlight.purple.focus.block:after {
+  .c78 .highlight.purple[aria-current].block:after {
     background-color: #545ec8;
   }
 
-  .c78 .highlight.purple.focus.first.text.has-note:after {
+  .c78 .highlight.purple[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.pink.focus {
+  .c78 .highlight.pink[aria-current] {
     background-color: #de017e;
     border-bottom: 0.2rem solid #560131;
     padding: 0.2rem 0 0;
     color: #fff;
   }
 
-  .c78 .highlight.pink.focus.block:after {
+  .c78 .highlight.pink[aria-current].block:after {
     background-color: #de017e;
   }
 
-  .c78 .highlight.pink.focus.first.text.has-note:after {
+  .c78 .highlight.pink[aria-current].first.text.has-note:after {
     display: none;
   }
 }
@@ -2306,13 +2306,13 @@ li[aria-label="Current Page"] .c60 {
     background-color: #ffea00;
   }
 
-  .c78 .search-highlight.focus,
-  .c78 .search-highlight.focus .math {
+  .c78 .search-highlight[aria-current],
+  .c78 .search-highlight[aria-current] .math {
     background-color: #ff9e4b;
     padding: 0.2rem 0;
   }
 
-  .c78 .search-highlight.focus .search-highlight {
+  .c78 .search-highlight[aria-current] .search-highlight {
     background-color: unset;
   }
 }
@@ -6765,83 +6765,83 @@ li[aria-label="Current Page"] .c60 {
 }
 
 @media screen {
-  .c78 .highlight.yellow.focus {
+  .c78 .highlight.yellow[aria-current] {
     background-color: #fed200;
     border-bottom: 0.2rem solid #8f7700;
     padding: 0.2rem 0 0;
   }
 
-  .c78 .highlight.yellow.focus.block:after {
+  .c78 .highlight.yellow[aria-current].block:after {
     background-color: #fed200;
   }
 
-  .c78 .highlight.yellow.focus.first.text.has-note:after {
+  .c78 .highlight.yellow[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.green.focus {
+  .c78 .highlight.green[aria-current] {
     background-color: #92d101;
     border-bottom: 0.2rem solid #4e6f01;
     padding: 0.2rem 0 0;
   }
 
-  .c78 .highlight.green.focus.block:after {
+  .c78 .highlight.green[aria-current].block:after {
     background-color: #92d101;
   }
 
-  .c78 .highlight.green.focus.first.text.has-note:after {
+  .c78 .highlight.green[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.blue.focus {
+  .c78 .highlight.blue[aria-current] {
     background-color: #00c3ed;
     border-bottom: 0.2rem solid #006880;
     padding: 0.2rem 0 0;
   }
 
-  .c78 .highlight.blue.focus.block:after {
+  .c78 .highlight.blue[aria-current].block:after {
     background-color: #00c3ed;
   }
 
-  .c78 .highlight.blue.focus.first.text.has-note:after {
+  .c78 .highlight.blue[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.purple.focus {
+  .c78 .highlight.purple[aria-current] {
     background-color: #545ec8;
     border-bottom: 0.2rem solid #141a3e;
     padding: 0.2rem 0 0;
     color: #fff;
   }
 
-  .c78 .highlight.purple.focus.block:after {
+  .c78 .highlight.purple[aria-current].block:after {
     background-color: #545ec8;
   }
 
-  .c78 .highlight.purple.focus.first.text.has-note:after {
+  .c78 .highlight.purple[aria-current].first.text.has-note:after {
     display: none;
   }
 }
 
 @media screen {
-  .c78 .highlight.pink.focus {
+  .c78 .highlight.pink[aria-current] {
     background-color: #de017e;
     border-bottom: 0.2rem solid #560131;
     padding: 0.2rem 0 0;
     color: #fff;
   }
 
-  .c78 .highlight.pink.focus.block:after {
+  .c78 .highlight.pink[aria-current].block:after {
     background-color: #de017e;
   }
 
-  .c78 .highlight.pink.focus.first.text.has-note:after {
+  .c78 .highlight.pink[aria-current].first.text.has-note:after {
     display: none;
   }
 }
@@ -6856,13 +6856,13 @@ li[aria-label="Current Page"] .c60 {
     background-color: #ffea00;
   }
 
-  .c78 .search-highlight.focus,
-  .c78 .search-highlight.focus .math {
+  .c78 .search-highlight[aria-current],
+  .c78 .search-highlight[aria-current] .math {
     background-color: #ff9e4b;
     padding: 0.2rem 0;
   }
 
-  .c78 .search-highlight.focus .search-highlight {
+  .c78 .search-highlight[aria-current] .search-highlight {
     background-color: unset;
   }
 }
diff --git a/src/app/messages/en/messages.json b/src/app/messages/en/messages.json
index b213f4b6b3..7149a8cc2f 100644
--- a/src/app/messages/en/messages.json
+++ b/src/app/messages/en/messages.json
@@ -63,8 +63,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",
diff --git a/src/app/messages/es/messages.json b/src/app/messages/es/messages.json
index f46d9ec3c7..2b5eef6f8b 100644
--- a/src/app/messages/es/messages.json
+++ b/src/app/messages/es/messages.json
@@ -61,8 +61,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",
diff --git a/src/app/messages/pl/messages.json b/src/app/messages/pl/messages.json
index 792e81b6e7..8db12f6db7 100644
--- a/src/app/messages/pl/messages.json
+++ b/src/app/messages/pl/messages.json
@@ -61,8 +61,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",
diff --git a/yarn.lock b/yarn.lock
index ae553ca8aa..599ac996d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5085,7 +5085,7 @@
 
 "@openstax/highlighter@https://github.com/openstax/highlighter#use-mark-dist-branch":
   version "1.14.0"
-  resolved "https://github.com/openstax/highlighter#ad7bf27d2f53aa9ad4e8168a7866e1ace2a909b7"
+  resolved "https://github.com/openstax/highlighter#7c69b4ff90c4919046166bacc38341d4f0dfae7f"
   dependencies:
     "@openstax/highlights-client" "0.2.3"
     change-case "^4.0.0"