diff --git a/.local.vimrc b/.local.vimrc
index ccf2cef..c2f3dfb 100644
--- a/.local.vimrc
+++ b/.local.vimrc
@@ -2,5 +2,7 @@ set expandtab
 set shiftwidth=2
 set tabstop=2
 set softtabstop=2
-set ff=unix
-set eol
+if &modifiable
+  set ff=unix
+  set eol
+endif
diff --git a/Gemfile b/Gemfile
index 6ddf02a..44631f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'jekyll'
+gem 'jekyll', '~>3.0.0.pre.beta9'
 gem 'i18n'
+gem 'redcarpet'
 
 group :jekyll_plugins do
   gem 'jekyll-paginate'
diff --git a/Gemfile.lock b/Gemfile.lock
index fdbfae4..7d3e1a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,20 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    blankslate (2.1.2.4)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
     colorator (0.1)
     css_press (0.3.2)
       csspool-st (= 3.1.2)
       json
     csspool-st (3.1.2)
     execjs (2.6.0)
-    fast-stemmer (1.0.2)
     ffi (1.9.10)
     html_press (0.8.2)
       htmlentities
@@ -22,24 +14,15 @@ GEM
       multi_js (>= 0.1.0)
     htmlentities (4.3.4)
     i18n (0.7.0)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
+    jekyll (3.0.0.pre.beta9)
       colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-gist (1.3.4)
     jekyll-minify-html (1.1.0)
       html_press (~> 0.8.2)
       jekyll (>= 0.12)
@@ -49,8 +32,8 @@ GEM
     jekyll-watch (1.3.0)
       listen (~> 3.0)
     json (1.8.3)
-    kramdown (1.8.0)
-    liquid (2.6.3)
+    kramdown (1.9.0)
+    liquid (3.0.6)
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -59,33 +42,26 @@ GEM
       css_press
     multi_js (0.1.0)
       uglifier (~> 2)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.3.2)
+    redcarpet (3.3.3)
+    rouge (1.10.1)
     safe_yaml (1.0.4)
     sass (3.4.18)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   i18n
-  jekyll
+  jekyll (~> 3.0.0.pre.beta9)
   jekyll-minify-html
   jekyll-paginate
+  redcarpet
 
 BUNDLED WITH
    1.10.6
diff --git a/_config.yml b/_config.yml
index f5544ad..5577fa0 100644
--- a/_config.yml
+++ b/_config.yml
@@ -12,7 +12,7 @@ highlighter:    pygments
 
 source:         .
 destination:    ./_site
-plugins:        ./_plugins
+plugins_dir:    ./_plugins
 include:        ['.htaccess']
 exclude:        ['recipes.sublime-project','recipes.sublime-workspace', 'vendor', 'Gemfile', 'Gemfile.lock', 'Makefile']
 paginate:       10
diff --git a/_plugins/asset_bundler b/_plugins/asset_bundler
index 37339b3..ec2b2cd 160000
--- a/_plugins/asset_bundler
+++ b/_plugins/asset_bundler
@@ -1 +1 @@
-Subproject commit 37339b388873886d7be467b8654b5d4aa0b5cf6f
+Subproject commit ec2b2cd8dd8d622d3ada6bb1171a1f5c187c8448
diff --git a/archive.html b/archive.html
index 54c1c49..18d6b00 100644
--- a/archive.html
+++ b/archive.html
@@ -6,7 +6,8 @@ title: Archiv
 <div id="home">
 	<h1>Archiv</h1>
 	<ul class="posts">
-		{% for post in site.posts | sort: 'title' %}
+		{% assign aposts = site.posts | sort: 'title' %}
+		{% for post in aposts %}
 		<li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
 		{% endfor %}
 	</ul>