diff --git a/Module-status.md b/Module-status.md
index ef554ab..310513a 100644
--- a/Module-status.md
+++ b/Module-status.md
@@ -1,57 +1,48 @@
-## [sbt/io](https://github.com/sbt/io)
+* [sbt/sbt][] [![sbt-mvn-b][]][sbt-mvn] [![sbt-rel-b][]][sbt-rel] [![sbt-prs-b][]][sbt-prs]
+* [sbt/zinc][] [![zinc-mvn-b][]][zinc-mvn] [![zinc-rel-b][]][zinc-rel] [![zinc-prs-b][]][zinc-prs]
+* [sbt/lm][] [![lm-mvn-b][]][lm-mvn] [![lm-rel-b][]][lm-rel] [![lm-prs-b][]][lm-prs]
+* [sbt/util][] [![util-mvn-b][]][util-mvn] [![util-rel-b][]][util-rel] [![util-prs-b][]][util-prs]
+* [sbt/io][] [![io-mvn-b][]][io-mvn] [![io-rel-b][]][io-rel] [![io-prs-b][]][io-prs]
 
-* https://github.com/sbt/io/pulls
-* https://github.com/sbt/io/releases
-* https://bintray.com/sbt/maven-releases/io
+[sbt/sbt]: https://github.com/sbt/sbt
+[sbt-rel]: https://github.com/sbt/sbt/releases/latest
+[sbt-prs]: https://github.com/sbt/sbt/pulls?q=is:open
+[sbt-mvn]: https://search.maven.org/#search|ga|1|g:"org.scala-sbt"%20AND%20a:"sbt"
+[sbt-mvn-b]: https://img.shields.io/maven-central/v/org.scala-sbt/sbt.svg
+[sbt-rel-b]: https://img.shields.io/github/release/sbt/sbt.svg
+[sbt-prs-b]: https://img.shields.io/github/issues-pr/sbt/sbt.svg
 
-### latest
+[sbt/zinc]: https://github.com/sbt/zinc
+[zinc-rel]: https://github.com/sbt/zinc/releases/latest
+[zinc-prs]: https://github.com/sbt/zinc/pulls?q=is:open
+[zinc-mvn]: https://search.maven.org/#search|ga|1|g:"org.scala-sbt"%20AND%20a:"zinc_2.12"
+[zinc-mvn-b]: https://img.shields.io/maven-central/v/org.scala-sbt/zinc_2.12.svg
+[zinc-rel-b]: https://img.shields.io/github/release/sbt/zinc.svg
+[zinc-prs-b]: https://img.shields.io/github/issues-pr/sbt/zinc.svg
 
-* ![io version](https://img.shields.io/maven-central/v/org.scala-sbt/io_2.12.svg)
+[sbt/lm]: https://github.com/sbt/librarymanagement
+[lm-rel]: https://github.com/sbt/librarymanagement/releases/latest
+[lm-prs]: https://github.com/sbt/librarymanagement/pulls?q=is:open
+[lm-mvn]: https://search.maven.org/#search|ga|1|g:"org.scala-sbt"%20AND%20a:"librarymanagement-core_2.12"
+[lm-mvn-b]: https://img.shields.io/maven-central/v/org.scala-sbt/librarymanagement-core_2.12.svg
+[lm-rel-b]: https://img.shields.io/github/release/sbt/librarymanagement.svg
+[lm-prs-b]: https://img.shields.io/github/issues-pr/sbt/librarymanagement.svg
 
-## [sbt/util](https://github.com/sbt/util)
+[sbt/util]: https://github.com/sbt/util
+[util-rel]: https://github.com/sbt/util/releases/latest
+[util-prs]: https://github.com/sbt/util/pulls?q=is:open
+[util-mvn]: https://search.maven.org/#search|ga|1|g:"org.scala-sbt"%20AND%20a:"util-cache_2.12"
+[util-mvn-b]: https://img.shields.io/maven-central/v/org.scala-sbt/util-cache_2.12.svg
+[util-rel-b]: https://img.shields.io/github/release/sbt/util.svg
+[util-prs-b]: https://img.shields.io/github/issues-pr/sbt/util.svg
 
-* https://github.com/sbt/util/pulls
-* https://github.com/sbt/util/releases
-* https://bintray.com/sbt/maven-releases/util
+[sbt/io]: https://github.com/sbt/io
+[io-rel]: https://github.com/sbt/io/releases/latest
+[io-prs]: https://github.com/sbt/io/pulls?q=is:open
+[io-mvn]: https://search.maven.org/#search|ga|1|g:"org.scala-sbt"%20AND%20a:"io_2.12"
+[io-mvn-b]: https://img.shields.io/maven-central/v/org.scala-sbt/io_2.12.svg
+[io-rel-b]: https://img.shields.io/github/release/sbt/io.svg
+[io-prs-b]: https://img.shields.io/github/issues-pr/sbt/io.svg
 
-### latest
-
-* ![util version](https://img.shields.io/maven-central/v/org.scala-sbt/util-cache_2.12.svg)
-
-## [sbt/librarymanagement](http://github.com/sbt/librarymanagement)
-
-* https://github.com/sbt/librarymanagement/pulls
-* https://github.com/sbt/librarymanagement/releases
-* https://bintray.com/sbt/maven-releases/librarymanagement
-
-### latest
-
-* ![lm version](https://img.shields.io/maven-central/v/org.scala-sbt/librarymanagement-core_2.12.svg)
-
-## [sbt/zinc](https://github.com/sbt/zinc)
-
-* https://github.com/sbt/zinc/pulls
-* https://github.com/sbt/zinc/releases
-* https://bintray.com/sbt/maven-releases/zinc
-
-### latest
-
-* ![zinc version](https://img.shields.io/maven-central/v/org.scala-sbt/zinc_2.12.svg)
-
-## [sbt/sbt](https://github.com/sbt/sbt)
-
-* https://github.com/sbt/sbt/pulls
-* https://github.com/sbt/sbt/releases
-* https://bintray.com/sbt/maven-releases/sbt/
-
-### latest
-
-* ![sbt version](https://img.shields.io/maven-central/v/org.scala-sbt/sbt.svg)
-
-### dev branch 1.x
-
-## Additional links/info
-
-* https://bintray.com/sbt/notifications
-
-Search across modules: https://github.com/search?utf8=%E2%9C%93&q=repo%3Asbt%2Fsbt+repo%3Asbt%2Fzinc+repo%3Asbt%2Flibrarymanagement+repo%3Asbt%2Futil+repo%3Asbt%2Fio+fileToRichFile&type=Code
\ No newline at end of file
+Search across modules:
+* https://github.com/search?q=fileToRichFile%20repo:sbt/sbt%20repo:sbt/zinc%20repo:sbt/librarymanagement%20repo:sbt/util%20repo:sbt/io&type=Code