diff --git a/assets/sass/base/_all.sass b/assets/sass/base/_all.sass
new file mode 100644
index 00000000..64fd818d
--- /dev/null
+++ b/assets/sass/base/_all.sass
@@ -0,0 +1 @@
+@import 'code'
diff --git a/assets/sass/base/_code.sass b/assets/sass/base/_code.sass
new file mode 100644
index 00000000..8cf53086
--- /dev/null
+++ b/assets/sass/base/_code.sass
@@ -0,0 +1,3 @@
+code.hljs
+    background-color: inherit
+    padding: 0
diff --git a/assets/sass/site.sass b/assets/sass/site.sass
index 0e467d86..6e29d101 100644
--- a/assets/sass/site.sass
+++ b/assets/sass/site.sass
@@ -3,5 +3,6 @@
 
 @import 'base'
 @import 'mixins'
+@import 'base/all'
 @import 'components/all'
 @import 'pages/all'
diff --git a/bower.json b/bower.json
index 2ae43981..c88a3914 100644
--- a/bower.json
+++ b/bower.json
@@ -4,6 +4,7 @@
     "bootstrap-sass": "~3.3.6",
     "compass-breakpoint": "breakpoint-sass#~2.6.1",
     "font-awesome": "fontawesome#~4.5.0",
-    "jquery2": "^2.0.0"
+    "jquery2": "^2.0.0",
+    "highlightjs": "^9.9.0"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
index a3d8b9b0..05c8ec7c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -59,6 +59,7 @@ gulp.task('fonts', function() {
 gulp.task('styles', function() {
     return app.sass([
         config.bower.path + '/font-awesome/css/font-awesome.css',
+        config.bower.path + '/highlightjs/styles/default.css',
         config.sass.source + config.sass.pattern
     ], 'site.css');
 });
@@ -67,6 +68,7 @@ gulp.task('scripts', function() {
     return app.js([
         config.bower.path + '/jquery2/jquery.js',
         config.bower.path + '/bootstrap-sass/assets/javascripts/bootstrap.js',
+        config.bower.path + '/highlightjs/highlight.pack.js',
         config.js.source + config.js.pattern
     ], 'site.js');
 });
diff --git a/source/_partials/footer.html.twig b/source/_partials/footer.html.twig
index 09700496..045d911f 100644
--- a/source/_partials/footer.html.twig
+++ b/source/_partials/footer.html.twig
@@ -8,8 +8,6 @@
 
 <script src="{{ site.url }}/assets/js/site.js"></script>
 
-{% block scripts %}{% endblock %}
-
 {% if site.google_analytics_tracking_id %}
     <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '{{ site.google_analytics_tracking_id }}', 'auto'); ga('send', 'pageview');</script>
 {% endif %}
diff --git a/source/_views/default.html.twig b/source/_views/default.html.twig
index bc107c0e..82c9307c 100644
--- a/source/_views/default.html.twig
+++ b/source/_views/default.html.twig
@@ -20,5 +20,7 @@
         </div>{# .container #}
 
         {% include 'footer' %}
+
+        {% block scripts %}{% endblock %}
     </body>
 </html>
diff --git a/source/_views/post.html.twig b/source/_views/post.html.twig
index 3a82c499..6702ceb9 100644
--- a/source/_views/post.html.twig
+++ b/source/_views/post.html.twig
@@ -11,3 +11,7 @@
     {% include 'post/pager' %}
     {% include 'post/about-author' %}
 {% endblock %}
+
+{% block scripts %}
+    <script>hljs.initHighlightingOnLoad();</script>
+{% endblock %}