diff --git a/conf/default.conf.php b/conf/default.conf.php
index 0d0cfc5998..24af0be3bd 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -543,7 +543,8 @@ return array(
     'php' => 'PHP',
     'text' => 'Plain Text',
     'python' => 'Python',
-    // TODO: 'remarkup' => 'Remarkup',
+    'rainbow' => 'Rainbow',
+    'remarkup' => 'Remarkup',
     'ruby' => 'Ruby',
     'xml' => 'XML',
   ),
diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 19eb194369..ed5e442ec8 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -1245,7 +1245,7 @@ celerity_register_resource_map(array(
   ),
   'syntax-highlighting-css' =>
   array(
-    'uri' => '/res/e5cc3d88/rsrc/css/core/syntax.css',
+    'uri' => '/res/942fbdd1/rsrc/css/core/syntax.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1300,24 +1300,7 @@ celerity_register_resource_map(array(
       'uri' => '/res/pkg/307df223/javelin.pkg.js',
       'type' => 'js',
     ),
-    '95b66c1a' =>
-    array (
-      'name' => 'differential.pkg.css',
-      'symbols' =>
-      array (
-        0 => 'differential-core-view-css',
-        1 => 'differential-changeset-view-css',
-        2 => 'differential-revision-detail-css',
-        3 => 'differential-revision-history-css',
-        4 => 'differential-table-of-contents-css',
-        5 => 'differential-revision-comment-css',
-        6 => 'differential-revision-add-comment-css',
-        7 => 'differential-revision-comment-list-css',
-      ),
-      'uri' => '/res/pkg/95b66c1a/differential.pkg.css',
-      'type' => 'css',
-    ),
-    'a841d3be' =>
+    '4e0b9596' =>
     array (
       'name' => 'core.pkg.css',
       'symbols' =>
@@ -1338,7 +1321,24 @@ celerity_register_resource_map(array(
         13 => 'phabricator-remarkup-css',
         14 => 'syntax-highlighting-css',
       ),
-      'uri' => '/res/pkg/a841d3be/core.pkg.css',
+      'uri' => '/res/pkg/4e0b9596/core.pkg.css',
+      'type' => 'css',
+    ),
+    '95b66c1a' =>
+    array (
+      'name' => 'differential.pkg.css',
+      'symbols' =>
+      array (
+        0 => 'differential-core-view-css',
+        1 => 'differential-changeset-view-css',
+        2 => 'differential-revision-detail-css',
+        3 => 'differential-revision-history-css',
+        4 => 'differential-table-of-contents-css',
+        5 => 'differential-revision-comment-css',
+        6 => 'differential-revision-add-comment-css',
+        7 => 'differential-revision-comment-list-css',
+      ),
+      'uri' => '/res/pkg/95b66c1a/differential.pkg.css',
       'type' => 'css',
     ),
     'd0713563' =>
@@ -1374,15 +1374,15 @@ celerity_register_resource_map(array(
   ),
   'reverse' =>
   array (
-    'aphront-crumbs-view-css' => 'a841d3be',
-    'aphront-dialog-view-css' => 'a841d3be',
-    'aphront-form-view-css' => 'a841d3be',
-    'aphront-list-filter-view-css' => 'a841d3be',
-    'aphront-panel-view-css' => 'a841d3be',
-    'aphront-side-nav-view-css' => 'a841d3be',
-    'aphront-table-view-css' => 'a841d3be',
-    'aphront-tokenizer-control-css' => 'a841d3be',
-    'aphront-typeahead-control-css' => 'a841d3be',
+    'aphront-crumbs-view-css' => '4e0b9596',
+    'aphront-dialog-view-css' => '4e0b9596',
+    'aphront-form-view-css' => '4e0b9596',
+    'aphront-list-filter-view-css' => '4e0b9596',
+    'aphront-panel-view-css' => '4e0b9596',
+    'aphront-side-nav-view-css' => '4e0b9596',
+    'aphront-table-view-css' => '4e0b9596',
+    'aphront-tokenizer-control-css' => '4e0b9596',
+    'aphront-typeahead-control-css' => '4e0b9596',
     'differential-changeset-view-css' => '95b66c1a',
     'differential-core-view-css' => '95b66c1a',
     'differential-revision-add-comment-css' => '95b66c1a',
@@ -1419,13 +1419,13 @@ celerity_register_resource_map(array(
     'javelin-util' => '307df223',
     'javelin-vector' => '307df223',
     'javelin-workflow' => 'd0713563',
-    'phabricator-core-buttons-css' => 'a841d3be',
-    'phabricator-core-css' => 'a841d3be',
-    'phabricator-directory-css' => 'a841d3be',
+    'phabricator-core-buttons-css' => '4e0b9596',
+    'phabricator-core-css' => '4e0b9596',
+    'phabricator-directory-css' => '4e0b9596',
     'phabricator-keyboard-shortcut' => 'd0713563',
     'phabricator-keyboard-shortcut-manager' => 'd0713563',
-    'phabricator-remarkup-css' => 'a841d3be',
-    'phabricator-standard-page-view' => 'a841d3be',
-    'syntax-highlighting-css' => 'a841d3be',
+    'phabricator-remarkup-css' => '4e0b9596',
+    'phabricator-standard-page-view' => '4e0b9596',
+    'syntax-highlighting-css' => '4e0b9596',
   ),
 ));
diff --git a/webroot/rsrc/css/core/syntax.css b/webroot/rsrc/css/core/syntax.css
index e7ca2ce578..5cecee2b29 100644
--- a/webroot/rsrc/css/core/syntax.css
+++ b/webroot/rsrc/css/core/syntax.css
@@ -119,4 +119,10 @@
 .remarkup-code .se { color: #BB6622 } /* Literal.String.Escape */
 .remarkup-code .si { color: #BB6688 } /* Literal.String.Interpol */
 
-
+.remarkup-code .rbw_r { color: red; }
+.remarkup-code .rbw_o { color: orange; }
+.remarkup-code .rbw_y { color: yellow; }
+.remarkup-code .rbw_g { color: green; }
+.remarkup-code .rbw_b { color: blue; }
+.remarkup-code .rbw_i { color: #2E0854; } /* No "indigo" or "violet". */
+.remarkup-code .rbw_v { color: #820BBB; }