diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
@@ -480,6 +480,10 @@
       'syntax-highlighter.engine',
       $options['syntax-highlighter.engine']);
 
+    $style_map = id(new PhabricatorDefaultSyntaxStyle())
+      ->getRemarkupStyleMap();
+    $engine->setConfig('phutil.codeblock.style-map', $style_map);
+
     $engine->setConfig('uri.full', $options['uri.full']);
 
     $rules = array();
diff --git a/src/infrastructure/syntax/PhabricatorSyntaxStyle.php b/src/infrastructure/syntax/PhabricatorSyntaxStyle.php
--- a/src/infrastructure/syntax/PhabricatorSyntaxStyle.php
+++ b/src/infrastructure/syntax/PhabricatorSyntaxStyle.php
@@ -27,4 +27,18 @@
       ->execute();
   }
 
+  final public function getRemarkupStyleMap() {
+    $map = array(
+      'rbw_r' => 'color: red',
+      'rbw_o' => 'color: orange',
+      'rbw_y' => 'color: yellow',
+      'rbw_g' => 'color: green',
+      'rbw_b' => 'color: blue',
+      'rbw_i' => 'color: indigo',
+      'rbw_v' => 'color: violet',
+    );
+
+    return $map + $this->getStyleMap();
+  }
+
 }