diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 0b53b1fe..a39a36eb 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -374,9 +374,8 @@ ChucK:
 Cirru:
   type: programming
   color: "#aaaaff"
-  # ace_mode: cirru
-  # lexer: Cirru
-  lexer: Text only
+  ace_mode: cirru
+  lexer: Cirru
   extensions:
   - .cirru
 
@@ -622,7 +621,7 @@ Eagle:
 
 Eiffel:
   type: programming
-  lexer: Text only
+  lexer: Eiffel
   color: "#946d57"
   extensions:
   - .e
@@ -982,7 +981,7 @@ Haxe:
 
 Hy:
   type: programming
-  lexer: Clojure
+  lexer: Hy
   ace_mode: clojure
   color: "#7891b1"
   extensions:
@@ -1017,7 +1016,7 @@ Idris:
 
 Inform 7:
   type: programming
-  lexer: Text only
+  lexer: Inform 7
   wrap: true
   extensions:
   - .ni
@@ -1366,7 +1365,7 @@ Mathematica:
   - .mathematica
   - .m
   - .nb
-  lexer: Text only
+  lexer: Mathematica
 
 Matlab:
   type: programming
@@ -1861,7 +1860,7 @@ R:
 
 RDoc:
   type: prose
-  lexer: Text only
+  lexer: Rd
   ace_mode: rdoc
   wrap: true
   extensions: