diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index cad9b2636..fd0dbaf57 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -1474,6 +1474,35 @@ StScrollBar {
       -boxpointer-gap: 5px;
   }
 
+// IBus Candidate Popup
+
+.candidate-popup-content {
+  padding: 0.5em;
+  spacing: 0.3em;
+}
+
+  .candidate-index {
+    padding: 0 0.5em 0 0;
+    color: darken($fg_color,10%);
+  }
+
+  .candidate-box { 
+    padding: 0.3em 0.5em 0.3em 0.5em;
+    border-radius: 4px;
+    &:selected,&:hover { background-color: $selected_bg_color; }
+  }
+
+  .candidate-page-button-box {
+    height: 2em;
+    width: 80px;
+    .vertical & { padding-top: 0.5em; }
+    .horizontal & { padding-left: 0.5em; }
+  }
+
+  .candidate-page-button-previous { border-radius: 4px 0px 0px 4px; }
+  .candidate-page-button-next { border-radius: 0px 4px 4px 0px;  }
+  .candidate-page-button-icon { icon-size: 1em; }
+
 //Mess that is Looking Glass
 #LookingGlassDialog {
   background-color: rgba(0,0,0,0.80);
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index 935479675..7fb15c4f4 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -17,60 +17,6 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
-
-
-
-/* IBus Candidate Popup */
-
-.candidate-popup-content {
-    padding: 0.5em;
-    spacing: 0.3em;
-}
-
-.candidate-index {
-    padding: 0 0.5em 0 0;
-    color: #cccccc;
-}
-
-.candidate-box {
-    padding: 0.3em 0.5em 0.3em 0.5em;
-}
-
-.candidate-box:selected {
-    border-radius: 4px;
-    background-color: rgba(255,255,255,0.2);
-}
-
-.candidate-box:hover {
-    border-radius: 4px;
-    background-color: rgba(255,255,255,0.1);
-}
-.candidate-page-button-box {
-    height: 2em;
-    width: 80px;
-}
-
-.vertical .candidate-page-button-box {
-    padding-top: 0.5em;
-}
-
-.horizontal .candidate-page-button-box {
-    padding-left: 0.5em;
-}
-
-.candidate-page-button-previous {
-    border-radius: 4px 0px 0px 4px;
-}
-
-.candidate-page-button-next {
-    border-radius: 0px 4px 4px 0px;
-}
-
-.candidate-page-button-icon {
-    icon-size: 1em;
-}
-
 /* Login Dialog */
 
 .framed-user-icon {
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 2cc677449..50a8a2877 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -16,45 +16,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* IBus Candidate Popup */
-.candidate-popup-content {
-  padding: 0.5em;
-  spacing: 0.3em; }
-
-.candidate-index {
-  padding: 0 0.5em 0 0;
-  color: #cccccc; }
-
-.candidate-box {
-  padding: 0.3em 0.5em 0.3em 0.5em; }
-
-.candidate-box:selected {
-  border-radius: 4px;
-  background-color: rgba(255, 255, 255, 0.2); }
-
-.candidate-box:hover {
-  border-radius: 4px;
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.candidate-page-button-box {
-  height: 2em;
-  width: 80px; }
-
-.vertical .candidate-page-button-box {
-  padding-top: 0.5em; }
-
-.horizontal .candidate-page-button-box {
-  padding-left: 0.5em; }
-
-.candidate-page-button-previous {
-  border-radius: 4px 0px 0px 4px; }
-
-.candidate-page-button-next {
-  border-radius: 0px 4px 4px 0px; }
-
-.candidate-page-button-icon {
-  icon-size: 1em; }
-
 /* Login Dialog */
 .framed-user-icon {
   border: 2px solid #8b8b8b;
@@ -1677,6 +1638,37 @@ StScrollBar {
   -arrow-rise: 10px;
   -boxpointer-gap: 5px; }
 
+.candidate-popup-content {
+  padding: 0.5em;
+  spacing: 0.3em; }
+
+.candidate-index {
+  padding: 0 0.5em 0 0;
+  color: #e6e6e6; }
+
+.candidate-box {
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  border-radius: 4px; }
+  .candidate-box:selected, .candidate-box:hover {
+    background-color: #215d9c; }
+
+.candidate-page-button-box {
+  height: 2em;
+  width: 80px; }
+  .vertical .candidate-page-button-box {
+    padding-top: 0.5em; }
+  .horizontal .candidate-page-button-box {
+    padding-left: 0.5em; }
+
+.candidate-page-button-previous {
+  border-radius: 4px 0px 0px 4px; }
+
+.candidate-page-button-next {
+  border-radius: 0px 4px 4px 0px; }
+
+.candidate-page-button-icon {
+  icon-size: 1em; }
+
 #LookingGlassDialog {
   background-color: rgba(0, 0, 0, 0.8);
   spacing: 4px;
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index ed1364345..ac645f9ff 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -16,45 +16,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* IBus Candidate Popup */
-.candidate-popup-content {
-  padding: 0.5em;
-  spacing: 0.3em; }
-
-.candidate-index {
-  padding: 0 0.5em 0 0;
-  color: #cccccc; }
-
-.candidate-box {
-  padding: 0.3em 0.5em 0.3em 0.5em; }
-
-.candidate-box:selected {
-  border-radius: 4px;
-  background-color: rgba(255, 255, 255, 0.2); }
-
-.candidate-box:hover {
-  border-radius: 4px;
-  background-color: rgba(255, 255, 255, 0.1); }
-
-.candidate-page-button-box {
-  height: 2em;
-  width: 80px; }
-
-.vertical .candidate-page-button-box {
-  padding-top: 0.5em; }
-
-.horizontal .candidate-page-button-box {
-  padding-left: 0.5em; }
-
-.candidate-page-button-previous {
-  border-radius: 4px 0px 0px 4px; }
-
-.candidate-page-button-next {
-  border-radius: 0px 4px 4px 0px; }
-
-.candidate-page-button-icon {
-  icon-size: 1em; }
-
 /* Login Dialog */
 .framed-user-icon {
   border: 2px solid #8b8b8b;
@@ -1669,6 +1630,37 @@ StScrollBar {
   -arrow-rise: 10px;
   -boxpointer-gap: 5px; }
 
+.candidate-popup-content {
+  padding: 0.5em;
+  spacing: 0.3em; }
+
+.candidate-index {
+  padding: 0 0.5em 0 0;
+  color: #d6d6d1; }
+
+.candidate-box {
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  border-radius: 4px; }
+  .candidate-box:selected, .candidate-box:hover {
+    background-color: #215d9c; }
+
+.candidate-page-button-box {
+  height: 2em;
+  width: 80px; }
+  .vertical .candidate-page-button-box {
+    padding-top: 0.5em; }
+  .horizontal .candidate-page-button-box {
+    padding-left: 0.5em; }
+
+.candidate-page-button-previous {
+  border-radius: 4px 0px 0px 4px; }
+
+.candidate-page-button-next {
+  border-radius: 0px 4px 4px 0px; }
+
+.candidate-page-button-icon {
+  icon-size: 1em; }
+
 #LookingGlassDialog {
   background-color: rgba(0, 0, 0, 0.8);
   spacing: 4px;