diff --git a/_config.yml b/_config.yml
index 450bcdb96..fa9e7e3fb 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,10 +1,10 @@
 # Site settings 
 title: Greenshot
 #email: getgreenshot@gmail.com
-description: "Greenshot - a free screenshot tool optimized for productivity"
+description: Greenshot - a free screenshot tool optimized for productivity
 baseurl: ""
 # TODO change URL to getgreenshot.org
-url: "http://greenshot.github.io"
+url: http://greenshot.github.io
 twitter_username: greenshot_tool
 github_username: greenshot
 #facebook: Greenshot.Tool
@@ -23,7 +23,6 @@ collections:
     permalink: /:year/:month/:day/:title/ 
 
 defaults:
- -
   scope:
     path: "faq"
     type: "faqs"
@@ -33,7 +32,7 @@ defaults:
 # Build settings
 markdown: kramdown
 permalink: pretty
-exclude: ['README.md', 'Gemfile.lock', 'Gemfile', 'CNAME', 'LICENSE', '*.sh']
+exclude: ['README.md', 'Gemfile.lock', 'Gemfile', 'CNAME', 'LICENSE', '*.sh', '.git']
 
 gems:
   - jemoji
@@ -41,5 +40,12 @@ gems:
   - jekyll-sitemap
   - jekyll-redirect-from
 
+# Jekyll 3 now only supports Kramdown for Markdown
 kramdown:
+  # Use GitHub flavored markdown, including triple backtick fenced code blocks
   input: GFM
+  # Jekyll 3 and GitHub Pages now only support rouge for syntax highlighting
+  syntax_highlighter: rouge
+  syntax_highlighter_opts:
+    # Use existing pygments syntax highlighting css
+    css_class: 'highlight'
diff --git a/pages/downloads.markdown b/pages/downloads.markdown
index 4d25bfe15..e77282000 100644
--- a/pages/downloads.markdown
+++ b/pages/downloads.markdown
@@ -24,7 +24,7 @@ tags: menu
 	<tr>
 		<td class="cta-description">
 		{% if latest_release %}
-			{{ latest_release.name }}<br>{{ latest_release.created_at | date_to_string %}}
+			{{ latest_release.name }}<br>{{ latest_release.created_at | date_to_string }}
 		{% endif %}
 		</td>
 	</tr>
diff --git a/pages/team.html b/pages/team.html
deleted file mode 100644
index 59705bcf4..000000000
--- a/pages/team.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: page
-title: Greenshot team
-permalink: /team/
-tags: menu
----
-Greenshot was brought to you by Thomas Braun, Jens Klingen and Robin Krom
-
diff --git a/pages/version-history.markdown b/pages/version-history.markdown
index eef8de433..9b87a434f 100644
--- a/pages/version-history.markdown
+++ b/pages/version-history.markdown
@@ -17,7 +17,7 @@ You'll find everything below.
 **{{ release.name }}**
 
 	{% for asset in release.assets %}
-- [{{ asset.name }}]({{ asset.browser_download_url }}) ({{ asset.created_at | date_to_string %}})
+- [{{ asset.name }}]({{ asset.browser_download_url }}) ({{ asset.created_at | date_to_string }})
  	{% endfor %}
 {% endfor %}