From 0f3b7c62f6e71cd0cdbd7378bed0a3c225e953fd Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:48:21 +0100
Subject: [PATCH] Update README.md

---
 README.md | 48 ++++++++++++------------------------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 6829b1b..f0e8ab6 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,6 @@
   * [Youtube](#youtube)
   * [Twitter](#twitter)
   * [Reddit](#reddit)
-  * [Music Streaming (Spotify, Apple Music...)](#music-streaming)
   * [Streaming Platforms (Twitch)](#streaming-platforms)
 * [Teamworking and Communication Tools](#teamworking-tools)
 * [Instant Messaging](#instant-messaging)
@@ -282,41 +281,6 @@ Remember: Without strong encryption, you will be spied on systematically by lots
 * [Infinity](https://github.com/Docile-Alligator/Infinity-For-Reddit) - A beautiful Reddit client for Android.
 * [Slide](https://github.com/ccrama/Slide) - Slide is an open sourced, ad free Reddit browser for Android and iOS.
 
-### Music Streaming
-<img width="16" src="misc/forbidden.png"> </img> **AVOID**:
-* Spotify
-* Deezer
-* Apple Music
-* Tidal
-
-These services really compromise your privacy, they gather a lot of data from the music you listen such as:
-* Mood
-* Free / Work time
-* Friends
-* Ideology
-* Sex
-* Age
-* Location
-...
-
-<img width="16" src="misc/check.png"> </img> **Privacy respecting Music Streaming services:**
-* [FunkWhale](https://funkwhale.audio/)
-* [Koel](https://koel.dev/) - a personal music streaming server that works.
-* [Nuclear](https://nuclear.js.org/) - Modern music player focused on streaming from free sources.
-* [Ampache](http://ampache.org/) - A web based audio/video streaming application and file manager.
-* [Jellyfin](https://jellyfin.org/) - Jellyfin is the volunteer-built media solution that puts you in control of your media.
-
-**Spotify Alternative clients:**
- > These clients, although will have less tracking, still DO NOT protect your privacy at all as you will still be streaming from Spotify servers from you own **premium (paid, identified)** account.
- 
- \* Premium required.
-* [Spot](https://github.com/xou816/spot) - Native Spotify client built in GTK and Rust.
-* [psst](https://github.com/jpochyla/psst) - Fast and multi-platform Spotify client with native GUI.
-* [ncspot](https://github.com/hrkfdn/ncspot) - Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes.
-
-**Other music streaming projects**:
-* [Freezer](https://git.rip/freezer)
-
 ### Streaming Platforms (Twitch)
 <img width="16" src="misc/forbidden.png"> </img>  Avoid using platforms as Twitch, Patreon, Youtube as they are very privacy-invasive with your viewers (and you!). Instead, you can try using some self-hosted platforms that do take care of everyone's privacy.
 
@@ -437,10 +401,22 @@ If you need an app for **menstrual cycle tracking** please don't use any apps li
 #### Audio:
 * [Funkwhale](https://funkwhale.audio/) - A social platform to enjoy and share music (Soundcloud alternative)
 * [Subsonic](http://www.subsonic.org/pages/index.jsp) - Your complete, personal music streamer.
+* [Ampache](http://ampache.org/) - A web based audio/video streaming application and file manager.
 * [Koel](https://koel.dev/) - a personal music streaming server that works.
 * [Nuclear](https://nuclear.js.org/) - Modern music player focused on streaming from free sources.
 * [Navidrome](https://navidrome.org/) - Lightweight, fast and self-contained personal music streamer.
 
+**Spotify Alternative clients:**
+ > These clients, although will have less tracking, still DO NOT protect your privacy at all as you will still be streaming from Spotify servers from you own **premium (paid, identified)** account.
+ 
+ \* Premium required.
+* [Spot](https://github.com/xou816/spot) - Native Spotify client built in GTK and Rust.
+* [psst](https://github.com/jpochyla/psst) - Fast and multi-platform Spotify client with native GUI.
+* [ncspot](https://github.com/hrkfdn/ncspot) - Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes.
+
+**Other music streaming projects**:
+* [Freezer](https://git.rip/freezer)
+
 #### Podcasts
 * [Antennapod](https://antennapod.org/) - The Open Podcast Player