diff --git a/dpaste/highlight.py b/dpaste/highlight.py
index 2912b80..391b87a 100644
--- a/dpaste/highlight.py
+++ b/dpaste/highlight.py
@@ -24,74 +24,77 @@ LEXER_LIST = sorted(LEXER_LIST)
 # retrieve this.
 LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', (
     ('text', 'Text'),
-    ('text', '----------'),
-    ('abap', 'ABAP'),
-    ('apacheconf', 'ApacheConf'),
-    ('applescript', 'AppleScript'),
-    ('as', 'ActionScript'),
-    ('bash', 'Bash'),
-    ('bbcode', 'BBCode'),
-    ('c', 'C'),
-    ('clojure', 'Clojure'),
-    ('cobol', 'COBOL'),
-    ('css', 'CSS'),
-    ('cuda', 'CUDA'),
-    ('dart', 'Dart'),
-    ('delphi', 'Delphi'),
-    ('diff', 'Diff'),
-    ('django', 'Django'),
-    ('erlang', 'Erlang'),
-    ('fortran', 'Fortran'),
-    ('go', 'Go'),
-    ('groovy', 'Groovy'),
-    ('haml', 'Haml'),
-    ('haskell', 'Haskell'),
-    ('html', 'HTML'),
-    ('http', 'HTTP'),
-    ('ini', 'INI'),
-    ('irc', 'IRC'),
-    ('java', 'Java'),
-    ('js', 'JavaScript'),
-    ('json', 'JSON'),
-    ('lua', 'Lua'),
-    ('make', 'Makefile'),
-    ('mako', 'Mako'),
-    ('mason', 'Mason'),
-    ('matlab', 'Matlab'),
-    ('modula2', 'Modula'),
-    ('monkey', 'Monkey'),
-    ('mysql', 'MySQL'),
-    ('numpy', 'NumPy'),
-    ('ocaml', 'OCaml'),
-    ('perl', 'Perl'),
-    ('php', 'PHP'),
-    ('postscript', 'PostScript'),
-    ('powershell', 'PowerShell'),
-    ('prolog', 'Prolog'),
-    ('properties', 'Properties'),
-    ('puppet', 'Puppet'),
-    ('python', 'Python'),
-    ('rb', 'Ruby'),
-    ('rst', 'reStructuredText'),
-    ('rust', 'Rust'),
-    ('sass', 'Sass'),
-    ('scala', 'Scala'),
-    ('scheme', 'Scheme'),
-    ('scilab', 'Scilab'),
-    ('scss', 'SCSS'),
-    ('smalltalk', 'Smalltalk'),
-    ('smarty', 'Smarty'),
-    ('sql', 'SQL'),
-    ('tcl', 'Tcl'),
-    ('tcsh', 'Tcsh'),
-    ('tex', 'TeX'),
-    ('text', 'Text'),
-    ('vb.net', 'VB.net'),
-    ('vim', 'VimL'),
-    ('xml', 'XML'),
-    ('xquery', 'XQuery'),
-    ('xslt', 'XSLT'),
-    ('yaml', 'YAML'),
+    ('code', 'Code'),
+    ('Specific Code', (
+        ('abap', 'ABAP'),
+        ('apacheconf', 'ApacheConf'),
+        ('applescript', 'AppleScript'),
+        ('as', 'ActionScript'),
+        ('bash', 'Bash'),
+        ('bbcode', 'BBCode'),
+        ('c', 'C'),
+        ('clojure', 'Clojure'),
+        ('cobol', 'COBOL'),
+        ('css', 'CSS'),
+        ('cuda', 'CUDA'),
+        ('dart', 'Dart'),
+        ('delphi', 'Delphi'),
+        ('diff', 'Diff'),
+        ('django', 'Django'),
+        ('erlang', 'Erlang'),
+        ('fortran', 'Fortran'),
+        ('go', 'Go'),
+        ('groovy', 'Groovy'),
+        ('haml', 'Haml'),
+        ('haskell', 'Haskell'),
+        ('html', 'HTML'),
+        ('http', 'HTTP'),
+        ('ini', 'INI'),
+        ('irc', 'IRC'),
+        ('java', 'Java'),
+        ('js', 'JavaScript'),
+        ('json', 'JSON'),
+        ('lua', 'Lua'),
+        ('make', 'Makefile'),
+        ('mako', 'Mako'),
+        ('mason', 'Mason'),
+        ('matlab', 'Matlab'),
+        ('modula2', 'Modula'),
+        ('monkey', 'Monkey'),
+        ('mysql', 'MySQL'),
+        ('numpy', 'NumPy'),
+        ('objc', 'Obj-C'),
+        ('ocaml', 'OCaml'),
+        ('perl', 'Perl'),
+        ('php', 'PHP'),
+        ('postscript', 'PostScript'),
+        ('powershell', 'PowerShell'),
+        ('prolog', 'Prolog'),
+        ('properties', 'Properties'),
+        ('puppet', 'Puppet'),
+        ('python', 'Python'),
+        ('rb', 'Ruby'),
+        ('rst', 'reStructuredText'),
+        ('rust', 'Rust'),
+        ('sass', 'Sass'),
+        ('scala', 'Scala'),
+        ('scheme', 'Scheme'),
+        ('scilab', 'Scilab'),
+        ('scss', 'SCSS'),
+        ('smalltalk', 'Smalltalk'),
+        ('smarty', 'Smarty'),
+        ('sql', 'SQL'),
+        ('tcl', 'Tcl'),
+        ('tcsh', 'Tcsh'),
+        ('tex', 'TeX'),
+        ('text', 'Text'),
+        ('vb.net', 'VB.net'),
+        ('vim', 'VimL'),
+        ('xml', 'XML'),
+        ('xquery', 'XQuery'),
+        ('xslt', 'XSLT'),
+        ('yaml', 'YAML'),
+    ))
 ))
 
 LEXER_KEYS = dict(LEXER_LIST).keys()