diff --git a/sphinx/themes/agogo/static/agogo.css_t b/sphinx/themes/agogo/static/agogo.css_t
index ddc8385fc..a39b4d74b 100644
--- a/sphinx/themes/agogo/static/agogo.css_t
+++ b/sphinx/themes/agogo/static/agogo.css_t
@@ -118,6 +118,10 @@ p.admonition-title {
   font-weight: bold;
 }
 
+dt:target, .highlighted {
+  background-color: #fbe54e;
+}
+
 /* Header */
 
 div.header {
diff --git a/sphinx/themes/basic/static/basic.css b/sphinx/themes/basic/static/basic.css
index 465b526e9..7cfacd5b9 100644
--- a/sphinx/themes/basic/static/basic.css
+++ b/sphinx/themes/basic/static/basic.css
@@ -316,7 +316,7 @@ dd {
     margin-left: 30px;
 }
 
-dt:target, .highlight {
+dt:target, .highlighted {
     background-color: #fbe54e;
 }
 
diff --git a/sphinx/themes/basic/static/doctools.js b/sphinx/themes/basic/static/doctools.js
index 28c7a6da3..23e217c3b 100644
--- a/sphinx/themes/basic/static/doctools.js
+++ b/sphinx/themes/basic/static/doctools.js
@@ -182,7 +182,7 @@ var Documentation = {
       var body = $('div.body');
       window.setTimeout(function() {
         $.each(terms, function() {
-          body.highlightText(this.toLowerCase(), 'highlight');
+          body.highlightText(this.toLowerCase(), 'highlighted');
         });
       }, 10);
       $('<li class="highlight-link"><a href="javascript:Documentation.' +
@@ -214,7 +214,7 @@ var Documentation = {
    */
   hideSearchWords : function() {
     $('.sidebar .this-page-menu li.highlight-link').fadeOut(300);
-    $('span.highlight').removeClass('highlight');
+    $('span.highlighted').removeClass('highlighted');
   },
 
   /**
diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js
index c12471063..433d81d99 100644
--- a/sphinx/themes/basic/static/searchtools.js
+++ b/sphinx/themes/basic/static/searchtools.js
@@ -31,7 +31,7 @@ jQuery.makeSearchSummary = function(text, keywords, hlwords) {
   ((start + 240 - text.length) ? '...' : '');
   var rv = $('<div class="context"></div>').text(excerpt);
   $.each(hlwords, function() {
-    rv = rv.highlightText(this, 'highlight');
+    rv = rv.highlightText(this, 'highlighted');
   });
   return rv;
 }
diff --git a/sphinx/themes/epub/static/epub.css b/sphinx/themes/epub/static/epub.css
index c6320c8c0..de21c4626 100644
--- a/sphinx/themes/epub/static/epub.css
+++ b/sphinx/themes/epub/static/epub.css
@@ -298,7 +298,7 @@ dd {
     margin-left: 30px;
 }
 
-dt:target, .highlight {
+dt:target, .highlighted {
     background-color: #ddd;
 }