diff --git a/README.md b/README.md
index f7324f1..8bc98fd 100644
--- a/README.md
+++ b/README.md
@@ -16,28 +16,43 @@ A list of **Free** and **Open Source Software** ***(FOSS)*** for **Android** –
 - [**Firefox**](https://www.mozilla.org/de/firefox/android/)
 
 
+### Calculator
+- [**Calculator**](https://github.com/Xlythe/Calculator) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.xlythe.calculator.material)]**</sup>
+- [**Simple Calculator**](https://github.com/SimpleMobileTools/Simple-Calculator) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.calculator)]**</sup>
+- [**Clean Calculator**](https://github.com/jchmrt/clean-calculator) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=home.jmstudios.calc)]**</sup>
+
+
+### Calendar
+- [**Etar**](https://github.com/Etar-Group/Etar-Calendar) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=ws.xsoh.etar)]**</sup>
+- [**Simple Calendar**](https://github.com/SimpleMobileTools/Simple-Calendar) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.calendar)]**</sup>
+
+
 ### Camera
 - [**Open Camera**](http://opencamera.sourceforge.net/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=net.sourceforge.opencamera)]**</sup>
 - [**Simple Camera**](https://github.com/SimpleMobileTools/Simple-Camera) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.camera)]**</sup>
 
 
-### Maps & Navigation
-- [**OsmAnd~**](http://osmand.net/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=net.osmand.plus)]**</sup>
-  - [Contour Lines and Hillshade](http://osmand.net/features?id=contour-lines-plugin) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=net.osmand.srtmPlugin.paid)]**</sup>
-  - [Parking Spot](http://osmand.net/features?id=parking-plugin) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=net.osmand.parkingPlugin)]**</sup>
-
-
 ### Clock & Stopwatch
 - [**Clock+**](https://github.com/philliphsu/ClockPlus) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.philliphsu.clock2)]**</sup>
 
 
+### Drawing
+- [**Simple Draw**](https://github.com/SimpleMobileTools/Simple-Draw) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.draw)]**</sup>
+
+
 ### File Manager
 - [**Amaze**](https://github.com/arpitkh96/AmazeFileManager) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.amaze.filemanager)]**</sup>
 - [**Simple File Manager**](https://github.com/SimpleMobileTools/Simple-File-Manager) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.filemanager)]**</sup>
 
 
-### SMS
-- [**QKSMS**](https://github.com/moezbhatti/qksms) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.moez.QKSMS)]**</sup>
+### Flashlight
+- [**Simple Flashlight**](https://github.com/SimpleMobileTools/Simple-Flashlight) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.flashlight)]**</sup>
+- [**Privacy Friendly Torchlight**](https://www.secuso.informatik.tu-darmstadt.de/en/secuso/research/results/privacy-friendly-apps/torchlight-app/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.secuso.torchlight2)]**</sup>
+
+
+### Image Viewer & Gallery
+- [**LeafPic**](https://github.com/HoraApps/LeafPic) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=org.horaapps.leafpic)]**</sup>
+- [**Simple Gallery**](https://github.com/SimpleMobileTools/Simple-Gallery) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.gallery)]**</sup>
 
 
 ### Keyboard
@@ -53,20 +68,24 @@ A list of **Free** and **Open Source Software** ***(FOSS)*** for **Android** –
     - ...
 
 
-### PDF Viewer
-- [**CuprumPDF**](https://github.com/paride/CopperPDF) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=org.ninthfloor.copperpdf)]**</sup>
-- [**PDFreader4Android**](https://droidapps.github.io/pdfreader4Android/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=io.github.droidapps.pdfreader)]**</sup>
-- [**MuPDF**](http://mupdf.com/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.artifex.mupdfdemo)]**</sup>
+### Launcher & Desktop
+- [**OpenLauncher**](https://github.com/BennyKok/OpenLauncher)
+- [**Hayai**](https://github.com/seizonsenryaku/HayaiLauncher) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.hayaisoftware.launcher)]**</sup>
+- [**KISS**](http://kisslauncher.com/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=fr.neamar.kiss)]**</sup>
+- [**Search Based Launcher**](https://github.com/vackosar/search-based-launcher/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.vackosar.searchbasedlauncher)]**</sup>
+- [**Silverfish**](https://github.com/stanipintjuk/Silverfish) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.launcher.silverfish)]**</sup>
+- [**Simple App Launcher**](https://github.com/SimpleMobileTools/Simple-App-Launcher) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.applauncher)]**</sup>
 
 
-### Image Viewer & Gallery
-- [**LeafPic**](https://github.com/HoraApps/LeafPic) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=org.horaapps.leafpic)]**</sup>
-- [**Simple Gallery**](https://github.com/SimpleMobileTools/Simple-Gallery) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.gallery)]**</sup>
+### Mail
+- [**K-9 Mail**](https://github.com/k9mail/k-9) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.fsck.k9)]**</sup>
+- [**K9 Material (unofficial)**](https://github.com/scoute-dich/K9-MailClient) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.fsck.k9.material)]**</sup>
 
 
-### Calendar
-- [**Etar**](https://github.com/Etar-Group/Etar-Calendar) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=ws.xsoh.etar)]**</sup>
-- [**Simple Calendar**](https://github.com/SimpleMobileTools/Simple-Calendar) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.calendar)]**</sup>
+### Maps & Navigation
+- [**OsmAnd~**](http://osmand.net/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=net.osmand.plus)]**</sup>
+  - [Contour Lines and Hillshade](http://osmand.net/features?id=contour-lines-plugin) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=net.osmand.srtmPlugin.paid)]**</sup>
+  - [Parking Spot](http://osmand.net/features?id=parking-plugin) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=net.osmand.parkingPlugin)]**</sup>
 
 
 ### Music Player
@@ -79,12 +98,6 @@ A list of **Free** and **Open Source Software** ***(FOSS)*** for **Android** –
 - [**Simple Music Player**](https://github.com/SimpleMobileTools/Simple-Music-Player) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.musicplayer)]**</sup>
 
 
-### Calculator
-- [**Calculator**](https://github.com/Xlythe/Calculator) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.xlythe.calculator.material)]**</sup>
-- [**Simple Calculator**](https://github.com/SimpleMobileTools/Simple-Calculator) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.calculator)]**</sup>
-- [**Clean Calculator**](https://github.com/jchmrt/clean-calculator) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=home.jmstudios.calc)]**</sup>
-
-
 ### Notes & Todo Lists
 - [**Omni-Notes**](https://federicoiosue.github.io/Omni-Notes/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=it.feio.android.omninotes.foss)]**</sup>
 - [**SealNote**](https://github.com/vishesh/sealnote) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.twistedplane.sealnote)]**</sup>
@@ -97,18 +110,14 @@ A list of **Free** and **Open Source Software** ***(FOSS)*** for **Android** –
 - [**NoteBuddy**](https://github.com/YoeriNijs/NoteBuddy) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=nl.yoerinijs.notebuddy)]**</sup>
 
 
-### Launcher & Desktop
-- [**OpenLauncher**](https://github.com/BennyKok/OpenLauncher)
-- [**Hayai**](https://github.com/seizonsenryaku/HayaiLauncher) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.hayaisoftware.launcher)]**</sup>
-- [**KISS**](http://kisslauncher.com/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=fr.neamar.kiss)]**</sup>
-- [**Search Based Launcher**](https://github.com/vackosar/search-based-launcher/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.vackosar.searchbasedlauncher)]**</sup>
-- [**Silverfish**](https://github.com/stanipintjuk/Silverfish) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.launcher.silverfish)]**</sup>
-- [**Simple App Launcher**](https://github.com/SimpleMobileTools/Simple-App-Launcher) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.applauncher)]**</sup>
+### PDF Viewer
+- [**MuPDF**](http://mupdf.com/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.artifex.mupdfdemo)]**</sup>
+- [**CuprumPDF**](https://github.com/paride/CopperPDF) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=org.ninthfloor.copperpdf)]**</sup>
+- [**PDFreader4Android**](https://droidapps.github.io/pdfreader4Android/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=io.github.droidapps.pdfreader)]**</sup>
 
 
-### Flashlight
-- [**Simple Flashlight**](https://github.com/SimpleMobileTools/Simple-Flashlight) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.flashlight)]**</sup>
-- [**Privacy Friendly Torchlight**](https://www.secuso.informatik.tu-darmstadt.de/en/secuso/research/results/privacy-friendly-apps/torchlight-app/) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.secuso.torchlight2)]**</sup>
+### SMS
+- [**QKSMS**](https://github.com/moezbhatti/qksms) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.moez.QKSMS)]**</sup>
 
 
 ### System
@@ -118,11 +127,3 @@ A list of **Free** and **Open Source Software** ***(FOSS)*** for **Android** –
 ### Weather
 - [**Privacy Friendly Weather**](https://www.secuso.informatik.tu-darmstadt.de/en/secuso/research/results/privacy-friendly-apps/weather/) <sup>**[[F-Droid]()]**</sup>
 
-
-### Drawing
-- [**Simple Draw**](https://github.com/SimpleMobileTools/Simple-Draw) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.simplemobiletools.draw)]**</sup>
-
-### Mail
-- [**K-9 Mail**](https://github.com/k9mail/k-9) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.fsck.k9)]**</sup>
-- [**K9 Material (unofficial)**](https://github.com/scoute-dich/K9-MailClient) <sup>**[[F-Droid](https://f-droid.org/repository/browse/?fdid=com.fsck.k9.material)]**</sup>
-