diff --git a/Gemfile b/Gemfile
index 4b8734cf..56b9cdee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,19 +3,14 @@ source 'https://rubygems.org'
 gem 'rake'
 
 # jekyll, which builds it all
-gem 'jekyll', '~>1.3.0'
+# 2.0 includes sass processing
+gem 'jekyll', '~>2.0'
 
 # JSON
 gem 'json'
 
-# SASS for CSS
-gem 'sass'
-
 # For `rake watch`
 gem 'rb-fsevent'
 
-# Redcarpet for Markdown
-gem 'redcarpet'
-
 # For markdown header cleanup
-gem 'sanitize'
+gem 'sanitize', '~>2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2324fda4..cd585ba5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,61 +1,79 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    classifier (1.3.3)
+    blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.1)
     colorator (0.1)
-    commander (4.1.5)
-      highline (~> 1.6.11)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
-    highline (1.6.20)
-    jekyll (1.3.0)
+    jekyll (2.2.0)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.2)
-      listen (~> 1.3)
-      maruku (~> 0.6.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.0)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.0.0)
+    jekyll-sass-converter (1.2.0)
+      sass (~> 3.2)
+    jekyll-watch (1.1.0)
+      listen (~> 2.7)
     json (1.8.1)
-    liquid (2.5.4)
-    listen (1.3.1)
+    kramdown (1.4.1)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    mini_portile (0.5.2)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.5.4)
+    mercenary (0.3.4)
+    mini_portile (0.6.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
-    safe_yaml (0.9.7)
+    redcarpet (3.1.2)
+    safe_yaml (1.0.3)
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
-    sass (3.2.12)
-    syntax (1.0.0)
+    sass (3.3.14)
+    timers (1.1.0)
+    toml (0.1.1)
+      parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 1.3.0)
+  jekyll (~> 2.0)
   json
   rake
   rb-fsevent
-  redcarpet
-  sanitize
-  sass
+  sanitize (~> 2.0)
diff --git a/Rakefile b/Rakefile
index f10e3179..9fd343cd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,19 +2,13 @@ require('rubygems')
 require('json')
 require('yaml')
 
-desc "generate css from sass"
-task :css do
-  system "sass --style=compressed _css/react.scss css/react.css"
-end
-
 desc "generate js from jsx"
 task :js do
   system "../bin/jsx _js js"
 end
 
-desc "watch css & js"
+desc "watch js"
 task :watch do
-  Process.spawn "sass --style=compressed --watch _css/react.scss:css/react.css"
   Process.spawn "../bin/jsx --watch _js js"
   Process.waitall
 end
@@ -34,4 +28,4 @@ task :release => [:update_version, :default] do
   system "jekyll build -d ../../react-gh-pages"
 end
 
-task :default => [:css, :js]
+task :default => [:js]
diff --git a/_config.yml b/_config.yml
index 630e3f86..8d702349 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,7 +10,7 @@ exclude:
 redcarpet:
   extensions:
   - fenced_code_blocks
-pygments: true
+highlighter: pygments
 name: React
 markdown: redcarpet
 react_version: 0.11.1
@@ -19,3 +19,6 @@ relative_permalinks: true
 paginate: 5
 paginate_path: "/blog/page:num/"
 timezone: America/Los_Angeles
+sass:
+  style: :compressed
+  sass_dir: _css
diff --git a/_css/react.scss b/css/react.scss
similarity index 99%
rename from _css/react.scss
rename to css/react.scss
index ce8c3da2..938f5593 100644
--- a/_css/react.scss
+++ b/css/react.scss
@@ -1,3 +1,5 @@
+---
+---
 @import 'bourbon/bourbon';
 @import '_variables';
 @import '_typography';