diff --git a/profiles/default/package.mask b/profiles/default/package.mask
index e1f031667..ec6ac5804 100644
--- a/profiles/default/package.mask
+++ b/profiles/default/package.mask
@@ -1,6 +1,3 @@
-=x11-base/xorg-server-1.20.10-r3
-=x11-apps/xinit-1.4.1-r1
-
 sci-libs/blas-reference
 sci-libs/cblas-reference
 sci-libs/lapack-reference
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gui-libs/.calculate_directory
new file mode 100644
index 000000000..720d52e47
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/.calculate_directory
new file mode 100644
index 000000000..637ef8656
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate mergepkg()!= name=etc
+
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/.calculate_directory
new file mode 100644
index 000000000..801aa9f38
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/etc/runlevels
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager
new file mode 100644
index 000000000..a6c59875b
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/display-manager symbolic pkg(x11-misc/sddm)!=||pkg(x11-misc/lightdm)!=||pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||pkg(media-tv/kodi)!=||cl_autologin!=&&os_install_root_type!=livecd
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del
new file mode 100644
index 000000000..d83999dc5
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del
@@ -0,0 +1 @@
+# Calculate append=remove name=display-manager pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)== cl_autologin==||os_install_root_type==livecd
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/.calculate_directory
new file mode 100644
index 000000000..801aa9f38
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/etc/runlevels
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/display-manager.del b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/display-manager.del
new file mode 100644
index 000000000..0c05b1b3e
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/display-manager.del
@@ -0,0 +1 @@
+# Calculate append=remove name=display-manager
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/init.d/display-manager b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/init.d/display-manager
new file mode 100644
index 000000000..1b76cee2c
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/init.d/display-manager
@@ -0,0 +1,6 @@
+# Calculate format=patch
+<reg>		rm /etc/.nogui
+		return 0</reg>
+<text>		rm /etc/.nogui
+		chvt 1
+		return 0</text>
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/.calculate_directory
new file mode 100644
index 000000000..5d62b4449
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/etc name=X11
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/0-fix-contents b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/0-fix-contents
new file mode 100644
index 000000000..d59db536c
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/0-fix-contents
@@ -0,0 +1,2 @@
+# Calculate format=contents
+!x11-apps/xinit /etc/X11/startDM*
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/1-remove-old b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/1-remove-old
new file mode 100644
index 000000000..bd201ad75
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/1-remove-old
@@ -0,0 +1 @@
+# Calculate append=remove name=startDM.sh
diff --git a/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/2-symlink b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/2-symlink
new file mode 100644
index 000000000..2164d95bd
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/2-symlink
@@ -0,0 +1 @@
+# Calculate name=startDM.sh link=/usr/bin/startDM symbolic force
diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/0-clean-startDM.sh b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/0-clean-startDM.sh
index fd35e6980..50bde5777 100644
--- a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/0-clean-startDM.sh
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/0-clean-startDM.sh
@@ -1,4 +1,4 @@
-# Calculate run=/bin/bash ac_install_disk==off
+# Calculate run=/bin/bash ac_install_disk==off&&pkg(x11-apps/xinit)<1.4.1-r1&&pkg(gui-libs/display-manager-init)==
 
 rm -f /etc/X11/startDM.sh
 rm -f /etc/X11/._cfg000*_startDM.sh
diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
index cbf504020..83b84208e 100644
--- a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
@@ -1,4 +1,4 @@
-# Calculate comment=# chmod=0755 protected
+# Calculate comment=# chmod=0755 protected pkg(x11-apps/xinit)<1.4.1-r1&&pkg(gui-libs/display-manager-init)==
 #!/bin/sh
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
index 0f7257bce..8608e126d 100644
--- a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
@@ -1,2 +1 @@
-# Calculate path=/etc/runlevels
-
+# Calculate path=/etc/runlevels pkg(x11-base/xorg-server)<1.20.10-r3
diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
index 0f7257bce..8608e126d 100644
--- a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
@@ -1,2 +1 @@
-# Calculate path=/etc/runlevels
-
+# Calculate path=/etc/runlevels pkg(x11-base/xorg-server)<1.20.10-r3
diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/init.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/init.d/.calculate_directory
new file mode 100644
index 000000000..11ffb10d7
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/init.d/.calculate_directory
@@ -0,0 +1 @@
+# Calculate pkg(x11-base/xorg-server)<1.20.10-r3
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/.calculate_directory
new file mode 100644
index 000000000..720d52e47
--- /dev/null
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/.calculate_directory
new file mode 100644
index 000000000..637ef8656
--- /dev/null
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate mergepkg()!= name=etc
+
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager
new file mode 100644
index 000000000..1f36badb4
--- /dev/null
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager
@@ -0,0 +1,63 @@
+# Calculate comment=#
+
+CHECKVT=7
+
+#?module(client)!=&&client.os_remote_auth!=#
+#?pkg(x11-misc/sddm)!=#
+DISPLAYMANAGER="sddm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="kdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="lightdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="gdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="slim"
+START_STOP_ARGS=
+#pkg#
+#!module#
+#?cl_autologin!=#
+#?pkg(x11-misc/lightdm)!=#
+DISPLAYMANAGER="lightdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)!=#
+DISPLAYMANAGER="sddm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
+XUSER=#-cl_autologin-#
+DISPLAYMANAGER="bash"
+START_STOP_ARGS="--background -- /usr/bin/xautologin $XUSER $CHECKVT"
+#pkg#
+#!cl_autologin#
+#?pkg(x11-misc/sddm)!=#
+DISPLAYMANAGER="sddm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="kdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="lightdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="gdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==#
+DISPLAYMANAGER="slim"
+START_STOP_ARGS=
+#pkg#
+#cl_autologin#
+#module#
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/.calculate_directory
new file mode 100644
index 000000000..11ffb10d7
--- /dev/null
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/.calculate_directory
@@ -0,0 +1 @@
+# Calculate pkg(x11-base/xorg-server)<1.20.10-r3
diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
index e9f20d8d6..1eef88a60 100644
--- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
+++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
@@ -51,12 +51,12 @@ cld-nox;
 #?pkg(sys-kernel/dracut)==#root=/dev/ram0#!pkg#root=#-cl_builder_root_param-##pkg#;
 /boot/initrd;
 #?pkg(media-gfx/splashutils)!=#
-#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 nox;
+#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 nogui;
 #pkg#
 #?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
-#-load(/bootmenu/bootparam.config)-# splash nox;
+#-load(/bootmenu/bootparam.config)-# splash nogui;
 #pkg#
 #?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
-#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose nox;
+#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose nogui;
 #pkg#
 FOOTER