diff --git a/docs/Clients.md b/docs/Clients.md
index 22d9bcf0e..3f783347e 100644
--- a/docs/Clients.md
+++ b/docs/Clients.md
@@ -2,71 +2,70 @@
 Note: Additionnal clients may be working but theses are officially supporting Pleroma.
 Feel free to contact us to be added to this list!
 
-## Brutaldon
-- Homepage: <https://jfm.carcosa.net/projects/software/brutaldon/>
-- Source Code: <https://github.com/jfmcbrayer/brutaldon>
-- Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc)
-- Platforms: Web
-
-## Sengi
-- Source Code: <https://github.com/NicolasConstant/sengi>
-- Contact: [@sengi_app@mastodon.social](https://mastodon.social/users/sengi_app)
-- Platforms: Web
-- Note(2019-01-28): The development is currently in a early stage.
-
-## Halcyon
-- Source Code: <https://notabug.org/halcyon-suite/halcyon>
-- Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon)
-- Platforms: Web
-
-## Pinafore
-- Homepage: <https://pinafore.social/>
-- Source Code: <https://github.com/nolanlawson/pinafore>
-- Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore)
-- Note: Pleroma support is a secondary goal
-- Platforms: Web
-
-## Roma
-- Homepage: <http://www.pleroma.com/>
-- Source Code: ???
-- Platforms: iOS, Android
-
-## Roma for Desktop
+## Desktop
+### Roma for Desktop
 - Homepage: <http://www.pleroma.com/desktop-app/>
 - Source Code: ???
 - Platforms: Windows, Mac, (Linux?)
 
-## Mastalab
-- Source Code: <https://gitlab.com/tom79/mastalab/>
-- Contact: [@tom79@mastodon.social](https://mastodon.social/users/tom79)
-- Platforms: Android
-
-## Whalebird
+### Whalebird
 - Homepage: <https://whalebird.org/>
 - Source Code: <https://github.com/h3poteto/whalebird-desktop>
 - Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto)
 - Platforms: Windows, Mac, Linux
 
-## Tusky
+## Handheld
+### Roma
+- Homepage: <http://www.pleroma.com/>
+- Source Code: ???
+- Platforms: iOS, Android
+
+### Mastalab
+- Source Code: <https://gitlab.com/tom79/mastalab/>
+- Contact: [@tom79@mastodon.social](https://mastodon.social/users/tom79)
+- Platforms: Android
+
+### Tusky
 - Homepage: <https://tuskyapp.github.io/>
 - Source Code: <https://github.com/tuskyapp/Tusky>
 - Contact: [@ConnyDuck@mastodon.social](https://mastodon.social/users/ConnyDuck)
 - Platforms: Android
 
-## Tootdon
+### Tootdon
 - Homepage: <http://tootdon.club/>, <http://blog.mastodon-tootdon.com/>
 - Source Code: ???
 - Contact: [@tootdon@mstdn.jp](https://mstdn.jp/users/tootdon)
 - Platforms: Android, iOS
 
-## Amaroq
+### Amaroq
 - Homepage: <https://itunes.apple.com/us/app/amaroq-for-mastodon/id1214116200>
 - Source Code: <https://github.com/ReticentJohn/Amaroq>
 - Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)
 - Platforms: iOS
 
-## Subway Tooter
+### Subway Tooter
 - Source Code: <https://github.com/tateisu/SubwayTooter/>
 - Homepage: <http://subwaytooter.hatenadiary.jp/>
 - Contact: [@tateisu@mastodon.juggler.jp](https://mastodon.juggler.jp/users/tateisu), [@SubwayTooter@mastodon.juggler.jp](https://mastodon.juggler.jp/users/SubwayTooter)
 - Platforms: Android
+
+## Alternative Web Interfaces
+### Brutaldon
+- Homepage: <https://jfm.carcosa.net/projects/software/brutaldon/>
+- Source Code: <https://github.com/jfmcbrayer/brutaldon>
+- Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc)
+
+### Sengi
+- Source Code: <https://github.com/NicolasConstant/sengi>
+- Contact: [@sengi_app@mastodon.social](https://mastodon.social/users/sengi_app)
+- Note(2019-01-28): The development is currently in a early stage.
+
+### Halcyon
+- Source Code: <https://notabug.org/halcyon-suite/halcyon>
+- Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon)
+
+### Pinafore
+- Homepage: <https://pinafore.social/>
+- Source Code: <https://github.com/nolanlawson/pinafore>
+- Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore)
+- Note: Pleroma support is a secondary goal