diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-server b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-server
new file mode 100644
index 000000000..b8aa0b59d
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-server
@@ -0,0 +1 @@
+# Calculate append=skip merge(sys-apps/calculate-server)!= merge=sys-auth/pambase
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update
index 828e58721..66d794b62 100644
--- a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-update
@@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-update)!= merge=app-portage/eix
+# Calculate append=skip merge(sys-apps/calculate-update)!= merge=app-portage/eix,app-portage/layman
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/gdm b/profiles/templates/3.1/2_ac_install_merge/Depends/gdm
new file mode 100644
index 000000000..e9822979d
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/gdm
@@ -0,0 +1 @@
+# Calculate append=skip merge(gnome-base/gdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/gnome-background b/profiles/templates/3.1/2_ac_install_merge/Depends/gnome-background
new file mode 100644
index 000000000..add900b9a
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/gnome-background
@@ -0,0 +1 @@
+# Calculate append=skip merge(x11-themes/gnome-background)!= merge=media-gfx/calculate-wallpapers
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/kdm b/profiles/templates/3.1/2_ac_install_merge/Depends/kdm
new file mode 100644
index 000000000..41b44787f
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/kdm
@@ -0,0 +1 @@
+# Calculate append=skip merge(kde-base/kdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/lightdm b/profiles/templates/3.1/2_ac_install_merge/Depends/lightdm
new file mode 100644
index 000000000..6a8453808
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/lightdm
@@ -0,0 +1 @@
+# Calculate append=skip merge(x11-misc/lightdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/lxdm b/profiles/templates/3.1/2_ac_install_merge/Depends/lxdm
new file mode 100644
index 000000000..122a1e795
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/lxdm
@@ -0,0 +1 @@
+# Calculate append=skip merge(lxde-base/lxdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio b/profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio
new file mode 100644
index 000000000..ffccd15ac
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/pulseaudio
@@ -0,0 +1 @@
+# Calculate append=skip merge(media-sound/pulseaudio)!= merge=media-video/smplayer
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/slim b/profiles/templates/3.1/2_ac_install_merge/Depends/slim
new file mode 100644
index 000000000..e6efe5283
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/slim
@@ -0,0 +1 @@
+# Calculate append=skip merge(x11-misc/slim)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/splash-themes-calculate b/profiles/templates/3.1/2_ac_install_merge/Depends/splash-themes-calculate
new file mode 100644
index 000000000..4fc2a02e7
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/splash-themes-calculate
@@ -0,0 +1 @@
+# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=media-gfx/splashutils
diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/xbmc b/profiles/templates/3.1/2_ac_install_merge/Depends/xbmc
index 72656fef2..b9d2d7e1c 100644
--- a/profiles/templates/3.1/2_ac_install_merge/Depends/xbmc
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/xbmc
@@ -1 +1 @@
-# Calculate append=skip merge(media-tv/xbmc)!= merge=x11-apps/xinit
+# Calculate append=skip merge(media-tv/xbmc)!= merge=x11-apps/xinit,x11-base/xorg-server