diff --git a/README.md b/README.md
index 94430f4d..2841eaa4 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # Linguist
 
-We use this library at GitHub to detect blob languages, highlight code, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.
+We use this library at GitHub to detect blob languages, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.
 
 ## Features
 
 ### Language detection
 
-Linguist defines a list of all languages known to GitHub in a [yaml file](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml). In order for a file to be highlighted, a language and a lexer must be defined there.
+Linguist defines a list of all languages known to GitHub in a [yaml file](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml).
 
 Most languages are detected by their file extension. For disambiguating between files with common extensions, we first apply some common-sense heuristics to pick out obvious languages. After that, we use a
 [statistical
@@ -22,10 +22,6 @@ Linguist::FileBlob.new("bin/linguist").language.name #=> "Ruby"
 
 See [lib/linguist/language.rb](https://github.com/github/linguist/blob/master/lib/linguist/language.rb) and [lib/linguist/languages.yml](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml).
 
-### Syntax Highlighting
-
-The actual syntax highlighting is handled by our Pygments wrapper, [pygments.rb](https://github.com/tmm1/pygments.rb). It also provides a [Lexer abstraction](https://github.com/tmm1/pygments.rb/blob/master/lib/pygments/lexer.rb) that determines which highlighter should be used on a file.
-
 ### Stats
 
 The Language stats bar that you see on every repository is built by aggregating the languages of each file in that repository. The top language in the graph determines the project's primary language.
diff --git a/github-linguist.gemspec b/github-linguist.gemspec
index db41c587..a30e0f19 100644
--- a/github-linguist.gemspec
+++ b/github-linguist.gemspec
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'charlock_holmes', '~> 0.7.3'
   s.add_dependency 'escape_utils',    '~> 1.0.1'
   s.add_dependency 'mime-types',      '~> 1.19'
-  s.add_dependency 'pygments.rb',     '~> 0.6.0'
   s.add_dependency 'rugged',          '~> 0.21.1b2'
 
   s.add_development_dependency 'mocha'
diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
index 840ca75c..d6d3dd30 100644
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -2,7 +2,6 @@ require 'linguist/generated'
 require 'charlock_holmes'
 require 'escape_utils'
 require 'mime/types'
-require 'pygments'
 require 'yaml'
 
 module Linguist
@@ -193,10 +192,6 @@ module Linguist
 
     # Public: Is the blob safe to colorize?
     #
-    # We use Pygments for syntax highlighting blobs. Pygments
-    # can be too slow for very large blobs or for certain
-    # corner-case blobs.
-    #
     # Return true or false
     def safe_to_colorize?
       !large? && text? && !high_ratio_of_long_lines?
@@ -204,9 +199,6 @@ module Linguist
 
     # Internal: Does the blob have a ratio of long lines?
     #
-    # These types of files are usually going to make Pygments.rb
-    # angry if we try to colorize them.
-    #
     # Return true or false
     def high_ratio_of_long_lines?
       return false if loc == 0
@@ -314,28 +306,9 @@ module Linguist
       @language ||= Language.detect(self)
     end
 
-    # Internal: Get the lexer of the blob.
-    #
-    # Returns a Lexer.
-    def lexer
-      language ? language.lexer : Pygments::Lexer.find_by_name('Text only')
-    end
-
     # Internal: Get the TextMate compatible scope for the blob
     def tm_scope
       language && language.tm_scope
     end
-
-    # Public: Highlight syntax of blob
-    #
-    # options - A Hash of options (defaults to {})
-    #
-    # Returns html String
-    def colorize(options = {})
-      return unless safe_to_colorize?
-      options[:options] ||= {}
-      options[:options][:encoding] ||= encoding
-      lexer.highlight(data, options)
-    end
   end
 end
diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index 485d6efb..507ae71a 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -1,5 +1,4 @@
 require 'escape_utils'
-require 'pygments'
 require 'yaml'
 begin
   require 'yajl'
@@ -302,10 +301,7 @@ module Linguist
       # Set aliases
       @aliases = [default_alias_name] + (attributes[:aliases] || [])
 
-      # Lookup Lexer object
-      @lexer = Pygments::Lexer.find_by_name(attributes[:lexer] || name) ||
-        raise(ArgumentError, "#{@name} is missing lexer")
-
+      # Load the TextMate scope name or try to guess one
       @tm_scope = attributes[:tm_scope] || begin
         context = case @type
                   when :data, :markup, :prose
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 817e6c0f..e1d9ee3d 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1,10 +1,6 @@
 # Defines all Languages known to GitHub.
 #
-# All languages have an associated lexer for syntax highlighting. It
-# defaults to name.downcase, which covers most cases.
-#
 # type              - Either data, programming, markup, prose, or nil
-# lexer             - An explicit lexer String (defaults to name)
 # aliases           - An Array of additional aliases (implicitly
 #                     includes name.downcase)
 # ace_mode          - A String name of Ace Mode (if available)
@@ -24,13 +20,11 @@
 
 ABAP:
   type: programming
-  lexer: ABAP
   extensions:
   - .abap
 
 AGS Script:
   type: programming
-  lexer: C++
   color: "#B9D9FF"
   aliases:
   - ags
@@ -42,7 +36,6 @@ AGS Script:
 ANTLR:
   type: programming
   color: "#9DC3FF"
-  lexer: ANTLR
   extensions:
   - .g4
 
@@ -56,7 +49,6 @@ APL:
 ASP:
   type: programming
   color: "#6a40fd"
-  lexer: aspx-vb
   search_term: aspx-vb
   aliases:
   - aspx
@@ -73,7 +65,6 @@ ASP:
 ATS:
   type: programming
   color: "#1ac620"
-  lexer: OCaml
   aliases:
   - ats2
   extensions:
@@ -85,7 +76,6 @@ ATS:
 
 ActionScript:
   type: programming
-  lexer: ActionScript 3
   tm_scope: source.actionscript.3
   color: "#e3491a"
   search_term: as3
@@ -114,7 +104,6 @@ Agda:
 
 Alloy:
   type: programming  # 'modeling' would be more appropiate
-  lexer: Alloy
   color: "#cc5c24"
   extensions:
   - .als
@@ -131,7 +120,6 @@ ApacheConf:
 
 Apex:
   type: programming
-  lexer: Java
   extensions:
   - .cls
   tm_scope: source.java
@@ -149,21 +137,18 @@ AppleScript:
 Arc:
   type: programming
   color: "#ca2afe"
-  lexer: Text only
   extensions:
   - .arc
 
 Arduino:
   type: programming
   color: "#bd79d1"
-  lexer: C++
   extensions:
   - .ino
   tm_scope: source.c++
 
 AsciiDoc:
   type: prose
-  lexer: Text only
   ace_mode: asciidoc
   wrap: true
   extensions:
@@ -173,14 +158,12 @@ AsciiDoc:
 
 AspectJ:
   type: programming
-  lexer: AspectJ
   color: "#1957b0"
   extensions:
   - .aj
 
 Assembly:
   type: programming
-  lexer: NASM
   color: "#a67219"
   search_term: nasm
   aliases:
@@ -198,7 +181,6 @@ Augeas:
 
 AutoHotkey:
   type: programming
-  lexer: autohotkey
   color: "#6594b9"
   aliases:
   - ahk
@@ -219,7 +201,6 @@ AutoIt:
 
 Awk:
   type: programming
-  lexer: Awk
   extensions:
   - .awk
   - .auk
@@ -272,7 +253,6 @@ BlitzMax:
 
 Bluespec:
   type: programming
-  lexer: verilog
   extensions:
   - .bsv
   tm_scope: source.verilog
@@ -291,7 +271,6 @@ Brainfuck:
 
 Brightscript:
   type: programming
-  lexer: Text only
   extensions:
   - .brs
 
@@ -350,14 +329,12 @@ C++:
 
 C-ObjDump:
   type: data
-  lexer: c-objdump
   extensions:
   - .c-objdump
   tm_scope: objdump.x86asm
 
 C2hs Haskell:
   type: programming
-  lexer: Haskell
   group: Haskell
   aliases:
   - c2hs
@@ -367,7 +344,6 @@ C2hs Haskell:
 
 CLIPS:
   type: programming
-  lexer: Text only
   extensions:
   - .clp
 
@@ -397,7 +373,6 @@ CSS:
 
 Ceylon:
   type: programming
-  lexer: Ceylon
   extensions:
   - .ceylon
 
@@ -410,7 +385,6 @@ Chapel:
   - .chpl
 
 ChucK:
-  lexer: Java
   extensions:
   - .ck
   tm_scope: source.java
@@ -419,14 +393,12 @@ Cirru:
   type: programming
   color: "#aaaaff"
   ace_mode: cirru
-  lexer: Cirru
   extensions:
   - .cirru
 
 Clean:
   type: programming
   color: "#3a81ad"
-  lexer: Text only
   extensions:
   - .icl
   - .dcl
@@ -468,7 +440,6 @@ CoffeeScript:
 ColdFusion:
   type: programming
   group: ColdFusion
-  lexer: Coldfusion HTML
   ace_mode: coldfusion
   color: "#ed2cd6"
   search_term: cfm
@@ -484,7 +455,6 @@ ColdFusion:
 ColdFusion CFC:
   type: programming
   group: ColdFusion
-  lexer: Coldfusion CFC
   ace_mode: coldfusion
   color: "#ed2cd6"
   search_term: cfc
@@ -516,7 +486,6 @@ Common Lisp:
 
 Component Pascal:
   type: programming
-  lexer: Delphi
   color: "#b0ce4e"
   extensions:
   - .cp
@@ -534,7 +503,6 @@ Coq:
 
 Cpp-ObjDump:
   type: data
-  lexer: cpp-objdump
   extensions:
   - .cppobjdump
   - .c++-objdump
@@ -547,21 +515,18 @@ Cpp-ObjDump:
 
 Creole:
   type: prose
-  lexer: Text only
   wrap: true
   extensions:
   - .creole
 
 Crystal:
   type: programming
-  lexer: Ruby
   extensions:
   - .cr
   ace_mode: ruby
   tm_scope: source.ruby
 
 Cucumber:
-  lexer: Gherkin
   extensions:
   - .feature
   tm_scope: text.gherkin.feature
@@ -570,7 +535,6 @@ Cucumber:
 
 Cuda:
   type: programming
-  lexer: CUDA
   extensions:
   - .cu
   - .cuh
@@ -578,7 +542,6 @@ Cuda:
 
 Cycript:
   type: programming
-  lexer: JavaScript
   extensions:
   - .cy
   tm_scope: source.js
@@ -602,7 +565,6 @@ D:
 
 D-ObjDump:
   type: data
-  lexer: d-objdump
   extensions:
   - .d-objdump
   tm_scope: objdump.x86asm
@@ -610,7 +572,6 @@ D-ObjDump:
 DM:
   type: programming
   color: "#075ff1"
-  lexer: C++
   extensions:
   - .dm
   aliases:
@@ -619,7 +580,6 @@ DM:
 
 DOT:
   type: data
-  lexer: Text only
   extensions:
   - .dot
   - .gv
@@ -647,7 +607,6 @@ Diff:
 
 Dogescript:
   type: programming
-  lexer: Text only
   color: "#cca760"
   extensions:
   - .djs
@@ -664,14 +623,12 @@ Dylan:
 E:
   type: programming
   color: "#ccce35"
-  lexer: Text only
   extensions:
   - .E
 
 Ecere Projects:
   type: data
   group: JavaScript
-  lexer: JSON
   extensions:
   - .epj
   tm_scope: source.json
@@ -679,7 +636,6 @@ Ecere Projects:
 ECL:
   type: programming
   color: "#8a1267"
-  lexer: ECL
   extensions:
   - .ecl
   - .eclxml
@@ -687,7 +643,6 @@ ECL:
 Eagle:
   type: markup
   color: "#3994bc"
-  lexer: XML
   extensions:
   - .sch
   - .brd
@@ -695,7 +650,6 @@ Eagle:
 
 Eiffel:
   type: programming
-  lexer: Eiffel
   color: "#946d57"
   extensions:
   - .e
@@ -709,14 +663,12 @@ Elixir:
 
 Elm:
   type: programming
-  lexer: Haskell
   extensions:
   - .elm
   tm_scope: source.haskell
 
 Emacs Lisp:
   type: programming
-  lexer: Common Lisp
   tm_scope: source.lisp
   color: "#c065db"
   aliases:
@@ -731,7 +683,6 @@ Emacs Lisp:
 EmberScript:
   type: programming
   color: "#f64e3e"
-  lexer: CoffeeScript
   extensions:
   - .em
   - .emberscript
@@ -748,7 +699,6 @@ Erlang:
 
 F#:
   type: programming
-  lexer: FSharp
   color: "#b845fc"
   search_term: fsharp
   aliases:
@@ -762,14 +712,12 @@ F#:
 FLUX:
   type: programming
   color: "#33CCFF"
-  lexer: Text only
   extensions:
   - .fx
   - .flux
 
 FORTRAN:
   type: programming
-  lexer: Fortran
   color: "#4d41b1"
   extensions:
   - .f90
@@ -818,7 +766,6 @@ Fantom:
 Forth:
   type: programming
   color: "#341708"
-  lexer: Text only
   extensions:
   - .fth
   - .4th
@@ -828,14 +775,12 @@ Forth:
 Frege:
   type: programming
   color: "#00cafe"
-  lexer: Haskell
   extensions:
   - .fr
   tm_scope: source.haskell
 
 G-code:
   type: data
-  lexer: Text only
   extensions:
   - .g
   - .gco
@@ -844,20 +789,17 @@ G-code:
 Game Maker Language:
   type: programming
   color: "#8ad353"
-  lexer: JavaScript
   extensions:
   - .gml
   tm_scope: source.js
 
 GAMS:
   type: programming
-  lexer: Text only
   extensions:
   - .gms
 
 GAP:
   type: programming
-  lexer: Text only
   extensions:
   - .g
   - .gap
@@ -874,7 +816,6 @@ GAS:
 
 GDScript:
   type: programming
-  lexer: Text only
   extensions:
   - .gd
 
@@ -906,14 +847,12 @@ Genshi:
 
 Gentoo Ebuild:
   group: Shell
-  lexer: Bash
   extensions:
   - .ebuild
   tm_scope: source.shell
 
 Gentoo Eclass:
   group: Shell
-  lexer: Bash
   extensions:
   - .eclass
   tm_scope: source.shell
@@ -931,7 +870,6 @@ Gettext Catalog:
 Glyph:
   type: programming
   color: "#e4cc98"
-  lexer: Tcl
   extensions:
   - .glf
   tm_scope: source.tcl
@@ -939,7 +877,6 @@ Glyph:
 Gnuplot:
   type: programming
   color: "#f0a9f0"
-  lexer: Gnuplot
   extensions:
   - .gp
   - .gnu
@@ -956,7 +893,6 @@ Go:
 Golo:
   type: programming
   color: "#f6a51f"
-  lexer: Golo
   extensions:
   - .golo
 
@@ -972,13 +908,11 @@ Gosu:
 
 Grace:
   type: programming
-  lexer: Text only
   extensions:
   - .grace
 
 Grammatical Framework:
   type: programming
-  lexer: Haskell
   aliases:
   - gf
   wrap: false
@@ -990,7 +924,6 @@ Grammatical Framework:
 
 Graph Modeling Language:
   type: data
-  lexer: Text only
   extensions:
   - .gml
 
@@ -1022,7 +955,6 @@ Groovy:
 
 Groovy Server Pages:
   group: Groovy
-  lexer: Java Server Page
   aliases:
   - gsp
   - java server page
@@ -1046,7 +978,6 @@ HTML+Django:
   type: markup
   tm_scope: text.html.django
   group: HTML
-  lexer: HTML+Django/Jinja
   extensions:
   - .mustache
   - .jinja
@@ -1059,7 +990,6 @@ HTML+ERB:
   type: markup
   tm_scope: text.html.erb
   group: HTML
-  lexer: RHTML
   aliases:
   - erb
   extensions:
@@ -1080,7 +1010,6 @@ HTTP:
 
 Hack:
   type: programming
-  lexer: PHP
   ace_mode: php
   extensions:
   - .hh
@@ -1095,7 +1024,6 @@ Haml:
 
 Handlebars:
   type: markup
-  lexer: Handlebars
   aliases:
   - hbs
   extensions:
@@ -1105,7 +1033,6 @@ Handlebars:
 
 Harbour:
   type: programming
-  lexer: Text only
   color: "#0e60e3"
   extensions:
   - .hb
@@ -1128,7 +1055,6 @@ Haxe:
 
 Hy:
   type: programming
-  lexer: Hy
   ace_mode: clojure
   color: "#7891b1"
   extensions:
@@ -1138,7 +1064,6 @@ Hy:
 
 IDL:
   type: programming
-  lexer: IDL
   color: "#e3592c"
   extensions:
   - .pro
@@ -1146,7 +1071,6 @@ IDL:
 
 IGOR Pro:
   type: programming
-  lexer: Igor
   extensions:
   - .ipf
   aliases:
@@ -1167,18 +1091,15 @@ INI:
 Inno Setup:
   extensions:
   - .iss
-  lexer: Text only
 
 Idris:
   type: programming
-  lexer: Idris
   extensions:
   - .idr
   - .lidr
 
 Inform 7:
   type: programming
-  lexer: Inform 7
   wrap: true
   extensions:
   - .ni
@@ -1191,10 +1112,8 @@ Inform 7:
 Inno Setup:
   extensions:
   - .iss
-  lexer: Text only
 
 IRC log:
-  lexer: IRC logs
   search_term: irc
   aliases:
   - irc
@@ -1217,14 +1136,12 @@ Ioke:
 
 Isabelle:
   type: programming
-  lexer: Text only
   color: "#fdcd00"
   extensions:
   - .thy
 
 J:
   type: programming
-  lexer: Text only
   extensions:
   - .ijs
 
@@ -1250,7 +1167,6 @@ JSON:
 
 JSON5:
   type: data
-  lexer: JavaScript
   extensions:
   - .json5
   tm_scope: source.js
@@ -1259,7 +1175,6 @@ JSONLD:
   type: data
   group: JavaScript
   ace_mode: json
-  lexer: JavaScript
   extensions:
   - .jsonld
   tm_scope: source.js
@@ -1267,7 +1182,6 @@ JSONLD:
 JSONiq:
   type: programming
   ace_mode: jsoniq
-  lexer: XQuery
   extensions:
   - .jq
   tm_scope: source.xquery
@@ -1288,7 +1202,6 @@ Java:
 
 Java Server Pages:
   group: Java
-  lexer: Java Server Page
   search_term: jsp
   aliases:
   - jsp
@@ -1334,7 +1247,6 @@ Julia:
   color: "#a270ba"
 
 KRL:
-  lexer: Text only
   type: programming
   color: "#f5c800"
   extensions:
@@ -1342,7 +1254,6 @@ KRL:
 
 Kit:
   type: markup
-  lexer: HTML
   ace_mode: html
   extensions:
   - .kit
@@ -1361,7 +1272,6 @@ LFE:
   extensions:
   - .lfe
   color: "#004200"
-  lexer: Common Lisp
   group: Erlang
   tm_scope: source.lisp
 
@@ -1371,14 +1281,12 @@ LLVM:
 
 LOLCODE:
   type: programming
-  lexer: Text only
   extensions:
   - .lol
   color: "#cc9900"
 
 LSL:
   type: programming
-  lexer: LSL
   ace_mode: lsl
   extensions:
   - .lsl
@@ -1388,13 +1296,11 @@ LSL:
 
 LabVIEW:
   type: programming
-  lexer: Text only
   extensions:
   - .lvproj
 
 Lasso:
   type: programming
-  lexer: Lasso
   color: "#2584c3"
   extensions:
   - .lasso
@@ -1410,7 +1316,6 @@ Latte:
   type: markup
   color: "#A8FF97"
   group: HTML
-  lexer: Smarty
   extensions:
   - .latte
   tm_scope: source.smarty
@@ -1418,20 +1323,17 @@ Latte:
 Less:
   type: markup
   group: CSS
-  lexer: CSS
   extensions:
   - .less
   tm_scope: source.css.less
 
 LilyPond:
-  lexer: Text only
   extensions:
   - .ly
   - .ily
 
 Liquid:
   type: markup
-  lexer: Text only
   extensions:
   - .liquid
 
@@ -1445,7 +1347,6 @@ Literate CoffeeScript:
   type: programming
   tm_scope: source.litcoffee
   group: CoffeeScript
-  lexer: Text only
   ace_mode: markdown
   wrap: true
   search_term: litcoffee
@@ -1493,7 +1394,6 @@ Logtalk:
 
 LookML:
   type: programming
-  lexer: YAML
   ace_mode: yaml
   color: "#652B81"
   extensions:
@@ -1516,7 +1416,6 @@ Lua:
 
 M:
   type: programming
-  lexer: Common Lisp
   aliases:
   - mumps
   extensions:
@@ -1526,7 +1425,6 @@ M:
 
 MTML:
   type: markup
-  lexer: HTML
   color: "#0095d9"
   extensions:
   - .mtml
@@ -1555,7 +1453,6 @@ Mako:
 
 Markdown:
   type: prose
-  lexer: Text only
   ace_mode: markdown
   wrap: true
   extensions:
@@ -1569,7 +1466,6 @@ Markdown:
 
 Mask:
   type: markup
-  lexer: Mask
   color: "#f97732"
   ace_mode: scss
   extensions:
@@ -1585,7 +1481,6 @@ Mathematica:
   - .ma
   - .nb
   - .nbp
-  lexer: Mathematica
   aliases:
   - mma
 
@@ -1599,7 +1494,6 @@ Matlab:
 Max:
   type: programming
   color: "#ce279c"
-  lexer: JSON
   aliases:
   - max/msp
   - maxmsp
@@ -1614,7 +1508,6 @@ Max:
 
 MediaWiki:
   type: prose
-  lexer: Text only
   wrap: true
   extensions:
   - .mediawiki
@@ -1622,7 +1515,6 @@ MediaWiki:
 Mercury:
   type: programming
   color: "#abcdef"
-  lexer: Prolog
   ace_mode: prolog
   extensions:
   - .m
@@ -1636,7 +1528,6 @@ MiniD: # Legacy
 
 Mirah:
   type: programming
-  lexer: Ruby
   search_term: mirah
   color: "#c7a938"
   extensions:
@@ -1648,13 +1539,11 @@ Mirah:
 
 Monkey:
   type: programming
-  lexer: Monkey
   extensions:
   - .monkey
 
 Moocode:
   type: programming
-  lexer: MOOCode
   extensions:
   - .moo
 
@@ -1682,7 +1571,6 @@ Nemerle:
 
 NetLogo:
   type: programming
-  lexer: Common Lisp
   color: "#ff2b2b"
   extensions:
   - .nlogo
@@ -1690,7 +1578,6 @@ NetLogo:
 
 Nginx:
   type: markup
-  lexer: Nginx configuration file
   extensions:
   - .nginxconf
   tm_scope: source.nginx
@@ -1706,14 +1593,12 @@ Nimrod:
 
 Nit:
   type: programming
-  lexer: Text only
   color: "#0d8921"
   extensions:
   - .nit
 
 Nix:
   type: programming
-  lexer: Nix
   extensions:
   - .nix
   aliases:
@@ -1721,7 +1606,6 @@ Nix:
 
 Nu:
   type: programming
-  lexer: Scheme
   color: "#c9df40"
   aliases:
   - nush
@@ -1753,7 +1637,6 @@ OCaml:
 
 ObjDump:
   type: data
-  lexer: objdump
   extensions:
   - .objdump
   tm_scope: objdump.x86asm
@@ -1798,7 +1681,6 @@ Omgrofl:
   extensions:
   - .omgrofl
   color: "#cabbff"
-  lexer: Text only
 
 Opa:
   type: programming
@@ -1808,14 +1690,12 @@ Opa:
 Opal:
   type: programming
   color: "#f7ede0"
-  lexer: Text only
   extensions:
   - .opal
 
 OpenCL:
   type: programming
   group: C
-  lexer: C
   extensions:
   - .cl
   - .opencl
@@ -1834,20 +1714,17 @@ OpenEdge ABL:
 
 OpenSCAD:
   type: programming
-  lexer: Text only
   extensions:
   - .scad
 
 Org:
   type: prose
-  lexer: Text only
   wrap: true
   extensions:
   - .org
 
 Ox:
   type: programming
-  lexer: Text only
   extensions:
   - .ox
   - .oxh
@@ -1855,14 +1732,12 @@ Ox:
 
 Oxygene:
   type: programming
-  lexer: Text only
   color: "#5a63a3"
   extensions:
   - .oxygene
 
 PAWN:
   type: programming
-  lexer: C++
   color: "#dbb284"
   extensions:
   - .pwn
@@ -1892,7 +1767,6 @@ PHP:
 
 Pan:
   type: programming
-  lexer: Pan
   color: '#cc0000'
   extensions:
   - .pan
@@ -1900,21 +1774,18 @@ Pan:
 Papyrus:
   type: programming
   color: "#6600cc"
-  lexer: Text only
   extensions:
   - .psc
 
 Parrot:
   type: programming
   color: "#f3ca0a"
-  lexer: Text only
   extensions:
   - .parrot # Dummy extension
 
 Parrot Internal Representation:
   group: Parrot
   type: programming
-  lexer: Text only
   aliases:
   - pir
   extensions:
@@ -1923,7 +1794,6 @@ Parrot Internal Representation:
 Parrot Assembly:
   group: Parrot
   type: programming
-  lexer: Text only
   aliases:
   - pasm
   extensions:
@@ -1931,7 +1801,6 @@ Parrot Assembly:
 
 Pascal:
   type: programming
-  lexer: Delphi
   color: "#b0ce4e"
   extensions:
   - .pas
@@ -1975,21 +1844,18 @@ Perl6:
 PigLatin:
   type: programming
   color: "#fcd7de"
-  lexer: Text only
   extensions:
   - .pig
 
 Pike:
   type: programming
   color: "#066ab2"
-  lexer: Pike
   extensions:
   - .pike
   - .pmod
 
 Pod:
   type: prose
-  lexer: Text only
   ace_mode: perl
   wrap: true
   extensions:
@@ -1998,7 +1864,6 @@ Pod:
 PogoScript:
   type: programming
   color: "#d80074"
-  lexer: Text only
   extensions:
   - .pogo
 
@@ -2023,14 +1888,12 @@ PowerShell:
 
 Processing:
   type: programming
-  lexer: Java
   color: "#2779ab"
   extensions:
   - .pde
 
 Prolog:
   type: programming
-  lexer: Logtalk
   color: "#74283c"
   extensions:
   - .pl
@@ -2040,7 +1903,6 @@ Prolog:
 
 Propeller Spin:
   type: programming
-  lexer: Text only
   color: "#2b446d"
   extensions:
   - .spin
@@ -2065,14 +1927,12 @@ Puppet:
 Pure Data:
   type: programming
   color: "#91de79"
-  lexer: Text only
   extensions:
   - .pd
 
 PureScript:
   type: programming
   color: "#bcdc53"
-  lexer: Haskell
   extensions:
   - .purs
   tm_scope: source.haskell
@@ -2105,7 +1965,6 @@ Python:
 Python traceback:
   type: data
   group: Python
-  lexer: Python Traceback
   searchable: false
   extensions:
   - .pytb
@@ -2119,7 +1978,6 @@ QML:
   tm_scope: source.qml
 
 QMake:
-  lexer: Text only
   extensions:
   - .pro
   - .pri
@@ -2127,7 +1985,6 @@ QMake:
 R:
   type: programming
   color: "#198ce7"
-  lexer: S
   aliases:
   - R
   - Rscript
@@ -2145,7 +2002,6 @@ R:
 
 RDoc:
   type: prose
-  lexer: Rd
   ace_mode: rdoc
   wrap: true
   extensions:
@@ -2154,7 +2010,6 @@ RDoc:
 
 REALbasic:
   type: programming
-  lexer: VB.net
   extensions:
   - .rbbas
   - .rbfrm
@@ -2175,7 +2030,6 @@ RHTML:
 
 RMarkdown:
   type: prose
-  lexer: Text only
   wrap: true
   ace_mode: markdown
   extensions:
@@ -2184,7 +2038,6 @@ RMarkdown:
 
 Racket:
   type: programming
-  lexer: Racket
   color: "#ae17ff"
   extensions:
   - .rkt
@@ -2195,7 +2048,6 @@ Racket:
 
 Ragel in Ruby Host:
   type: programming
-  lexer: Ragel in Ruby Host
   color: "#ff9c2e"
   extensions:
   - .rl
@@ -2212,7 +2064,6 @@ Raw token data:
 
 Rebol:
   type: programming
-  lexer: REBOL
   color: "#358a5b"
   extensions:
   - .reb
@@ -2223,7 +2074,6 @@ Rebol:
 
 Red:
   type: programming
-  lexer: Text only
   color: "#ee0000"
   extensions:
   - .red
@@ -2244,7 +2094,6 @@ RobotFramework:
 
 Rouge:
   type: programming
-  lexer: Clojure
   ace_mode: clojure
   color: "#cc0088"
   extensions:
@@ -2306,7 +2155,6 @@ Rust:
 SAS:
   type: programming
   color: "#1E90FF"
-  lexer: Text only
   extensions:
   - .sas
 
@@ -2321,7 +2169,6 @@ SCSS:
 SQF:
   type: programming
   color: "#FFCB1F"
-  lexer: C++
   extensions:
   - .sqf
   - .hqf
@@ -2341,14 +2188,12 @@ SQL:
 STON:
   type: data
   group: Smalltalk
-  lexer: JSON
   extensions:
   - .ston
   tm_scope: source.json
 
 Sage:
   type: programming
-  lexer: Python
   group: Python
   extensions:
   - .sage
@@ -2403,13 +2248,11 @@ Scilab:
 Self:
   type: programming
   color: "#0579aa"
-  lexer: Text only
   extensions:
   - .self
 
 Shell:
   type: programming
-  lexer: Bash
   search_term: bash
   color: "#89e051"
   aliases:
@@ -2435,7 +2278,6 @@ Shell:
 
 ShellSession:
   type: programming
-  lexer: Bash Session
   extensions:
   - .sh-session
   aliases:
@@ -2446,7 +2288,6 @@ ShellSession:
 Shen:
   type: programming
   color: "#120F14"
-  lexer: Text only
   extensions:
   - .shen
 
@@ -2460,7 +2301,6 @@ Slash:
 Slim:
   group: HTML
   type: markup
-  lexer: Slim
   color: "#ff8877"
   extensions:
   - .slim
@@ -2488,7 +2328,6 @@ SourcePawn:
 
 Squirrel:
   type: programming
-  lexer: C++
   extensions:
   - .nut
   tm_scope: source.c++
@@ -2507,7 +2346,6 @@ Standard ML:
 
 Stata:
   type: programming
-  lexer: Text only
   extensions:
   - .do
   - .ado
@@ -2520,21 +2358,18 @@ Stata:
 Stylus:
   type: markup
   group: CSS
-  lexer: Text only
   extensions:
   - .styl
 
 SuperCollider:
   type: programming
   color: "#46390b"
-  lexer: Text only
   extensions:
   - .scd
   - .sc
 
 Swift:
   type: programming
-  lexer: Swift
   color: "#ffac45"
   extensions:
   - .swift
@@ -2542,7 +2377,6 @@ Swift:
 SystemVerilog:
   type: programming
   color: "#343761"
-  lexer: systemverilog
   extensions:
   - .sv
   - .svh
@@ -2556,7 +2390,6 @@ TOML:
 
 TXL:
   type: programming
-  lexer: Text only
   extensions:
   - .txl
 
@@ -2611,7 +2444,6 @@ Tea:
 
 Textile:
   type: prose
-  lexer: Text only
   ace_mode: textile
   wrap: true
   extensions:
@@ -2620,7 +2452,6 @@ Textile:
 Turing:
   type: programming
   color: "#45f715"
-  lexer: Text only
   extensions:
   - .t
   - .tu
@@ -2628,7 +2459,6 @@ Turing:
 Twig:
   type: markup
   group: PHP
-  lexer: HTML+Django/Jinja
   extensions:
   - .twig
   tm_scope: text.html.twig
@@ -2645,7 +2475,6 @@ TypeScript:
 Unified Parallel C:
   type: programming
   group: C
-  lexer: C
   ace_mode: c_cpp
   color: "#755223"
   extensions:
@@ -2655,14 +2484,12 @@ Unified Parallel C:
 UnrealScript:
   type: programming
   color: "#a54c4d"
-  lexer: Java
   extensions:
   - .uc
   tm_scope: source.java
 
 VCL:
   type: programming
-  lexer: Perl
   ace_mode: perl
   color: "#0298c3"
   extensions:
@@ -2671,7 +2498,6 @@ VCL:
 
 VHDL:
   type: programming
-  lexer: vhdl
   color: "#543978"
   extensions:
   - .vhdl
@@ -2692,7 +2518,6 @@ Vala:
 
 Verilog:
   type: programming
-  lexer: verilog
   color: "#848bf3"
   extensions:
   - .v
@@ -2714,7 +2539,6 @@ VimL:
 
 Visual Basic:
   type: programming
-  lexer: VB.net
   color: "#945db7"
   extensions:
   - .vb
@@ -2732,7 +2556,6 @@ Visual Basic:
 
 Volt:
     type: programming
-    lexer: D
     color: "#0098db"
     extensions:
     - .volt
@@ -2740,7 +2563,6 @@ Volt:
 
 XC:
   type: programming
-  lexer: C
   extensions:
   - .xc
   tm_scope: source.c
@@ -2824,7 +2646,6 @@ XML:
 
 XProc:
   type: programming
-  lexer: XML
   extensions:
   - .xpl
   - .xproc
@@ -2841,7 +2662,6 @@ XQuery:
   - .xqy
 
 XS:
-  lexer: C
   extensions:
   - .xs
   tm_scope: source.c
@@ -2857,7 +2677,6 @@ XSLT:
 
 Xojo:
   type: programming
-  lexer: VB.net
   extensions:
   - .xojo_code
   - .xojo_menu
@@ -2885,7 +2704,6 @@ YAML:
 
 Zephir:
   type: programming
-  lexer: PHP
   color: "#118f9e"
   extensions:
   - .zep
@@ -2893,7 +2711,6 @@ Zephir:
 
 Zimpl:
   type: programming
-  lexer: Text only
   extensions:
   - .zimpl
   - .zmpl
@@ -2908,7 +2725,6 @@ eC:
 
 edn:
   type: data
-  lexer: Clojure
   ace_mode: clojure
   color: "#db5855"
   extensions:
@@ -2918,25 +2734,21 @@ edn:
 fish:
   type: programming
   group: Shell
-  lexer: Text only
   extensions:
   - .fish
 
 mupad:
-  lexer: MuPAD
   extensions:
   - .mu
 
 nesC:
   type: programming
   color: "#ffce3b"
-  lexer: nesC
   extensions:
   - .nc
 
 ooc:
   type: programming
-  lexer: Ooc
   color: "#b0b77e"
   extensions:
   - .ooc
@@ -2953,7 +2765,6 @@ reStructuredText:
 
 wisp:
   type: programming
-  lexer: Clojure
   ace_mode: clojure
   color: "#7582D1"
   extensions:
@@ -2962,7 +2773,6 @@ wisp:
 
 xBase:
   type: programming
-  lexer: Text only
   color: "#3a4040"
   extensions:
   - .prg
diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb
index 27eafaa4..c8777321 100644
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "3.5.2"
+  VERSION = "4.0.0"
 end
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 1d37050d..fe3f38ee 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -4,13 +4,10 @@ require 'linguist/samples'
 require 'test/unit'
 require 'mocha/setup'
 require 'mime/types'
-require 'pygments'
 
 class TestBlob < Test::Unit::TestCase
   include Linguist
 
-  Lexer = Pygments::Lexer
-
   def setup
     # git blobs are normally loaded as ASCII-8BIT since they may contain data
     # with arbitrary encoding not known ahead of time
@@ -469,24 +466,7 @@ class TestBlob < Test::Unit::TestCase
     end
   end
 
-  def test_lexer
-    assert_equal Lexer['Ruby'], blob("Ruby/foo.rb").lexer
-  end
-
-  def test_colorize
-    assert_equal <<-HTML.chomp, blob("Ruby/foo.rb").colorize
-<div class="highlight"><pre><span class="k">module</span> <span class="nn">Foo</span>
-<span class="k">end</span>
-</pre></div>
-    HTML
-  end
-
-  def test_colorize_does_skip_minified_files
-    assert_nil blob("JavaScript/jquery-1.6.1.min.js").colorize
-  end
-
-  # Pygments.rb was taking exceeding long on this particular file
-  def test_colorize_doesnt_blow_up_with_files_with_high_ratio_of_long_lines
-    assert_nil blob("JavaScript/steelseries-min.js").colorize
+  def test_minified_files_not_safe_to_highlight
+    assert !blob("JavaScript/jquery-1.6.1.min.js").safe_to_colorize?
   end
 end
diff --git a/test/test_language.rb b/test/test_language.rb
index 4adc8efe..cd48bc75 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -1,65 +1,9 @@
 require 'linguist/language'
-
 require 'test/unit'
-require 'pygments'
 
 class TestLanguage < Test::Unit::TestCase
   include Linguist
 
-  Lexer = Pygments::Lexer
-
-  def test_lexer
-    assert_equal Lexer['ActionScript 3'], Language['ActionScript'].lexer
-    assert_equal Lexer['AspectJ'], Language['AspectJ'].lexer
-    assert_equal Lexer['Bash'], Language['Gentoo Ebuild'].lexer
-    assert_equal Lexer['Bash'], Language['Gentoo Eclass'].lexer
-    assert_equal Lexer['Bash'], Language['Shell'].lexer
-    assert_equal Lexer['C'], Language['OpenCL'].lexer
-    assert_equal Lexer['C'], Language['XS'].lexer
-    assert_equal Lexer['C++'], Language['C++'].lexer
-    assert_equal Lexer['Chapel'], Language['Chapel'].lexer
-    assert_equal Lexer['Coldfusion HTML'], Language['ColdFusion'].lexer
-    assert_equal Lexer['Coq'], Language['Coq'].lexer
-    assert_equal Lexer['FSharp'], Language['F#'].lexer
-    assert_equal Lexer['FSharp'], Language['F#'].lexer
-    assert_equal Lexer['Fortran'], Language['FORTRAN'].lexer
-    assert_equal Lexer['Gherkin'], Language['Cucumber'].lexer
-    assert_equal Lexer['Groovy'], Language['Groovy'].lexer
-    assert_equal Lexer['HTML'], Language['HTML'].lexer
-    assert_equal Lexer['HTML+Django/Jinja'], Language['HTML+Django'].lexer
-    assert_equal Lexer['HTML+PHP'], Language['HTML+PHP'].lexer
-    assert_equal Lexer['HTTP'], Language['HTTP'].lexer
-    assert_equal Lexer['JSON'], Language['JSON'].lexer
-    assert_equal Lexer['Java'], Language['ChucK'].lexer
-    assert_equal Lexer['Java'], Language['Java'].lexer
-    assert_equal Lexer['JavaScript'], Language['JavaScript'].lexer
-    assert_equal Lexer['LSL'], Language['LSL'].lexer
-    assert_equal Lexer['MOOCode'], Language['Moocode'].lexer
-    assert_equal Lexer['MuPAD'], Language['mupad'].lexer
-    assert_equal Lexer['NASM'], Language['Assembly'].lexer
-    assert_equal Lexer['OCaml'], Language['OCaml'].lexer
-    assert_equal Lexer['Ooc'], Language['ooc'].lexer
-    assert_equal Lexer['OpenEdge ABL'], Language['OpenEdge ABL'].lexer
-    assert_equal Lexer['REBOL'], Language['Rebol'].lexer
-    assert_equal Lexer['RHTML'], Language['HTML+ERB'].lexer
-    assert_equal Lexer['RHTML'], Language['RHTML'].lexer
-    assert_equal Lexer['Ruby'], Language['Crystal'].lexer
-    assert_equal Lexer['Ruby'], Language['Mirah'].lexer
-    assert_equal Lexer['Ruby'], Language['Ruby'].lexer
-    assert_equal Lexer['S'], Language['R'].lexer
-    assert_equal Lexer['Common Lisp'], Language['Emacs Lisp'].lexer
-    assert_equal Lexer['Scheme'], Language['Nu'].lexer
-    assert_equal Lexer['Racket'], Language['Racket'].lexer
-    assert_equal Lexer['Scheme'], Language['Scheme'].lexer
-    assert_equal Lexer['Standard ML'], Language['Standard ML'].lexer
-    assert_equal Lexer['TeX'], Language['TeX'].lexer
-    assert_equal Lexer['Verilog'], Language['Verilog'].lexer
-    assert_equal Lexer['XSLT'], Language['XSLT'].lexer
-    assert_equal Lexer['aspx-vb'], Language['ASP'].lexer
-    assert_equal Lexer['haXe'], Language['Haxe'].lexer
-    assert_equal Lexer['reStructuredText'], Language['reStructuredText'].lexer
-  end
-
   def test_find_by_alias
     assert_equal Language['ASP'], Language.find_by_alias('asp')
     assert_equal Language['ASP'], Language.find_by_alias('aspx')
@@ -421,22 +365,4 @@ class TestLanguage < Test::Unit::TestCase
   def test_by_type
     assert !Language.by_type(:prose).nil?
   end
-
-  def test_colorize
-    assert_equal <<-HTML.chomp, Language['Ruby'].colorize("def foo\n  'foo'\nend\n")
-<div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span>
-  <span class="s1">&#39;foo&#39;</span>
-<span class="k">end</span>
-</pre></div>
-    HTML
-  end
-
-  def test_colorize_with_options
-    assert_equal <<-HTML.chomp, Language['Ruby'].colorize("def foo\n  'foo'\nend\n", :options => { :cssclass => "highlight highlight-ruby" })
-<div class="highlight highlight-ruby"><pre><span class="k">def</span> <span class="nf">foo</span>
-  <span class="s1">&#39;foo&#39;</span>
-<span class="k">end</span>
-</pre></div>
-    HTML
-  end
 end
diff --git a/vendor/cache/json-1.8.1.gem b/vendor/cache/json-1.8.1.gem
deleted file mode 100644
index d903086b..00000000
Binary files a/vendor/cache/json-1.8.1.gem and /dev/null differ
diff --git a/vendor/cache/posix-spawn-0.3.9.gem b/vendor/cache/posix-spawn-0.3.9.gem
deleted file mode 100644
index ba4f19e9..00000000
Binary files a/vendor/cache/posix-spawn-0.3.9.gem and /dev/null differ
diff --git a/vendor/cache/pygments.rb-0.6.0.gem b/vendor/cache/pygments.rb-0.6.0.gem
deleted file mode 100644
index 7146f3d8..00000000
Binary files a/vendor/cache/pygments.rb-0.6.0.gem and /dev/null differ
diff --git a/vendor/cache/yajl-ruby-1.1.0.gem b/vendor/cache/yajl-ruby-1.1.0.gem
deleted file mode 100644
index 3fcb580e..00000000
Binary files a/vendor/cache/yajl-ruby-1.1.0.gem and /dev/null differ