diff --git a/Featurecreep.md b/Featurecreep.md
index 4f3a7f1927e..52a906179c0 100644
--- a/Featurecreep.md
+++ b/Featurecreep.md
@@ -163,6 +163,7 @@ Sorry for some of them being in German, I'll tranlate them at some point.
 * [x] ListTaskRights, sollte überall gleich funktionieren, gibt ja mittlerweile auch eine Methode um liste von nem Task aus zu kriegen oder so
 * [x] Re-check all `{List|Namespace}{User|Team}` if really all parameters need to be exposed via json or are overwritten via param anyway.
 * [ ] Things like list/task order should use queries and not url params
+* [ ] Fix lint errors
 
 ### Linters
 
diff --git a/README.md b/README.md
index 992c0d93e21..03d7a4af292 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](LICENSE)
 [![Download](https://img.shields.io/badge/download-v0.5-brightgreen.svg)](https://storage.kolaente.de/minio/vikunja/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/api.svg)](https://hub.docker.com/r/vikunja/api/)
-[![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/swagger)
+[![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs)
 [![Go Report Card](https://goreportcard.com/badge/git.kolaente.de/vikunja/api)](https://goreportcard.com/report/git.kolaente.de/vikunja/api)
 [![cover.run](https://cover.run/go/code.vikunja.io/api.svg?style=flat&tag=golang-1.10)](https://cover.run/go?tag=golang-1.10&repo=code.vikunja.io%2Fapi) 
 
@@ -31,10 +31,13 @@ Try it on [try.vikunja.io](https://try.vikunja.io)!
 
 ## Docs
 
-* [Build from source](docs/setup/build-from-source.md)
-* [Development setup](docs/development-setup.md)
-* [Makefile](docs/development/make.md)
-* [Testing](docs/development/test.md)
+* [Installing](https://vikunja.io/docs/installing/)
+* [Build from source](https://vikunja.io/docs/build-from-sources/)
+* [Development setup](https://vikunja.io/docs/development/)
+* [Makefile](https://vikunja.io/docs/makefile/)
+* [Testing](https://vikunja.io/docs/testing/)
+
+All docs can be found on [the vikunja home page](https://vikunja.io/docs/).
 
 ### Roadmap
 
@@ -69,7 +72,7 @@ See [Featurecreep.md](Featurecreep.md) for even more! (mostly ideas, for now)
 
 ## Contributing
 
-Fork -> Push -> Pull-Request. Also see the [dev docs](docs/development-setup.md) for more infos.
+Fork -> Push -> Pull-Request. Also see the [dev docs](https://vikunja.io/docs/development/) for more infos.
 
 ## License