diff --git a/src/Yi/Lexer/GitCommit.x b/src/Yi/Lexer/GitCommit.x
--- a/src/Yi/Lexer/GitCommit.x
+++ b/src/Yi/Lexer/GitCommit.x
@@ -24,9 +24,10 @@
 }
 
 -- There should never be anything on the second line of a git commit message
--- so it is styled in a deliberately hideous color scheme.
+-- so it is styled in a deliberately hideous color scheme, unless it's a comment.
 <secondLine> {
-.+                             { c (const $ Style.withFg Style.red `mappend` Style.withBg Style.brown) }
+^\#                            { m (const $ LineComment) Style.commentStyle }
+.                              { c (const $ Style.withFg Style.red `mappend` Style.withBg Style.brown) }
 $nl                            { m (const MessageLine) Style.defaultStyle }
 }
 
diff --git a/src/Yi/Lexer/Ruby.x b/src/Yi/Lexer/Ruby.x
--- a/src/Yi/Lexer/Ruby.x
+++ b/src/Yi/Lexer/Ruby.x
@@ -182,7 +182,7 @@
    | @number \. @number? @exponent?             { c numberStyle }
 
  -- symbols and raw strings
- :[$small]+                                     { c stringStyle }
+ :[$small $large _]+                            { c stringStyle }
  \%q\{ @longstring* \}
  | \' @shortstring* \'                          { c stringStyle }
 
diff --git a/yi-misc-modes.cabal b/yi-misc-modes.cabal
--- a/yi-misc-modes.cabal
+++ b/yi-misc-modes.cabal
@@ -1,5 +1,5 @@
 name:           yi-misc-modes
-version:        0.17.1
+version:        0.18.0
 synopsis:       Yi editor miscellaneous modes
 category:       Yi
 homepage:       https://github.com/yi-editor/yi#readme
@@ -30,8 +30,8 @@
     , filepath
     , microlens-platform
     , text
-    , yi-core >= 0.17
-    , yi-language >= 0.17
+    , yi-core >= 0.18
+    , yi-language >= 0.18
     , yi-rope >= 0.10
   build-tools:
       alex >= 3.0.3 && < 3.2.0 || >= 3.2.1