diff --git a/themes/contrib/olivero/js/comments.es6.js b/themes/contrib/olivero/js/comments.es6.js
index 46ce7f4..089fadc 100644
--- a/themes/contrib/olivero/js/comments.es6.js
+++ b/themes/contrib/olivero/js/comments.es6.js
@@ -17,7 +17,7 @@
 
   indentedComments.forEach(commentGroup => {
     const showHideWrapper = document.createElement('div');
-    showHideWrapper.setAttribute('class', 'show-hide-wrapper');
+    showHideWrapper.setAttribute('class', 'js-show-hide-wrapper');
 
     const toggleCommentsBtn = document.createElement('button');
     toggleCommentsBtn.setAttribute('type', 'button');
diff --git a/themes/contrib/olivero/js/comments.js b/themes/contrib/olivero/js/comments.js
index 5ceb483..2a5381a 100644
--- a/themes/contrib/olivero/js/comments.js
+++ b/themes/contrib/olivero/js/comments.js
@@ -16,7 +16,7 @@
 
   indentedComments.forEach(function (commentGroup) {
     var showHideWrapper = document.createElement('div');
-    showHideWrapper.setAttribute('class', 'show-hide-wrapper');
+    showHideWrapper.setAttribute('class', 'js-show-hide-wrapper');
 
     var toggleCommentsBtn = document.createElement('button');
     toggleCommentsBtn.setAttribute('type', 'button');
diff --git a/themes/contrib/olivero/js/navigation.es6.js b/themes/contrib/olivero/js/navigation.es6.js
index 7aa92e5..cedcec7 100644
--- a/themes/contrib/olivero/js/navigation.es6.js
+++ b/themes/contrib/olivero/js/navigation.es6.js
@@ -10,7 +10,7 @@
   const mobileNavWrapperId = 'header-nav';
   const mobileNavWrapper = document.getElementById(mobileNavWrapperId);
   const body = document.querySelector('body');
-  const overlay = document.querySelector('.overlay');
+  const overlay = document.querySelector('.js-overlay');
 
   const focusableNavElements = mobileNavWrapper.querySelectorAll(
     'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])',
diff --git a/themes/contrib/olivero/js/navigation.js b/themes/contrib/olivero/js/navigation.js
index 26d3b6a..87abaee 100644
--- a/themes/contrib/olivero/js/navigation.js
+++ b/themes/contrib/olivero/js/navigation.js
@@ -13,7 +13,7 @@
   var mobileNavWrapperId = 'header-nav';
   var mobileNavWrapper = document.getElementById(mobileNavWrapperId);
   var body = document.querySelector('body');
-  var overlay = document.querySelector('.overlay');
+  var overlay = document.querySelector('.js-overlay');
 
   var focusableNavElements = mobileNavWrapper.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
   var firstFocusableEl = focusableNavElements[0];
diff --git a/themes/contrib/olivero/js/tabs.es6.js b/themes/contrib/olivero/js/tabs.es6.js
index 87800e1..52d079b 100644
--- a/themes/contrib/olivero/js/tabs.es6.js
+++ b/themes/contrib/olivero/js/tabs.es6.js
@@ -23,9 +23,9 @@
       }
     }
 
-    if (isTabsMobileLayout() && !activeTab.matches('.tabs__tab:first-child')) {
+    if (isTabsMobileLayout() && !activeTab.matches('.js-tabs__tab:first-child')) {
       const newActiveTab = activeTab.cloneNode(true);
-      const firstTab = tabs.querySelector('.tabs__tab:first-child');
+      const firstTab = tabs.querySelector('.js-tabs__tab:first-child');
       tabs.insertBefore(newActiveTab, firstTab);
       tabs.removeChild(activeTab);
     }
diff --git a/themes/contrib/olivero/js/tabs.js b/themes/contrib/olivero/js/tabs.js
index 9dda7c7..f8dd662 100644
--- a/themes/contrib/olivero/js/tabs.js
+++ b/themes/contrib/olivero/js/tabs.js
@@ -25,9 +25,9 @@
       }
     }
 
-    if (isTabsMobileLayout() && !activeTab.matches('.tabs__tab:first-child')) {
+    if (isTabsMobileLayout() && !activeTab.matches('.js-tabs__tab:first-child')) {
       var newActiveTab = activeTab.cloneNode(true);
-      var firstTab = tabs.querySelector('.tabs__tab:first-child');
+      var firstTab = tabs.querySelector('.js-tabs__tab:first-child');
       tabs.insertBefore(newActiveTab, firstTab);
       tabs.removeChild(activeTab);
     }