diff --git a/paludis/keywords.conf.d/desktop.conf b/paludis/keywords.conf.d/desktop.conf
index 1d4d47d..cbd95e9 100644
--- a/paludis/keywords.conf.d/desktop.conf
+++ b/paludis/keywords.conf.d/desktop.conf
@@ -104,7 +104,9 @@ dev-perl/LWP-UserAgent-Cached ~amd64
 
 media-video/guvcview ~amd64
 
+# gmusicbrowser
 media-sound/gmusicbrowser *
+dev-perl/Text-Markdown ~amd64
 
 media-sound/mumble ~amd64
 
@@ -117,7 +119,3 @@ app-admin/cpu-g ~amd64
 x11-themes/human-icon-theme ~amd64
 x11-themes/yasis-icon-theme ~amd64
 
-
-
-# by retroshare
-dev-qt/qt-mobility ~amd64
diff --git a/paludis/keywords.conf.d/development.conf b/paludis/keywords.conf.d/development.conf
index 6465ac5..79f696c 100644
--- a/paludis/keywords.conf.d/development.conf
+++ b/paludis/keywords.conf.d/development.conf
@@ -60,7 +60,7 @@ app-vim/conque ~amd64
 app-vim/delimitMate *
 app-vim/* ~amd64
 app-vim/undotree *
-app-vim/simple-bookmarks ~amd64
+app-vim/simple-bookmarks *
 
 # youcompleteme
 app-vim/youcompleteme *
diff --git a/paludis/keywords.conf.d/system.conf b/paludis/keywords.conf.d/system.conf
index a061325..6bf7ed0 100644
--- a/paludis/keywords.conf.d/system.conf
+++ b/paludis/keywords.conf.d/system.conf
@@ -16,4 +16,6 @@ app-portage/euscan ~amd64
 
 sys-apps/hprofile ~amd64
 
+# printer
 net-print/samsungs-unified-linux-driver ~amd64
+dev-util/bin_replace_string ~amd64
diff --git a/paludis/keywords.conf.d/testing.conf b/paludis/keywords.conf.d/testing.conf
index e471911..9291c7d 100644
--- a/paludis/keywords.conf.d/testing.conf
+++ b/paludis/keywords.conf.d/testing.conf
@@ -26,7 +26,6 @@ x11-libs/pixman ~amd64
 games-engines/love *
 games-arcade/lix *
 media-libs/libsfml ~amd64
-dev-python/cryptography ~amd64
 mail-filter/spamassassin ~amd64
 media-sound/teamspeak-client-bin ~amd64
 app-crypt/zuluCrypt ~amd64
diff --git a/paludis/use.conf.d/desktop.conf b/paludis/use.conf.d/desktop.conf
index c86c0f5..7d18c39 100644
--- a/paludis/use.conf.d/desktop.conf
+++ b/paludis/use.conf.d/desktop.conf
@@ -16,15 +16,15 @@ www-client/netsurf gtk
 # required by netsurf (argument)
 net-libs/libdom xml
 
-# required by net-p2p/retroshare-0.5.4e::hasufell-overlay[cli]
-net-libs/libssh server
-
 # linphone
 net-voip/linphone gtk assistant tools video sqlite upnp
 media-libs/mediastreamer video upnp
 
-
+# retroshare
 net-p2p/retroshare qt4 feedreader links-cloud voip
+net-libs/libssh server
+dev-qt/qt-mobility multimedia
+
 
 kde-base/marble -kde -python -handbook
 
@@ -54,9 +54,11 @@ media-libs/mesa gles1 gles2 -llvm gbm
 
 
 media-sound/audacity id3tag -ffmpeg
-media-sound/gmusicbrowser doc
 media-sound/mumble speech
 
+# gmusicbrowser
+media-sound/gmusicbrowser doc
+
 ## ffmpeg and mplayer shit
 media-video/ffmpeg avx theora vaapi mmxext -bindist
 virtual/ffmpeg theora vaapi