diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'd3651813',
+    'core.pkg.css' => 'd8fc0e24',
     'core.pkg.js' => '347cd64a',
     'darkconsole.pkg.js' => '8ab24e01',
     'differential.pkg.css' => '3500921f',
@@ -27,7 +27,7 @@
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
     'rsrc/css/aphront/phabricator-nav-view.css' => '7aeaf435',
     'rsrc/css/aphront/table-view.css' => '59e2c0f8',
-    'rsrc/css/aphront/tokenizer.css' => 'c10c061e',
+    'rsrc/css/aphront/tokenizer.css' => '5726062d',
     'rsrc/css/aphront/tooltip.css' => '7672b60f',
     'rsrc/css/aphront/two-column.css' => '16ab3ad2',
     'rsrc/css/aphront/typeahead-browse.css' => 'efe293a0',
@@ -510,7 +510,7 @@
     'aphront-pager-view-css' => '2e3539af',
     'aphront-panel-view-css' => '8427b78d',
     'aphront-table-view-css' => '59e2c0f8',
-    'aphront-tokenizer-control-css' => 'c10c061e',
+    'aphront-tokenizer-control-css' => '5726062d',
     'aphront-tooltip-css' => '7672b60f',
     'aphront-two-column-view-css' => '16ab3ad2',
     'aphront-typeahead-control-css' => '0e403212',
@@ -1220,6 +1220,9 @@
       'javelin-vector',
       'javelin-dom',
     ),
+    '5726062d' => array(
+      'aphront-typeahead-control-css',
+    ),
     58562350 => array(
       'javelin-dom',
       'javelin-util',
@@ -1764,9 +1767,6 @@
       'javelin-util',
       'phabricator-shaped-request',
     ),
-    'c10c061e' => array(
-      'aphront-typeahead-control-css',
-    ),
     'c1700f6f' => array(
       'javelin-install',
       'javelin-util',
diff --git a/webroot/rsrc/css/aphront/tokenizer.css b/webroot/rsrc/css/aphront/tokenizer.css
--- a/webroot/rsrc/css/aphront/tokenizer.css
+++ b/webroot/rsrc/css/aphront/tokenizer.css
@@ -67,50 +67,44 @@
   float: left;
   cursor: pointer;
   border-radius: 3px;
-  color: {$darkbluetext};
+  color: {$sh-bluetext};
   min-height: 16px;
 }
 
 a.jx-tokenizer-token:hover {
   text-decoration: none;
-  border-color: {$blueborder};
-  background: #CDD9F0;
+  border-color: {$sh-blueborder};
+  background-color: {$sh-bluebackground};
 }
 
 .jx-tokenizer-token .phui-icon-view {
   display: inline-block;
   margin: 2px 4px -3px 0;
-  color: {$bluetext};
+  color: {$sh-blueicon};
 }
 
 a.jx-tokenizer-token-function {
-  border-color: {$sh-lightyellowborder};
-  background: {$sh-yellowbackground};
-  color: {$sh-yellowtext};
+  border-color: {$sh-lightgreyborder};
+  background: #fff;
 }
 
 a.jx-tokenizer-token-function:hover {
-  border-color: {$sh-yellowborder};
-  background: {$lightyellow};
-}
-
-.jx-tokenizer-token-function .phui-icon-view {
-  color: {$sh-yellowicon};
+  background: #fff;
 }
 
 a.jx-tokenizer-token-disabled {
-  border-color: {$sh-lightgreyborder};
-  background: {$sh-greybackground};
-  color: {$sh-greytext};
+  background-color: {$sh-disabledbackground};
+  border-color: {$sh-lightdisabledborder};
+  color: {$sh-disabledtext};
 }
 
 a.jx-tokenizer-token-disabled:hover {
-  border-color: {$sh-greyborder};
-  background: {$greybackground};
+  border-color: {$sh-disabledborder};
+  background-color: {$sh-disabledbackground};
 }
 
 .jx-tokenizer-token-disabled .phui-icon-view {
-  color: {$sh-greyicon};
+  color: {$sh-disabledicon};
 }
 
 a.jx-tokenizer-token-invalid {
@@ -121,7 +115,7 @@
 
 a.jx-tokenizer-token-invalid:hover {
   border-color: {$sh-redborder};
-  background: {$lightred};
+  background: {$sh-redbackground};
 }
 
 .jx-tokenizer-token-invalid .phui-icon-view {