diff --git a/_config.yml b/_config.yml
index bbc25a9e4..d89caf6aa 100644
--- a/_config.yml
+++ b/_config.yml
@@ -62,7 +62,7 @@ permalink:     pretty
 paginate_path: 'page:num'
 paginate: 10
 
-markdown:      maruku
+markdown:      kramdown
 markdown_ext:  markdown,mkd,mkdn,md
 textile_ext:   textile
 
@@ -106,20 +106,5 @@ kramdown:
 redcloth:
   hard_breaks: true
 
-#
-# jekyll-assets: see more at https://github.com/ixti/jekyll-assets
-#
-assets:
-
-  dirname: assets
-  baseurl: /assets/
-  sources:
-    - _assets/javascripts
-    - _assets/stylesheets
-    - _assets/images
-  js_compressor: uglifier
-  css_compressor: sass
-  cachebust: none
-  cache: false
-  gzip: [ text/css, application/javascript ]
-  debug: false
\ No newline at end of file
+sass:
+    style: :compressed
diff --git a/_includes/_scripts.html b/_includes/_scripts.html
index f0894baf5..6a50877fe 100644
--- a/_includes/_scripts.html
+++ b/_includes/_scripts.html
@@ -1,5 +1,5 @@
 <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-{% javascript main %}
+<script type="text/javascript" src="/assets/javascripts/main.js"></script>
 {% if site.inc.sharing.twitter %}<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>{% endif %}
 {% if site.inc.sharing.facebook %}<div id="fb-root"></div>
 <script>(function(d, s, id) {
diff --git a/_layouts/base.html b/_layouts/base.html
index 56e1e13a2..93e520692 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% if page.title %}{{ page.title }} &mdash; {{ site.inc.title }}{% else %}{{ site.inc.title }} &mdash; {{ site.inc.subtitle }}{% endif %}</title>
     {% if site.inc.google_font %}<link href="https://fonts.googleapis.com/css?family={{ site.inc.google_font }}" rel="stylesheet" type="text/css">{% endif %}
-    {% stylesheet main %}
+    <link href="/assets/stylesheets/main.css" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="apple-touch-icon" href="/images/{{ site.inc.logo }}"/>
     <link href="{{ site_url }}/feed.xml" rel="alternate" type="application/rss+xml" title="{{ site.inc.title }}" />
diff --git a/_plugins/_ext.rb b/_plugins/_ext.rb
deleted file mode 100644
index cf3fae85f..000000000
--- a/_plugins/_ext.rb
+++ /dev/null
@@ -1 +0,0 @@
-require "jekyll-assets"
\ No newline at end of file
diff --git a/_assets/stylesheets/_animate.scss b/_sass/_animate.scss
similarity index 100%
rename from _assets/stylesheets/_animate.scss
rename to _sass/_animate.scss
diff --git a/_assets/stylesheets/_article.scss b/_sass/_article.scss
similarity index 100%
rename from _assets/stylesheets/_article.scss
rename to _sass/_article.scss
diff --git a/_assets/stylesheets/_base.scss b/_sass/_base.scss
similarity index 100%
rename from _assets/stylesheets/_base.scss
rename to _sass/_base.scss
diff --git a/_assets/stylesheets/_bootstrap.scss b/_sass/_bootstrap.scss
similarity index 100%
rename from _assets/stylesheets/_bootstrap.scss
rename to _sass/_bootstrap.scss
diff --git a/_assets/stylesheets/_icons.scss b/_sass/_icons.scss
similarity index 100%
rename from _assets/stylesheets/_icons.scss
rename to _sass/_icons.scss
diff --git a/_assets/stylesheets/_nav.scss b/_sass/_nav.scss
similarity index 100%
rename from _assets/stylesheets/_nav.scss
rename to _sass/_nav.scss
diff --git a/_assets/stylesheets/_responsive.scss b/_sass/_responsive.scss
similarity index 100%
rename from _assets/stylesheets/_responsive.scss
rename to _sass/_responsive.scss
diff --git a/_assets/stylesheets/_syntax.scss b/_sass/_syntax.scss
similarity index 100%
rename from _assets/stylesheets/_syntax.scss
rename to _sass/_syntax.scss
diff --git a/_assets/javascripts/main.js b/assets/javascripts/main.js
similarity index 100%
rename from _assets/javascripts/main.js
rename to assets/javascripts/main.js
diff --git a/_assets/stylesheets/main.scss b/assets/stylesheets/main.scss
similarity index 72%
rename from _assets/stylesheets/main.scss
rename to assets/stylesheets/main.scss
index 22f8ed7d6..2fc1c8614 100644
--- a/_assets/stylesheets/main.scss
+++ b/assets/stylesheets/main.scss
@@ -1,3 +1,8 @@
+---
+# this ensures Jekyll reads the file to be transformed into CSS later
+# only Main files contain this front matter, not partials.
+---
+
 /* CONFIGURATION */
 
 /* Bodytext font */
@@ -19,4 +24,4 @@ $accent: #2077b2;
 @import "article";
 @import "icons";
 @import "syntax";
-@import "responsive";
\ No newline at end of file
+@import "responsive";