diff --git a/Makefile b/Makefile
index 197d053ce..9f801b57e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ setup:
 	go get -u github.com/golang/dep/cmd/dep
 	go get -u github.com/pierrre/gotestcover
 	go get -u golang.org/x/tools/cmd/cover
+	go get -u github.com/apex/static/cmd/static-docs
 	dep ensure
 	gometalinter --install
 
@@ -38,19 +39,13 @@ HIGHLIGHT=https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0
 
 # Generate the static documentation
 static:
+	rm -rf ../goreleaser.github.io/theme
 	@static-docs \
 		--in docs \
 		--out ../goreleaser.github.io \
 		--title GoReleaser \
 		--subtitle "Deliver Go binaries as fast and easily as possible" \
-		--google UA-106198408-1 \
-		--script "$(HIGHLIGHT)/highlight.min.js" \
-		--script "$(HIGHLIGHT)/languages/go.min.js" \
-		--script "$(HIGHLIGHT)/languages/yaml.min.js" \
-		--script "$(HIGHLIGHT)/languages/dockerfile.min.js" \
-		--style "$(HIGHLIGHT)/styles/atom-one-dark.min.css" \
-		--inline-script 'hljs.initHighlightingOnLoad();' \
-		--inline-style 'pre { padding: 0; }'
+		--google UA-106198408-1
 
 # Show to-do items per file.
 todo:
diff --git a/docs/020-environment.md b/docs/020-environment.md
index 816fc7432..9d9cb3399 100644
--- a/docs/020-environment.md
+++ b/docs/020-environment.md
@@ -2,7 +2,7 @@
 title: Environment
 ---
 
-### GitHub Token
+## GitHub Token
 
 GoReleaser requires a GitHub API token with the `repo` scope selected to
 deploy the artifacts to GitHub.
@@ -12,7 +12,7 @@ This token should be added to the environment variables as `GITHUB_TOKEN`.
 Here is how to do it with Travis CI:
 [Defining Variables in Repository Settings](https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings).
 
-### The dist folder
+## The dist folder
 
 By default, GoReleaser will create its artifacts in the `./dist` folder.
 If you must, you can change it by setting it in the `.goreleaser.yml` file:
@@ -23,7 +23,7 @@ If you must, you can change it by setting it in the `.goreleaser.yml` file:
 dist: another-folder-that-is-not-dist
 ```
 
-### Using the `main.version`
+## Using the `main.version`
 
 GoReleaser always sets a `main.version` *ldflag*.
 You can use it in your `main.go` file:
diff --git a/docs/apple-touch-icon-144-precomposed.png b/docs/apple-touch-icon-144-precomposed.png
deleted file mode 100644
index c1aefd7ad..000000000
Binary files a/docs/apple-touch-icon-144-precomposed.png and /dev/null differ
diff --git a/docs/favicon.ico b/docs/favicon.ico
deleted file mode 100644
index 77b2a8e7f..000000000
Binary files a/docs/favicon.ico and /dev/null differ