diff --git a/packages/media-sound/pnmixer/pnmixer-0.7.exheres-0 b/packages/media-sound/pnmixer/pnmixer-0.7.exheres-0
index d3082bf..184d20d 100644
--- a/packages/media-sound/pnmixer/pnmixer-0.7.exheres-0
+++ b/packages/media-sound/pnmixer/pnmixer-0.7.exheres-0
@@ -1,14 +1,42 @@
 # Copyright 2015 Kylie McClain <somasis@exherbo.org>
+# Copyright 2016-2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require pnmixer
+require github [ user='nicklan' release="v${PV}" suffix="tar.gz" ]
+require gtk-icon-cache
 
+SUMMARY="Simple ALSA mixer application designed to run in system tray"
+LICENCES="GPL-3"
 SLOT="0"
-
 PLATFORMS="~amd64"
 
+MYOPTIONS="
+    libnotify
+    ( providers: gtk2 gtk3 ) [[ number-selected = exactly-one ]]
+"
+
 DEPENDENCIES="
     build:
         dev-util/intltool
+        sys-devel/gettext
+        virtual/pkg-config
+    build+run:
+        dev-libs/glib:2
+        sys-sound/alsa-lib
+        x11-libs/libX11
+        libnotify? ( x11-libs/libnotify )
+        providers:gtk2? ( x11-libs/gtk+:2[>=2.16.0] )
+        providers:gtk3? ( x11-libs/gtk+:3[>=3.6.0] )
+    suggestion:
+        (
+            xfce-extra/xfce4-mixer
+        ) [[
+            *description = [ ${PN} can use a full mixer if available ]
+        ]]
 "
 
+DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
+    libnotify
+    'providers:gtk3 gtk3'
+)
+
diff --git a/packages/media-sound/pnmixer/pnmixer-scm.exheres-0 b/packages/media-sound/pnmixer/pnmixer-scm.exheres-0
index 8b43673..7ae8d9f 100644
--- a/packages/media-sound/pnmixer/pnmixer-scm.exheres-0
+++ b/packages/media-sound/pnmixer/pnmixer-scm.exheres-0
@@ -1,41 +1,9 @@
 # Copyright 2015 Kylie McClain <somasis@exherbo.org>
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Copyright 2016-2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user='nicklan' branch='cmake' ]
-require cmake
+require pnmixer
 
-SUMMARY="Simple ALSA mixer application designed to run in system tray"
-LICENCES="GPL-3"
 SLOT="0"
 PLATFORMS="~amd64"
 
-MYOPTIONS="
-    libnotify
-    ( providers: gtk2 gtk3 ) [[ number-selected = exactly-one ]]
-"
-
-DEPENDENCIES="
-    build:
-        sys-devel/gettext
-        virtual/pkg-config
-    build+run:
-        dev-libs/glib:2
-        sys-sound/alsa-lib
-        x11-libs/libX11
-        libnotify? ( x11-libs/libnotify )
-        providers:gtk2? ( x11-libs/gtk+:2[>=2.16.0] )
-        providers:gtk3? ( x11-libs/gtk+:3[>=3.6.0] )
-    suggestion:
-        (
-            xfce-extra/xfce4-mixer
-        ) [[
-            *description = [ ${PN} can use a full mixer if available ]
-        ]]
-"
-
-CMAKE_SRC_CONFIGURE_OPTION_WITHS=(
-    'providers:gtk3 GTK3'
-    'libnotify LIBNOTIFY'
-)
-
diff --git a/packages/media-sound/pnmixer/pnmixer.exlib b/packages/media-sound/pnmixer/pnmixer.exlib
index db5b737..ba479ea 100644
--- a/packages/media-sound/pnmixer/pnmixer.exlib
+++ b/packages/media-sound/pnmixer/pnmixer.exlib
@@ -1,11 +1,13 @@
 # Copyright 2015 Kylie McClain <somasis@exherbo.org>
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Copyright 2016-2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
 myexparam release=v${PV}
 PNMIXER_RELEASE=$(exparam release)
 
 require github [ user='nicklan' release="${PNMIXER_RELEASE}" suffix="tar.gz" ]
+require cmake
+require gtk-icon-cache
 
 SUMMARY="Simple ALSA mixer application designed to run in system tray"
 LICENCES="GPL-3"
@@ -34,8 +36,8 @@ DEPENDENCIES="
         ]]
 "
 
-DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
-    libnotify
-    'providers:gtk3 gtk3'
+CMAKE_SRC_CONFIGURE_OPTION_WITHS=(
+    'libnotify LIBNOTIFY'
+    'providers:gtk3 GTK3'
 )