diff --git a/desktop.nix b/desktop.nix
index 52c7524..98522cb 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -5,20 +5,32 @@
   ];
 
   environment.systemPackages = with pkgs; [
+    # network toolbox
     arp-scan
-    aspell
+    iperf
+    iptraf-ng
+    nload
+    openvpn
+    quagga
+    telnet
+    tinc
+
+    # Multimedia
     audacity
     beep
+    cmus
+    easytag
+    kde4.digikam
+
+    aspell
     cargo
     chromium
     clawsMail
     cloc
-    cmus
     cowsay
     curlftpfs
     dia
     docker
-    easytag
     espeak
     filezilla
     firefox
@@ -37,12 +49,8 @@
     inkscape
     inotify-tools
     iotop
-    iperf
-    iptraf-ng
     jekyll
     josm
-    kde4.digikam
-    kde4.kdepim
     kde5.okular
     kde5.quasselClient
     kicad
@@ -60,10 +68,8 @@
     mumble
     mutt
     nfs-utils
-    nload
     ntfs3g
     ntp
-    openvpn
     pandoc
     paprefs
     pass
@@ -81,7 +87,6 @@
     python27Packages.ansible2
     python27Packages.glances
     qpdfview
-    quagga
     qucs
     rustPlatform.rustc
     sakura
@@ -94,10 +99,8 @@
     stack
     subversion
     taskwarrior
-    telnet
     texLiveFull
     thunderbird
-    tinc
     transmission_gtk
     transmission_remote_gtk
     udevil