diff --git a/templates/desktop/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop b/templates/desktop/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop
index a8a9b99..4fbd598 100644
--- a/templates/desktop/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop
+++ b/templates/desktop/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop
@@ -1 +1 @@
-# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!=
+# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(x11-apps/fusion-icon)!=
diff --git a/templates/desktop/60-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop b/templates/desktop/60-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop
index a8a9b99..4fbd598 100644
--- a/templates/desktop/60-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop
+++ b/templates/desktop/60-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop
@@ -1 +1 @@
-# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!=
+# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(x11-apps/fusion-icon)!=
diff --git a/templates/desktop/60-compiz-always/.config/autostart/fusion-icon-autostart.desktop b/templates/desktop/60-compiz-always/.config/autostart/fusion-icon-autostart.desktop
index a8a9b99..4fbd598 100644
--- a/templates/desktop/60-compiz-always/.config/autostart/fusion-icon-autostart.desktop
+++ b/templates/desktop/60-compiz-always/.config/autostart/fusion-icon-autostart.desktop
@@ -1 +1 @@
-# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!=
+# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(x11-apps/fusion-icon)!=
diff --git a/templates/desktop/80-patch-2.1.18/.local/share/applications/mimeapps.list b/templates/desktop/80-patch-2.1.18/.local/share/applications/mimeapps.list
index 18b80b9..6653bb0 100644
--- a/templates/desktop/80-patch-2.1.18/.local/share/applications/mimeapps.list
+++ b/templates/desktop/80-patch-2.1.18/.local/share/applications/mimeapps.list
@@ -1,4 +1,4 @@
-# Calculate format=compiz pkg(kdelibs)>=4.3
+# Calculate format=compiz pkg(kde-base/kdelibs)>=4.3
 [Added Associations]
 application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
 application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;