diff --git a/profiles/templates/3.6_alpha/.calculate_directory b/profiles/templates/3.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/.calculate_directory
rename to profiles/templates/3.6/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt b/profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key b/profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem b/profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/baselayout/hosts b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/baselayout/hosts
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/baselayout/hosts
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/baselayout/hosts
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/hostname b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/hostname
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/hostname
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/copy-init.d b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/copy-init.d
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/copy-init.d
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/copy-init.d
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules b/profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
rename to profiles/templates/3.6/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/calculate.env b/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/calculate.env
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/calculate.env
rename to profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/calculate.env
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/fstab b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/motd b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/baselayout/motd
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/motd
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/baselayout/motd
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-boot/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-boot/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh b/profiles/templates/3.6/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
rename to profiles/templates/3.6/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
diff --git a/profiles/templates/3.5/1_ac_install_disk/README-eng.txt b/profiles/templates/3.6/1_ac_install_disk/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/README-eng.txt
rename to profiles/templates/3.6/1_ac_install_disk/README-eng.txt
diff --git a/profiles/templates/3.5/1_ac_install_disk/README-rus.txt b/profiles/templates/3.6/1_ac_install_disk/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/README-rus.txt
rename to profiles/templates/3.6/1_ac_install_disk/README-rus.txt
diff --git a/profiles/templates/3.5/2_ac_install_merge/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/Depends/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/Depends/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/breeze b/profiles/templates/3.6/2_ac_install_merge/Depends/breeze
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/breeze
rename to profiles/templates/3.6/2_ac_install_merge/Depends/breeze
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/breeze-icons b/profiles/templates/3.6/2_ac_install_merge/Depends/breeze-icons
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/breeze-icons
rename to profiles/templates/3.6/2_ac_install_merge/Depends/breeze-icons
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-icon-theme b/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-icon-theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/calculate-icon-theme
rename to profiles/templates/3.6/2_ac_install_merge/Depends/calculate-icon-theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-server b/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-server
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/calculate-server
rename to profiles/templates/3.6/2_ac_install_merge/Depends/calculate-server
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-utils b/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-utils
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/calculate-utils
rename to profiles/templates/3.6/2_ac_install_merge/Depends/calculate-utils
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/calculate-wallpapers b/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-wallpapers
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/calculate-wallpapers
rename to profiles/templates/3.6/2_ac_install_merge/Depends/calculate-wallpapers
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/catfish b/profiles/templates/3.6/2_ac_install_merge/Depends/catfish
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/catfish
rename to profiles/templates/3.6/2_ac_install_merge/Depends/catfish
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/cinnamon-session b/profiles/templates/3.6/2_ac_install_merge/Depends/cinnamon-session
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/cinnamon-session
rename to profiles/templates/3.6/2_ac_install_merge/Depends/cinnamon-session
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/colorschemes b/profiles/templates/3.6/2_ac_install_merge/Depends/colorschemes
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/colorschemes
rename to profiles/templates/3.6/2_ac_install_merge/Depends/colorschemes
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/consolekit b/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/consolekit
rename to profiles/templates/3.6/2_ac_install_merge/Depends/consolekit
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/dm-themes-calculate b/profiles/templates/3.6/2_ac_install_merge/Depends/dm-themes-calculate
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/dm-themes-calculate
rename to profiles/templates/3.6/2_ac_install_merge/Depends/dm-themes-calculate
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/droid b/profiles/templates/3.6/2_ac_install_merge/Depends/droid
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/droid
rename to profiles/templates/3.6/2_ac_install_merge/Depends/droid
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/ecryptfs-utils b/profiles/templates/3.6/2_ac_install_merge/Depends/ecryptfs-utils
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/ecryptfs-utils
rename to profiles/templates/3.6/2_ac_install_merge/Depends/ecryptfs-utils
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/elementary-icon-theme b/profiles/templates/3.6/2_ac_install_merge/Depends/elementary-icon-theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/elementary-icon-theme
rename to profiles/templates/3.6/2_ac_install_merge/Depends/elementary-icon-theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/elogind b/profiles/templates/3.6/2_ac_install_merge/Depends/elogind
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/elogind
rename to profiles/templates/3.6/2_ac_install_merge/Depends/elogind
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/gnome-icon-theme b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-icon-theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/gnome-icon-theme
rename to profiles/templates/3.6/2_ac_install_merge/Depends/gnome-icon-theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/gnome-session b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-session
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/gnome-session
rename to profiles/templates/3.6/2_ac_install_merge/Depends/gnome-session
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/greybird b/profiles/templates/3.6/2_ac_install_merge/Depends/greybird
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/greybird
rename to profiles/templates/3.6/2_ac_install_merge/Depends/greybird
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/grub b/profiles/templates/3.6/2_ac_install_merge/Depends/grub
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/grub
rename to profiles/templates/3.6/2_ac_install_merge/Depends/grub
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/grub-splashes-calculate b/profiles/templates/3.6/2_ac_install_merge/Depends/grub-splashes-calculate
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/grub-splashes-calculate
rename to profiles/templates/3.6/2_ac_install_merge/Depends/grub-splashes-calculate
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/gwenview b/profiles/templates/3.6/2_ac_install_merge/Depends/gwenview
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/gwenview
rename to profiles/templates/3.6/2_ac_install_merge/Depends/gwenview
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/hardinfo b/profiles/templates/3.6/2_ac_install_merge/Depends/hardinfo
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/hardinfo
rename to profiles/templates/3.6/2_ac_install_merge/Depends/hardinfo
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/iputils b/profiles/templates/3.6/2_ac_install_merge/Depends/iputils
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/iputils
rename to profiles/templates/3.6/2_ac_install_merge/Depends/iputils
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/kodi b/profiles/templates/3.6/2_ac_install_merge/Depends/kodi
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/kodi
rename to profiles/templates/3.6/2_ac_install_merge/Depends/kodi
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/ksmserver b/profiles/templates/3.6/2_ac_install_merge/Depends/ksmserver
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/ksmserver
rename to profiles/templates/3.6/2_ac_install_merge/Depends/ksmserver
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/lightdm b/profiles/templates/3.6/2_ac_install_merge/Depends/lightdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/lightdm
rename to profiles/templates/3.6/2_ac_install_merge/Depends/lightdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/lightdm-gtk-greeter b/profiles/templates/3.6/2_ac_install_merge/Depends/lightdm-gtk-greeter
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/lightdm-gtk-greeter
rename to profiles/templates/3.6/2_ac_install_merge/Depends/lightdm-gtk-greeter
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/lightdm-themes-calculate b/profiles/templates/3.6/2_ac_install_merge/Depends/lightdm-themes-calculate
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/lightdm-themes-calculate
rename to profiles/templates/3.6/2_ac_install_merge/Depends/lightdm-themes-calculate
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/lxdm b/profiles/templates/3.6/2_ac_install_merge/Depends/lxdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/lxdm
rename to profiles/templates/3.6/2_ac_install_merge/Depends/lxdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/lxdm-themes-calculate b/profiles/templates/3.6/2_ac_install_merge/Depends/lxdm-themes-calculate
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/lxdm-themes-calculate
rename to profiles/templates/3.6/2_ac_install_merge/Depends/lxdm-themes-calculate
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/lxqt-session b/profiles/templates/3.6/2_ac_install_merge/Depends/lxqt-session
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/lxqt-session
rename to profiles/templates/3.6/2_ac_install_merge/Depends/lxqt-session
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/mate-icon-theme b/profiles/templates/3.6/2_ac_install_merge/Depends/mate-icon-theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/mate-icon-theme
rename to profiles/templates/3.6/2_ac_install_merge/Depends/mate-icon-theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/mate-screensaver b/profiles/templates/3.6/2_ac_install_merge/Depends/mate-screensaver
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/mate-screensaver
rename to profiles/templates/3.6/2_ac_install_merge/Depends/mate-screensaver
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/mate-session-manager b/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/mate-session-manager
rename to profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/modem-manager-gui b/profiles/templates/3.6/2_ac_install_merge/Depends/modem-manager-gui
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/modem-manager-gui
rename to profiles/templates/3.6/2_ac_install_merge/Depends/modem-manager-gui
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/nemo b/profiles/templates/3.6/2_ac_install_merge/Depends/nemo
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/nemo
rename to profiles/templates/3.6/2_ac_install_merge/Depends/nemo
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/nss_ldap b/profiles/templates/3.6/2_ac_install_merge/Depends/nss_ldap
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/nss_ldap
rename to profiles/templates/3.6/2_ac_install_merge/Depends/nss_ldap
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/openbox b/profiles/templates/3.6/2_ac_install_merge/Depends/openbox
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/openbox
rename to profiles/templates/3.6/2_ac_install_merge/Depends/openbox
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/openldap b/profiles/templates/3.6/2_ac_install_merge/Depends/openldap
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/openldap
rename to profiles/templates/3.6/2_ac_install_merge/Depends/openldap
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/oxygen-icons b/profiles/templates/3.6/2_ac_install_merge/Depends/oxygen-icons
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/oxygen-icons
rename to profiles/templates/3.6/2_ac_install_merge/Depends/oxygen-icons
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/pam_client b/profiles/templates/3.6/2_ac_install_merge/Depends/pam_client
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/pam_client
rename to profiles/templates/3.6/2_ac_install_merge/Depends/pam_client
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/pam_keystore b/profiles/templates/3.6/2_ac_install_merge/Depends/pam_keystore
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/pam_keystore
rename to profiles/templates/3.6/2_ac_install_merge/Depends/pam_keystore
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/pam_update b/profiles/templates/3.6/2_ac_install_merge/Depends/pam_update
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/pam_update
rename to profiles/templates/3.6/2_ac_install_merge/Depends/pam_update
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/plasma b/profiles/templates/3.6/2_ac_install_merge/Depends/plasma
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/plasma
rename to profiles/templates/3.6/2_ac_install_merge/Depends/plasma
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/plasma-themes-calculate b/profiles/templates/3.6/2_ac_install_merge/Depends/plasma-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/plasma-themes-calculate
rename to profiles/templates/3.6/2_ac_install_merge/Depends/plasma-themes-calculate
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/plasma-workspace b/profiles/templates/3.6/2_ac_install_merge/Depends/plasma-workspace
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/plasma-workspace
rename to profiles/templates/3.6/2_ac_install_merge/Depends/plasma-workspace
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/qpdfview b/profiles/templates/3.6/2_ac_install_merge/Depends/qpdfview
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/qpdfview
rename to profiles/templates/3.6/2_ac_install_merge/Depends/qpdfview
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/qt5ct b/profiles/templates/3.6/2_ac_install_merge/Depends/qt5ct
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/qt5ct
rename to profiles/templates/3.6/2_ac_install_merge/Depends/qt5ct
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/rpcbind b/profiles/templates/3.6/2_ac_install_merge/Depends/rpcbind
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/rpcbind
rename to profiles/templates/3.6/2_ac_install_merge/Depends/rpcbind
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/sddm b/profiles/templates/3.6/2_ac_install_merge/Depends/sddm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/sddm
rename to profiles/templates/3.6/2_ac_install_merge/Depends/sddm
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/slim b/profiles/templates/3.6/2_ac_install_merge/Depends/slim
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/slim
rename to profiles/templates/3.6/2_ac_install_merge/Depends/slim
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/smplayer b/profiles/templates/3.6/2_ac_install_merge/Depends/smplayer
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/smplayer
rename to profiles/templates/3.6/2_ac_install_merge/Depends/smplayer
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/splash-themes-calculate b/profiles/templates/3.6/2_ac_install_merge/Depends/splash-themes-calculate
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/splash-themes-calculate
rename to profiles/templates/3.6/2_ac_install_merge/Depends/splash-themes-calculate
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/splashutils b/profiles/templates/3.6/2_ac_install_merge/Depends/splashutils
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/splashutils
rename to profiles/templates/3.6/2_ac_install_merge/Depends/splashutils
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/systemd b/profiles/templates/3.6/2_ac_install_merge/Depends/systemd
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/systemd
rename to profiles/templates/3.6/2_ac_install_merge/Depends/systemd
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/terminus-font b/profiles/templates/3.6/2_ac_install_merge/Depends/terminus-font
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/terminus-font
rename to profiles/templates/3.6/2_ac_install_merge/Depends/terminus-font
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/xbmc b/profiles/templates/3.6/2_ac_install_merge/Depends/xbmc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/xbmc
rename to profiles/templates/3.6/2_ac_install_merge/Depends/xbmc
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/xfce4-session b/profiles/templates/3.6/2_ac_install_merge/Depends/xfce4-session
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/xfce4-session
rename to profiles/templates/3.6/2_ac_install_merge/Depends/xfce4-session
diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/xorg-server b/profiles/templates/3.6/2_ac_install_merge/Depends/xorg-server
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Depends/xorg-server
rename to profiles/templates/3.6/2_ac_install_merge/Depends/xorg-server
diff --git a/profiles/templates/3.5/2_ac_install_merge/README-eng.txt b/profiles/templates/3.6/2_ac_install_merge/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/README-eng.txt
rename to profiles/templates/3.6/2_ac_install_merge/README-eng.txt
diff --git a/profiles/templates/3.5/2_ac_install_merge/README-rus.txt b/profiles/templates/3.6/2_ac_install_merge/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/README-rus.txt
rename to profiles/templates/3.6/2_ac_install_merge/README-rus.txt
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/Remerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/client-3.3.0_alpha2 b/profiles/templates/3.6/2_ac_install_merge/Remerge/client-3.3.0_alpha2
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/client-3.3.0_alpha2
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/client-3.3.0_alpha2
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 b/profiles/templates/3.6/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha1 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha3 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.2.5 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.2.5
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.3.2.5
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.3.2.5
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.15 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.4.6.15
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.15
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.4.6.15
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.19 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.4.6.19
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.19
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.4.6.19
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.6 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.4.6.6
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.4.6.6
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.4.6.6
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha25 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha38
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha38
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha39
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha39
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
diff --git a/profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.6.0_alpha1 b/profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.6.0_alpha1
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.6.0_alpha1
rename to profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.6.0_alpha1
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png b/profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png b/profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop b/profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/sudo/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/sudo/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/sudo/default b/profiles/templates/3.6/2_ac_install_merge/app-admin/sudo/default
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/sudo/default
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/sudo/default
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng b/profiles/templates/3.6/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop b/profiles/templates/3.6/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/webapp-config/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-admin/webapp-config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/webapp-config/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/webapp-config/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/webapp-config/webapp-config b/profiles/templates/3.6/2_ac_install_merge/app-admin/webapp-config/webapp-config
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-admin/webapp-config/webapp-config
rename to profiles/templates/3.6/2_ac_install_merge/app-admin/webapp-config/webapp-config
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-backup/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-backup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-backup/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-backup/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf b/profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf
rename to profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf b/profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf
rename to profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter b/profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter
rename to profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh b/profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh
rename to profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-cdr/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-cdr/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-cdr/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-cdr/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-dicts/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-dicts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-dicts/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-dicts/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.aff b/profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
rename to profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.dic b/profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
rename to profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff b/profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
rename to profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic b/profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
rename to profiles/templates/3.6/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-editors/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-editors/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-editors/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-editors/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-editors/vim/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-editors/vim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-editors/vim/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-editors/vim/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-editors/vim/99editor b/profiles/templates/3.6/2_ac_install_merge/app-editors/vim/99editor
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-editors/vim/99editor
rename to profiles/templates/3.6/2_ac_install_merge/app-editors/vim/99editor
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-editors/vim/vimrc.local b/profiles/templates/3.6/2_ac_install_merge/app-editors/vim/vimrc.local
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-editors/vim/vimrc.local
rename to profiles/templates/3.6/2_ac_install_merge/app-editors/vim/vimrc.local
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-emulation/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-emulation/lxc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/lxc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/lxc/lxc.conf b/profiles/templates/3.6/2_ac_install_merge/app-emulation/lxc/lxc.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/lxc/lxc.conf
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/lxc/lxc.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/lxd/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-emulation/lxd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/lxd/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/lxd/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/lxd/init.d/lxd b/profiles/templates/3.6/2_ac_install_merge/app-emulation/lxd/init.d/lxd
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/lxd/init.d/lxd
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/lxd/init.d/lxd
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh b/profiles/templates/3.6/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
rename to profiles/templates/3.6/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-misc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-misc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-misc/screen/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-misc/screen/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/screen/screenrc b/profiles/templates/3.6/2_ac_install_merge/app-misc/screen/screenrc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-misc/screen/screenrc
rename to profiles/templates/3.6/2_ac_install_merge/app-misc/screen/screenrc
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-misc/tmux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-misc/tmux/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf b/profiles/templates/3.6/2_ac_install_merge/app-misc/tmux/tmux.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf
rename to profiles/templates/3.6/2_ac_install_merge/app-misc/tmux/tmux.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-office/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-office/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-office/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-office/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-office/libreoffice/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-office/libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-office/libreoffice/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-office/libreoffice/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-office/libreoffice/draw.desktop b/profiles/templates/3.6/2_ac_install_merge/app-office/libreoffice/draw.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-office/libreoffice/draw.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-office/libreoffice/draw.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-office/libreoffice/math.desktop b/profiles/templates/3.6/2_ac_install_merge/app-office/libreoffice/math.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-office/libreoffice/math.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-office/libreoffice/math.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-office/scribus/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-office/scribus/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-office/scribus/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-office/scribus/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-office/scribus/scribus.desktop b/profiles/templates/3.6/2_ac_install_merge/app-office/scribus/scribus.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-office/scribus/scribus.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-office/scribus/scribus.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/eix/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-portage/eix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/eix/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/eix/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/eix/50-calculate b/profiles/templates/3.6/2_ac_install_merge/app-portage/eix/50-calculate
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/eix/50-calculate
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/eix/50-calculate
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/eix/eix-sync.conf b/profiles/templates/3.6/2_ac_install_merge/app-portage/eix/eix-sync.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/eix/eix-sync.conf
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/eix/eix-sync.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/eix/eixrc b/profiles/templates/3.6/2_ac_install_merge/app-portage/eix/eixrc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/eix/eixrc
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/eix/eixrc
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/eix/eixrc.backup.0000 b/profiles/templates/3.6/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-emulation/lxc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-emulation/lxc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/layman/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/layman/layman.cfg b/profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/layman/layman.cfg
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/layman/layman.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.32 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.32
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.32
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.32
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.64 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.64
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.64
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/mainwindow.py.64
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.32 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.32
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.32
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.32
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.64 b/profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.64
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.64
rename to profiles/templates/3.6/2_ac_install_merge/app-portage/porthole/preferences.py.64
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-shells/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-shells/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-shells/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-shells/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-shells/bash/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-shells/bash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-shells/bash/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-shells/bash/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh b/profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
rename to profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh b/profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
rename to profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh b/profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
rename to profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh b/profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
rename to profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh b/profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
rename to profiles/templates/3.6/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-text/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-text/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/evince/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-text/evince/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/evince/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-text/evince/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/evince/evince.desktop b/profiles/templates/3.6/2_ac_install_merge/app-text/evince/evince.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/evince/evince.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-text/evince/evince.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/mupdf/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-text/mupdf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/mupdf/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-text/mupdf/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/mupdf/mupdf.desktop b/profiles/templates/3.6/2_ac_install_merge/app-text/mupdf/mupdf.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/mupdf/mupdf.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-text/mupdf/mupdf.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop b/profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
rename to profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.svg b/profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
rename to profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/update-desktop-database b/profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/update-desktop-database
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-text/qpdfview/update-desktop-database
rename to profiles/templates/3.6/2_ac_install_merge/app-text/qpdfview/update-desktop-database
diff --git a/profiles/templates/3.5/2_ac_install_merge/dev-python/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-python/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/dev-python/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/dev-python/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/dev-python/pexpect/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/dev-python/pexpect/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing b/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
rename to profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gconf/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gconf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gconf/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gconf/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gvfs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/gvfs/network.mount b/profiles/templates/3.6/2_ac_install_merge/gnome-base/gvfs/network.mount
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/gvfs/network.mount
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/gvfs/network.mount
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/nautilus/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop b/profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop b/profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
rename to profiles/templates/3.6/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-extra/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gnome-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-extra/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/gnome-extra/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop b/profiles/templates/3.6/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop
rename to profiles/templates/3.6/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/kde-l10n/fix b/profiles/templates/3.6/2_ac_install_merge/kde-apps/kde-l10n/fix
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/kde-l10n/fix
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/kde-l10n/fix
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1 b/profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1 b/profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/fix b/profiles/templates/3.6/2_ac_install_merge/kde-apps/kdepim-l10n/fix
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/fix
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/kdepim-l10n/fix
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/konsole/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-apps/konsole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/konsole/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/konsole/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme b/profiles/templates/3.6/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
rename to profiles/templates/3.6/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdelibs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdelibs/kdeglobals b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdelibs/kdeglobals
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdelibs/kdeglobals
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdelibs/kdeglobals
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot b/profiles/templates/3.6/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/konqueror/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-base/konqueror/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/konqueror/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/konqueror/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove b/profiles/templates/3.6/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/marble/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-base/marble/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/marble/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/marble/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-base/marble/marble-touch.desktop b/profiles/templates/3.6/2_ac_install_merge/kde-base/marble/marble-touch.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-base/marble/marble-touch.desktop
rename to profiles/templates/3.6/2_ac_install_merge/kde-base/marble/marble-touch.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz b/profiles/templates/3.6/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
rename to profiles/templates/3.6/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-misc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-misc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-misc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/breeze/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/breeze/Breeze.colors b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/kwin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/kwin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/kwin/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/kwin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kwin/cubecap.png b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/kwin/cubecap.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kwin/cubecap.png
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/kwin/cubecap.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml
rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/lxde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/90lxdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/90lxdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm.conf b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm b/profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/pam-lxdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm
rename to profiles/templates/3.6/2_ac_install_merge/lxde-base/lxdm/pam-lxdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop b/profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
rename to profiles/templates/3.6/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/mail-client/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/mail-client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/mail-client/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/mail-client/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/mail-client/claws-mail/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop b/profiles/templates/3.6/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
rename to profiles/templates/3.6/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/mail-client/trojita/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/mail-client/trojita/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/mail-client/trojita/trojita.desktop b/profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/trojita.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/mail-client/trojita/trojita.desktop
rename to profiles/templates/3.6/2_ac_install_merge/mail-client/trojita/trojita.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-fonts/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-fonts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-fonts/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-fonts/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf b/profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf b/profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf b/profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-fonts/terminus-font/change-unifont b/profiles/templates/3.6/2_ac_install_merge/media-fonts/terminus-font/change-unifont
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-fonts/terminus-font/change-unifont
rename to profiles/templates/3.6/2_ac_install_merge/media-fonts/terminus-font/change-unifont
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/feh/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/feh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/feh/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/feh/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/feh/feh.desktop b/profiles/templates/3.6/2_ac_install_merge/media-gfx/feh/feh.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/feh/feh.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/feh/feh.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/fontforge/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop b/profiles/templates/3.6/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old b/profiles/templates/3.6/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/gimp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/gimp/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/99gimp b/profiles/templates/3.6/2_ac_install_merge/media-gfx/gimp/99gimp
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/99gimp
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/gimp/99gimp
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop b/profiles/templates/3.6/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop b/profiles/templates/3.6/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults b/profiles/templates/3.6/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml b/profiles/templates/3.6/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/splash b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7 b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh b/profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh
rename to profiles/templates/3.6/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf b/profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/libsdl/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/libsdl/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/libsdl/99sdl b/profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/99sdl
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/libsdl/99sdl
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/99sdl
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/openimageio/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-libs/openimageio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/openimageio/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/openimageio/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-sound/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-sound/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-sound/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/changemixer b/profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/changemixer
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/changemixer
rename to profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/changemixer
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/default/alsasound b/profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
rename to profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-sound/pulseaudio/daemon.conf b/profiles/templates/3.6/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-tv/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/kodi/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-tv/kodi/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/kodi/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/kodi/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/kodi/xbmc.desktop b/profiles/templates/3.6/2_ac_install_merge/media-tv/kodi/xbmc.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/kodi/xbmc.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/kodi/xbmc.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules b/profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-video/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop b/profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/mplayer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/mplayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/mplayer/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-video/mplayer/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/mplayer/mplayer.conf b/profiles/templates/3.6/2_ac_install_merge/media-video/mplayer/mplayer.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/mplayer/mplayer.conf
rename to profiles/templates/3.6/2_ac_install_merge/media-video/mplayer/mplayer.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop b/profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/smtube/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/smtube/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/media-video/smtube/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/media-video/smtube/smtube.desktop b/profiles/templates/3.6/2_ac_install_merge/media-video/smtube/smtube.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/media-video/smtube/smtube.desktop
rename to profiles/templates/3.6/2_ac_install_merge/media-video/smtube/smtube.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-dns/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-dns/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-dns/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-dns/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-dns/bind/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-dns/bind/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-dns/bind/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-dns/bind/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-dns/bind/init.d.named b/profiles/templates/3.6/2_ac_install_merge/net-dns/bind/init.d.named
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-dns/bind/init.d.named
rename to profiles/templates/3.6/2_ac_install_merge/net-dns/bind/init.d.named
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-dns/bind/named b/profiles/templates/3.6/2_ac_install_merge/net-dns/bind/named
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-dns/bind/named
rename to profiles/templates/3.6/2_ac_install_merge/net-dns/bind/named
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-fs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-fs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-fs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-fs/samba/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-fs/samba/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-fs/samba/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-fs/samba/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-fs/samba/smb.conf b/profiles/templates/3.6/2_ac_install_merge/net-fs/samba/smb.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-fs/samba/smb.conf
rename to profiles/templates/3.6/2_ac_install_merge/net-fs/samba/smb.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-im/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-im/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-im/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-im/ejabberd/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-im/ejabberd/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-im/ejabberd/ejabberd b/profiles/templates/3.6/2_ac_install_merge/net-im/ejabberd/ejabberd
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-im/ejabberd/ejabberd
rename to profiles/templates/3.6/2_ac_install_merge/net-im/ejabberd/ejabberd
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-im/skype/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-im/skype/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-im/skype/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-im/skype/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-im/skype/99skype b/profiles/templates/3.6/2_ac_install_merge/net-im/skype/99skype
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-im/skype/99skype
rename to profiles/templates/3.6/2_ac_install_merge/net-im/skype/99skype
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/dhcp/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-misc/dhcp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/dhcp/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/dhcp/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/dhcp/dhclient.conf b/profiles/templates/3.6/2_ac_install_merge/net-misc/dhcp/dhclient.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/dhcp/dhclient.conf
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/dhcp/dhclient.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png b/profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png b/profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop b/profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/modemmanager/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service b/profiles/templates/3.6/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example b/profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/02_link_net.example b/profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/02_link_net.example
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/02_link_net.example
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/02_link_net.example
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/dhclient.sh b/profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/dhclient.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/netifrc/dhclient.sh
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/netifrc/dhclient.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/ssh/ssh_config b/profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config b/profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit b/profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
rename to profiles/templates/3.6/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-nds/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-nds/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-nds/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-nds/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-nds/portmap/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-nds/portmap/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-nds/portmap/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-nds/portmap/default/portmap b/profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/portmap
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-nds/portmap/default/portmap
rename to profiles/templates/3.6/2_ac_install_merge/net-nds/portmap/default/portmap
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-print/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-print/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-print/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-print/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-print/cups/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-print/cups/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-print/cups/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-print/cups/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-print/cups/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-print/cups/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-print/cups/default/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-print/cups/default/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-print/cups/default/cupsd b/profiles/templates/3.6/2_ac_install_merge/net-print/cups/default/cupsd
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-print/cups/default/cupsd
rename to profiles/templates/3.6/2_ac_install_merge/net-print/cups/default/cupsd
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-print/hplip/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-print/hplip/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-print/hplip/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-print/hplip/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-print/hplip/hplip-systray.desktop b/profiles/templates/3.6/2_ac_install_merge/net-print/hplip/hplip-systray.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-print/hplip/hplip-systray.desktop
rename to profiles/templates/3.6/2_ac_install_merge/net-print/hplip/hplip-systray.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-print/hplip/hplip.desktop b/profiles/templates/3.6/2_ac_install_merge/net-print/hplip/hplip.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-print/hplip/hplip.desktop
rename to profiles/templates/3.6/2_ac_install_merge/net-print/hplip/hplip.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-wireless/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-wireless/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0 b/profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
rename to profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules b/profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
rename to profiles/templates/3.6/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/filesystems b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/filesystems
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/filesystems
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/filesystems
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/gentoo-release b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/gentoo-release
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/gentoo-release
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/gentoo-release
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/issue b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/issue
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/issue
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/issue
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/os-release b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/os-release
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/os-release
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/os-release
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/sysctl.conf b/profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6 b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/boot/dbus b/profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/boot/dbus
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/boot/dbus
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/boot/dbus
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/default/dbus.del b/profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/default/dbus.del
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/dbus/default/dbus.del
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/dbus/default/dbus.del
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/hdparm/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/hdparm/hdparm b/profiles/templates/3.6/2_ac_install_merge/sys-apps/hdparm/hdparm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/hdparm/hdparm
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/hdparm/hdparm
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove b/profiles/templates/3.6/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/hostname b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/netmount b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/swap b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/swap
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/swap
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/conf.d/swap
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/consolefont b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/consolefont
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/consolefont
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/consolefont
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/init.sh b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/init.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/init.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/init.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/killprocs b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/killprocs
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/killprocs
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/killprocs
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/modules b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/modules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/modules
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/modules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/mtab b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/mtab
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/mtab
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/mtab
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/rc.conf b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/rc.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/rc.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/rc.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/runlevels.mtab b/profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/main.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/depgraph.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/depgraph.py
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/depgraph.py
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/depgraph.py
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/make.conf.base b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/make.conf.base
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/portage/make.conf.base
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/make.conf.base
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/sandbox/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop b/profiles/templates/3.6/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/login.defs b/profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/login.defs
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/login.defs
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/login.defs
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/subgid b/profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/subgid
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/subgid
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/subgid
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/subuid b/profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/subuid
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/subuid
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/shadow/subuid
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab b/profiles/templates/3.6/2_ac_install_merge/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab
rename to profiles/templates/3.6/2_ac_install_merge/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/boot/consolekit b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/consolekit b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/consolekit
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/consolekit
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/consolekit
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules b/profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/elogind/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/elogind/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/elogind/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/elogind/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules b/profiles/templates/3.6/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/su b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/su
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/su
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/su
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-login b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-login
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-login
rename to profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-login
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/default.grub b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/default.grub
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/default.grub
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/default.grub
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/00_header b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/00_header
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/00_header
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/00_header
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/05_theme b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/05_theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/05_theme
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/05_theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/10_linux b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/10_linux
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/10_linux
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/10_linux
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober b/profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober
rename to profiles/templates/3.6/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-devel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-devel/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-devel/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/binutils/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-devel/binutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-devel/binutils/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-devel/binutils/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/binutils/binutils_drop_old b/profiles/templates/3.6/2_ac_install_merge/sys-devel/binutils/binutils_drop_old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-devel/binutils/binutils_drop_old
rename to profiles/templates/3.6/2_ac_install_merge/sys-devel/binutils/binutils_drop_old
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/gcc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-devel/gcc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-devel/gcc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-devel/gcc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/gcc/gcc_default_set b/profiles/templates/3.6/2_ac_install_merge/sys-devel/gcc/gcc_default_set
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-devel/gcc/gcc_default_set
rename to profiles/templates/3.6/2_ac_install_merge/sys-devel/gcc/gcc_default_set
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-devel/prelink/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-devel/prelink/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink b/profiles/templates/3.6/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
rename to profiles/templates/3.6/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/50-firmware.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/50-firmware.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/write_net_rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/write_net_rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/eudev/write_net_rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/write_net_rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/fuse/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/fuse/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/fuse/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/fuse/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/fuse/fuse b/profiles/templates/3.6/2_ac_install_merge/sys-fs/fuse/fuse
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/fuse/fuse
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/fuse/fuse
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/mtools/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/mtools/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/mtools/mtools.conf b/profiles/templates/3.6/2_ac_install_merge/sys-fs/mtools/mtools.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/mtools/mtools.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/mtools/mtools.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla b/profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
rename to profiles/templates/3.6/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/conf.d.nscd b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/locale.gen b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/locale.gen
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/locale.gen
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/locale.gen
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nscd-refresh b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nscd-refresh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nscd-refresh
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nscd-refresh
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nscd.conf b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nscd.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nscd.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nscd.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nsswitch.conf b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-libs/gpm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/gpm/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/gpm b/profiles/templates/3.6/2_ac_install_merge/sys-libs/gpm/gpm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/gpm
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/gpm/gpm
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-libs/pam/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/pam/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf b/profiles/templates/3.6/2_ac_install_merge/sys-libs/pam/CDS.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf
rename to profiles/templates/3.6/2_ac_install_merge/sys-libs/pam/CDS.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/cronie/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/cronie/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/cronie/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/cronie/default/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/default/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/cronie/default/cronie b/profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/default/cronie
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/cronie/default/cronie
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/cronie/default/cronie
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/htop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/htop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/htop/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/htop/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/htop/htop.desktop b/profiles/templates/3.6/2_ac_install_merge/sys-process/htop/htop.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/htop/htop.desktop
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/htop/htop.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron b/profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
rename to profiles/templates/3.6/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-apps/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-apps/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/.calculate_directory
diff --git a/profiles/templates/3.5/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
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
rename to profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
rename to profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/env.d/90xsession b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
rename to profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xmessage/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xmessage/Xmessage b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xmessage/Xmessage
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-apps/xmessage/Xmessage
rename to profiles/templates/3.6/2_ac_install_merge/x11-apps/xmessage/Xmessage
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
diff --git a/profiles/templates/3.5/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
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
diff --git a/profiles/templates/3.5/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
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/default/xdm.del b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/init.d/xdm b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop b/profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop
rename to profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
rename to profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/gtk+/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/gtk+/gtkrc b/profiles/templates/3.6/2_ac_install_merge/x11-libs/gtk+/gtkrc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/gtk+/gtkrc
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/gtk+/gtkrc
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/99libX11 b/profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/99libX11
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/99libX11
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/99libX11
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/Compose b/profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/Compose
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/Compose
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/Compose
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings b/profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/pango/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-libs/pango/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/pango/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/pango/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/pango/pango.modules b/profiles/templates/3.6/2_ac_install_merge/x11-libs/pango/pango.modules
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/pango/pango.modules
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/pango/pango.modules
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme b/profiles/templates/3.6/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-libs/wxGTK/select-default b/profiles/templates/3.6/2_ac_install_merge/x11-libs/wxGTK/select-default
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-libs/wxGTK/select-default
rename to profiles/templates/3.6/2_ac_install_merge/x11-libs/wxGTK/select-default
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/99lightdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/99lightdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm.conf
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm.conf
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop b/profiles/templates/3.6/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/group b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/group
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/group
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/group
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xstop b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/Xstop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xstop
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/scripts/Xstop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/sddm b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/sddm
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/sddm-0.15 b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm-0.15
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/sddm-0.15
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm-0.15
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/sddm-greeter b/profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm-greeter
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/sddm/sddm-greeter
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/sddm/sddm-greeter
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86 b/profiles/templates/3.6/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
rename to profiles/templates/3.6/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-terms/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-terms/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-terms/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-terms/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-terms/qterminal/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop b/profiles/templates/3.6/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
rename to profiles/templates/3.6/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme b/profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache b/profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces b/profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces b/profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces b/profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old b/profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0 b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/greybird/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/greybird/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/greybird/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/greybird/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css b/profiles/templates/3.6/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/greybird/gtk.css b/profiles/templates/3.6/2_ac_install_merge/x11-themes/greybird/gtk.css
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/greybird/gtk.css
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/greybird/gtk.css
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache b/profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg b/profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
rename to profiles/templates/3.6/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop b/profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml b/profiles/templates/3.6/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/thunar/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/thunar/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/thunar/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/thunar/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/thunar/uca.xml b/profiles/templates/3.6/2_ac_install_merge/xfce-base/thunar/uca.xml
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/thunar/uca.xml
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/thunar/uca.xml
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-session/xflock4 b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-session/xflock4
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfce4-session/xflock4
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-session/xflock4
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfdesktop/kioskrc b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg b/profiles/templates/3.6/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
rename to profiles/templates/3.6/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-extra/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-extra/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-extra/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64 b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64 b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64 b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64 b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
rename to profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
diff --git a/profiles/templates/3.5/3_ac_install_live/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/calculate b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/calculate
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/calculate
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/calculate
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/domain
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/domain
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/domain.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/domain.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/livecd b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/livecd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/sudo/livecd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/sudo/livecd
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/gnome-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/gnome-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
rename to profiles/templates/3.6/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/mtools/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-fs/mtools/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-plasma/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxde-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxde-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.clr b/profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
rename to profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.crt b/profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
rename to profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.key b/profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.key
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.key
rename to profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.key
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.pem b/profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
rename to profiles/templates/3.6/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14 b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14 b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14 b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15 b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14 b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15 b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg b/profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-im/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-im/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.clr b/profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.crt b/profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.key b/profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.key
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.key
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.key
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.pem b/profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-irc/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-irc/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.clr b/profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.crt b/profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.key b/profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.key
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.key
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.key
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.pem b/profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0 b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1 b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2 b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3 b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/ntp/clocksync
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/ntp/clocksync
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/sshd b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/ssh_config b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/ssh_config
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/openssh/ssh_config
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/openssh/ssh_config
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/wget/wgetrc b/profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/wget/wgetrc
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/wget/wgetrc
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-misc/wget/wgetrc
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/slapd b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/slapd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/openldap/slapd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/slapd
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-nds/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth b/profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/bluez/main.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-wireless/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/hosts b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/localtime b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/timezone b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net.orig b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net.orig
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net.orig
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net.orig
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0 b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1 b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2 b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3 b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/portage/make.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/make.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/portage/make.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/make.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/preload b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/preload b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default/preload
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/preload
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/default/preload
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/preload b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/preload
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/preload/preload
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/preload/preload
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/su b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/su
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/su
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/su
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/menu.lst b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/lvm b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-devel/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-fs/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-kernel/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14 b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15 b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14 b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15 b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png
diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/layman/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/app-portage/layman/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old
rename to profiles/templates/3.6/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub b/profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-themes/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml b/profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml b/profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/3.6/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/Depends/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/Depends/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/calculate-server b/profiles/templates/3.6/3_ac_install_live/Depends/calculate-server
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/calculate-server
rename to profiles/templates/3.6/3_ac_install_live/Depends/calculate-server
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/calculate-wallpapers b/profiles/templates/3.6/3_ac_install_live/Depends/calculate-wallpapers
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/calculate-wallpapers
rename to profiles/templates/3.6/3_ac_install_live/Depends/calculate-wallpapers
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/cinnamon-session b/profiles/templates/3.6/3_ac_install_live/Depends/cinnamon-session
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/cinnamon-session
rename to profiles/templates/3.6/3_ac_install_live/Depends/cinnamon-session
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/dhcp b/profiles/templates/3.6/3_ac_install_live/Depends/dhcp
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/dhcp
rename to profiles/templates/3.6/3_ac_install_live/Depends/dhcp
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/dm-themes-calculate b/profiles/templates/3.6/3_ac_install_live/Depends/dm-themes-calculate
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/dm-themes-calculate
rename to profiles/templates/3.6/3_ac_install_live/Depends/dm-themes-calculate
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/dracut b/profiles/templates/3.6/3_ac_install_live/Depends/dracut
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/dracut
rename to profiles/templates/3.6/3_ac_install_live/Depends/dracut
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/droid b/profiles/templates/3.6/3_ac_install_live/Depends/droid
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/droid
rename to profiles/templates/3.6/3_ac_install_live/Depends/droid
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/gnome-backgrounds b/profiles/templates/3.6/3_ac_install_live/Depends/gnome-backgrounds
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/gnome-backgrounds
rename to profiles/templates/3.6/3_ac_install_live/Depends/gnome-backgrounds
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/greybird b/profiles/templates/3.6/3_ac_install_live/Depends/greybird
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/greybird
rename to profiles/templates/3.6/3_ac_install_live/Depends/greybird
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/grub-splashes-calculate b/profiles/templates/3.6/3_ac_install_live/Depends/grub-splashes-calculate
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/grub-splashes-calculate
rename to profiles/templates/3.6/3_ac_install_live/Depends/grub-splashes-calculate
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/gtkplus b/profiles/templates/3.6/3_ac_install_live/Depends/gtkplus
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/gtkplus
rename to profiles/templates/3.6/3_ac_install_live/Depends/gtkplus
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/kdelibs b/profiles/templates/3.6/3_ac_install_live/Depends/kdelibs
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/kdelibs
rename to profiles/templates/3.6/3_ac_install_live/Depends/kdelibs
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/kmix b/profiles/templates/3.6/3_ac_install_live/Depends/kmix
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/kmix
rename to profiles/templates/3.6/3_ac_install_live/Depends/kmix
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/kodi b/profiles/templates/3.6/3_ac_install_live/Depends/kodi
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/kodi
rename to profiles/templates/3.6/3_ac_install_live/Depends/kodi
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/light-locker b/profiles/templates/3.6/3_ac_install_live/Depends/light-locker
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/light-locker
rename to profiles/templates/3.6/3_ac_install_live/Depends/light-locker
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/lightdm b/profiles/templates/3.6/3_ac_install_live/Depends/lightdm
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/lightdm
rename to profiles/templates/3.6/3_ac_install_live/Depends/lightdm
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/lightdm-themes-calculate b/profiles/templates/3.6/3_ac_install_live/Depends/lightdm-themes-calculate
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/lightdm-themes-calculate
rename to profiles/templates/3.6/3_ac_install_live/Depends/lightdm-themes-calculate
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/lxdm b/profiles/templates/3.6/3_ac_install_live/Depends/lxdm
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/lxdm
rename to profiles/templates/3.6/3_ac_install_live/Depends/lxdm
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/lxqt-session b/profiles/templates/3.6/3_ac_install_live/Depends/lxqt-session
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/lxqt-session
rename to profiles/templates/3.6/3_ac_install_live/Depends/lxqt-session
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/mate-session-manager b/profiles/templates/3.6/3_ac_install_live/Depends/mate-session-manager
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/mate-session-manager
rename to profiles/templates/3.6/3_ac_install_live/Depends/mate-session-manager
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/openrc b/profiles/templates/3.6/3_ac_install_live/Depends/openrc
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/openrc
rename to profiles/templates/3.6/3_ac_install_live/Depends/openrc
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/sddm b/profiles/templates/3.6/3_ac_install_live/Depends/sddm
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/sddm
rename to profiles/templates/3.6/3_ac_install_live/Depends/sddm
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/slim b/profiles/templates/3.6/3_ac_install_live/Depends/slim
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/slim
rename to profiles/templates/3.6/3_ac_install_live/Depends/slim
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/splash-themes-calculate b/profiles/templates/3.6/3_ac_install_live/Depends/splash-themes-calculate
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/splash-themes-calculate
rename to profiles/templates/3.6/3_ac_install_live/Depends/splash-themes-calculate
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/util-linux b/profiles/templates/3.6/3_ac_install_live/Depends/util-linux
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/util-linux
rename to profiles/templates/3.6/3_ac_install_live/Depends/util-linux
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/xbmc b/profiles/templates/3.6/3_ac_install_live/Depends/xbmc
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/xbmc
rename to profiles/templates/3.6/3_ac_install_live/Depends/xbmc
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/xfce4-session b/profiles/templates/3.6/3_ac_install_live/Depends/xfce4-session
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/xfce4-session
rename to profiles/templates/3.6/3_ac_install_live/Depends/xfce4-session
diff --git a/profiles/templates/3.5/3_ac_install_live/Depends/xfdesktop b/profiles/templates/3.6/3_ac_install_live/Depends/xfdesktop
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Depends/xfdesktop
rename to profiles/templates/3.6/3_ac_install_live/Depends/xfdesktop
diff --git a/profiles/templates/3.5/3_ac_install_live/Postmerge/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/Postmerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Postmerge/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/Postmerge/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/Postmerge/calculate-sources b/profiles/templates/3.6/3_ac_install_live/Postmerge/calculate-sources
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Postmerge/calculate-sources
rename to profiles/templates/3.6/3_ac_install_live/Postmerge/calculate-sources
diff --git a/profiles/templates/3.5/3_ac_install_live/Postmerge/calculate-utils b/profiles/templates/3.6/3_ac_install_live/Postmerge/calculate-utils
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Postmerge/calculate-utils
rename to profiles/templates/3.6/3_ac_install_live/Postmerge/calculate-utils
diff --git a/profiles/templates/3.5/3_ac_install_live/Postmerge/file b/profiles/templates/3.6/3_ac_install_live/Postmerge/file
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/Postmerge/file
rename to profiles/templates/3.6/3_ac_install_live/Postmerge/file
diff --git a/profiles/templates/3.5/3_ac_install_live/README-eng.txt b/profiles/templates/3.6/3_ac_install_live/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/README-eng.txt
rename to profiles/templates/3.6/3_ac_install_live/README-eng.txt
diff --git a/profiles/templates/3.5/3_ac_install_live/README-rus.txt b/profiles/templates/3.6/3_ac_install_live/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/README-rus.txt
rename to profiles/templates/3.6/3_ac_install_live/README-rus.txt
diff --git a/profiles/templates/3.5/5_ac_client_configure/.calculate_directory b/profiles/templates/3.6/5_ac_client_configure/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/5_ac_client_configure/.calculate_directory
rename to profiles/templates/3.6/5_ac_client_configure/.calculate_directory
diff --git a/profiles/templates/3.5/5_ac_client_configure/README-eng.txt b/profiles/templates/3.6/5_ac_client_configure/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/5_ac_client_configure/README-eng.txt
rename to profiles/templates/3.6/5_ac_client_configure/README-eng.txt
diff --git a/profiles/templates/3.5/5_ac_client_configure/README-rus.txt b/profiles/templates/3.6/5_ac_client_configure/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/5_ac_client_configure/README-rus.txt
rename to profiles/templates/3.6/5_ac_client_configure/README-rus.txt
diff --git a/profiles/templates/3.5/5_ac_client_configure/calculate.env b/profiles/templates/3.6/5_ac_client_configure/calculate.env
similarity index 100%
rename from profiles/templates/3.5/5_ac_client_configure/calculate.env
rename to profiles/templates/3.6/5_ac_client_configure/calculate.env
diff --git a/profiles/templates/3.5/5_ac_client_configure/nscd.start b/profiles/templates/3.6/5_ac_client_configure/nscd.start
similarity index 100%
rename from profiles/templates/3.5/5_ac_client_configure/nscd.start
rename to profiles/templates/3.6/5_ac_client_configure/nscd.start
diff --git a/profiles/templates/3.5/5_ac_client_configure/nscd.stop b/profiles/templates/3.6/5_ac_client_configure/nscd.stop
similarity index 100%
rename from profiles/templates/3.5/5_ac_client_configure/nscd.stop
rename to profiles/templates/3.6/5_ac_client_configure/nscd.stop
diff --git a/profiles/templates/3.5/6_ac_backup_create/.calculate_directory b/profiles/templates/3.6/6_ac_backup_create/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_create/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/.calculate_directory b/profiles/templates/3.6/6_ac_backup_create/1-root/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_create/1-root/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.env b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/calculate/calculate.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.env
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/calculate/calculate.env
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.ldap b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/calculate/calculate.ldap
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.ldap
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/calculate/calculate.ldap
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/calculate/ini.env b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/calculate/ini.env
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/conf.d/hostname b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/conf.d/hostname
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/conf.d/hostname
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/conf.d/modules b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/conf.d/modules
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/conf.d/modules
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/conf.d/modules
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/conf.d/net b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/conf.d/net
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/conf.d/net
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/conf.d/net
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/resolv.conf b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/resolv.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/resolv.conf
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/resolv.conf
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf b/profiles/templates/3.6/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf
rename to profiles/templates/3.6/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory b/profiles/templates/3.6/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/var.lib.calculate/calculate.env b/profiles/templates/3.6/6_ac_backup_create/1-root/var.lib.calculate/calculate.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/var.lib.calculate/calculate.env
rename to profiles/templates/3.6/6_ac_backup_create/1-root/var.lib.calculate/calculate.env
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/var.lib.calculate/ini.env b/profiles/templates/3.6/6_ac_backup_create/1-root/var.lib.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/var.lib.calculate/ini.env
rename to profiles/templates/3.6/6_ac_backup_create/1-root/var.lib.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_backup_restore/.calculate_directory b/profiles/templates/3.6/6_ac_backup_restore/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_restore/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_restore/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_service/.calculate_directory b/profiles/templates/3.6/6_ac_backup_service/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_service/.calculate_directory
rename to profiles/templates/3.6/6_ac_backup_service/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_container/.calculate_directory b/profiles/templates/3.6/6_ac_builder_container/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_container/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_container/README-eng.txt b/profiles/templates/3.6/6_ac_builder_container/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/README-eng.txt
rename to profiles/templates/3.6/6_ac_builder_container/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_builder_container/README-rus.txt b/profiles/templates/3.6/6_ac_builder_container/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/README-rus.txt
rename to profiles/templates/3.6/6_ac_builder_container/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_builder_container/lxd/metadata.yaml b/profiles/templates/3.6/6_ac_builder_container/lxd/metadata.yaml
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/lxd/metadata.yaml
rename to profiles/templates/3.6/6_ac_builder_container/lxd/metadata.yaml
diff --git a/profiles/templates/3.5/6_ac_builder_container/lxd/templates/hostname.tpl b/profiles/templates/3.6/6_ac_builder_container/lxd/templates/hostname.tpl
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/lxd/templates/hostname.tpl
rename to profiles/templates/3.6/6_ac_builder_container/lxd/templates/hostname.tpl
diff --git a/profiles/templates/3.5/6_ac_builder_container/lxd/templates/hosts.tpl b/profiles/templates/3.6/6_ac_builder_container/lxd/templates/hosts.tpl
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/lxd/templates/hosts.tpl
rename to profiles/templates/3.6/6_ac_builder_container/lxd/templates/hosts.tpl
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/config b/profiles/templates/3.6/6_ac_builder_container/meta/config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/meta/config
rename to profiles/templates/3.6/6_ac_builder_container/meta/config
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/config-user b/profiles/templates/3.6/6_ac_builder_container/meta/config-user
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/meta/config-user
rename to profiles/templates/3.6/6_ac_builder_container/meta/config-user
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/create-message b/profiles/templates/3.6/6_ac_builder_container/meta/create-message
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/meta/create-message
rename to profiles/templates/3.6/6_ac_builder_container/meta/create-message
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/excludes-user b/profiles/templates/3.6/6_ac_builder_container/meta/excludes-user
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/meta/excludes-user
rename to profiles/templates/3.6/6_ac_builder_container/meta/excludes-user
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/expiry b/profiles/templates/3.6/6_ac_builder_container/meta/expiry
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/meta/expiry
rename to profiles/templates/3.6/6_ac_builder_container/meta/expiry
diff --git a/profiles/templates/3.5/6_ac_builder_container/meta/templates b/profiles/templates/3.6/6_ac_builder_container/meta/templates
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_container/meta/templates
rename to profiles/templates/3.6/6_ac_builder_container/meta/templates
diff --git a/profiles/templates/3.5/6_ac_builder_iso/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/0-bootparam.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/0-bootparam.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/0-bootparam.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/0-bootparam.config
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/desktop.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/desktop.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/keymap.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/keymap.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/keymap.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/keymap.config
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/lang.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/lang.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/lang.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/lang.config
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/server.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/server.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/timezone.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/timezone.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/timezone.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/timezone.config
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/vga.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/vga.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/vga.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/vga.config
diff --git a/profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/video.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/video.config
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/0_bootmenu/video.config
rename to profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/video.config
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2 b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz b/profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
rename to profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
diff --git a/profiles/templates/3.5/6_ac_builder_iso/9_bootmenu/.calculate_directory b/profiles/templates/3.6/6_ac_builder_iso/9_bootmenu/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/9_bootmenu/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_iso/9_bootmenu/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_iso/README-eng.txt b/profiles/templates/3.6/6_ac_builder_iso/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/README-eng.txt
rename to profiles/templates/3.6/6_ac_builder_iso/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_builder_iso/README-rus.txt b/profiles/templates/3.6/6_ac_builder_iso/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/README-rus.txt
rename to profiles/templates/3.6/6_ac_builder_iso/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/.calculate_directory b/profiles/templates/3.6/6_ac_builder_prepare/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_prepare/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/README-eng.txt b/profiles/templates/3.6/6_ac_builder_prepare/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/README-eng.txt
rename to profiles/templates/3.6/6_ac_builder_prepare/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/README-rus.txt b/profiles/templates/3.6/6_ac_builder_prepare/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/README-rus.txt
rename to profiles/templates/3.6/6_ac_builder_prepare/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/baselayout/localtime b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/baselayout/localtime
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/baselayout/localtime
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/baselayout/localtime
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/openrc/resolv.conf b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/portage/.calculate_directory b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/portage/builder b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/portage/builder
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/portage/builder
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/portage/builder
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory b/profiles/templates/3.6/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/.calculate_directory b/profiles/templates/3.6/6_ac_builder_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_setup/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/README-eng.txt b/profiles/templates/3.6/6_ac_builder_setup/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/README-eng.txt
rename to profiles/templates/3.6/6_ac_builder_setup/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_builder_setup/README-rus.txt b/profiles/templates/3.6/6_ac_builder_setup/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/README-rus.txt
rename to profiles/templates/3.6/6_ac_builder_setup/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory b/profiles/templates/3.6/6_ac_builder_setup/app-portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_setup/app-portage/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory b/profiles/templates/3.6/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_prepare/sys-apps/.calculate_directory b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_prepare/sys-apps/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/.calculate_directory b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/etc-update.conf b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/etc-update.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/etc-update.conf
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/etc-update.conf
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/sets/custom b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/world_sets b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/world_sets
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/portage/world_sets
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/portage/world_sets
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/.calculate_directory b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs b/profiles/templates/3.6/6_ac_builder_setup/sys-apps/shadow/login.defs
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs
rename to profiles/templates/3.6/6_ac_builder_setup/sys-apps/shadow/login.defs
diff --git a/profiles/templates/3.5/6_ac_builder_squash/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/app-portage/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/app-portage/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/0-boot.boot b/profiles/templates/3.6/6_ac_builder_squash/0_clean/0-boot.boot
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/0-boot.boot
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/0-boot.boot
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/0-usr.src.linux b/profiles/templates/3.6/6_ac_builder_squash/0_clean/0-usr.src.linux
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/0-usr.src.linux
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/0-usr.src.linux
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/boot/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/boot/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/boot/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/distfiles/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/elog/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/elog/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/elog/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/elog/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost b/profiles/templates/3.6/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.bash_history b/profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.bash_history
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.bash_history
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.bash_history
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.lesshst b/profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.lesshst
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.lesshst
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.lesshst
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.viminfo b/profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.viminfo
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/root/.viminfo
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/root/.viminfo
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/tmp/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/tmp/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/tmp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/usr.src/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/usr.src/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/usr.src/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/usr.src/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/.locks b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/.locks
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/.locks
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/.locks
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/.svn-src b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/.svn-src
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/.svn-src
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/.svn-src
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/emerge.log b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/emerge.log
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/emerge.log
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/emerge.log
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/genkernel.log b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/genkernel.log
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/genkernel.log
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/genkernel.log
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/lastlog b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/lastlog
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/lastlog
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/lastlog
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/prelink.log b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/prelink.log
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/prelink.log
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/prelink.log
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/wtmp b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/wtmp
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/log/wtmp
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/log/wtmp
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_setup/sys-apps/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/boot.keep b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/boot.keep
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/boot.keep
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/boot.keep
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/root.keep b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/root.keep
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/root.keep
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/root.keep
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/tmp.keep b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/tmp.keep
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/tmp.keep
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/tmp.keep
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/usr.src.keep b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/usr.src.keep
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/usr.src.keep
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/usr.src.keep
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep b/profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep
rename to profiles/templates/3.6/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/0_clean/z-keep/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow- b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow-
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow-
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow-
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0 b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2 b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab b/profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
rename to profiles/templates/3.6/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
diff --git a/profiles/templates/3.5/6_ac_builder_squash/README-eng.txt b/profiles/templates/3.6/6_ac_builder_squash/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/README-eng.txt
rename to profiles/templates/3.6/6_ac_builder_squash/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_builder_squash/README-rus.txt b/profiles/templates/3.6/6_ac_builder_squash/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/README-rus.txt
rename to profiles/templates/3.6/6_ac_builder_squash/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/1-user-init/full_dir/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/full_dir/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/1-user-init/full_dir/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/1-user-init/full_dir/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig b/profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0 b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc b/profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/app-text/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig b/profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0 b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0 b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt b/profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal b/profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0 b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/media-video/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-im/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_backup_create/1-root/etc/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_backup_create/1-root/etc/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-news/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/www-client/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/3-system/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon b/profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
rename to profiles/templates/3.6/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/README-eng.txt b/profiles/templates/3.6/6_ac_desktop_profile/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/README-eng.txt
rename to profiles/templates/3.6/6_ac_desktop_profile/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/README-rus.txt b/profiles/templates/3.6/6_ac_desktop_profile/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/README-rus.txt
rename to profiles/templates/3.6/6_ac_desktop_profile/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_install_configure/.calculate_directory b/profiles/templates/3.6/6_ac_install_configure/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_configure/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_configure/README-eng.txt b/profiles/templates/3.6/6_ac_install_configure/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/README-eng.txt
rename to profiles/templates/3.6/6_ac_install_configure/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_install_configure/README-rus.txt b/profiles/templates/3.6/6_ac_install_configure/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/README-rus.txt
rename to profiles/templates/3.6/6_ac_install_configure/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_install_configure/audio b/profiles/templates/3.6/6_ac_install_configure/audio
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/audio
rename to profiles/templates/3.6/6_ac_install_configure/audio
diff --git a/profiles/templates/3.5/6_ac_install_configure/boot b/profiles/templates/3.6/6_ac_install_configure/boot
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/boot
rename to profiles/templates/3.6/6_ac_install_configure/boot
diff --git a/profiles/templates/3.5/6_ac_install_configure/locale b/profiles/templates/3.6/6_ac_install_configure/locale
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/locale
rename to profiles/templates/3.6/6_ac_install_configure/locale
diff --git a/profiles/templates/3.5/6_ac_install_configure/network b/profiles/templates/3.6/6_ac_install_configure/network
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/network
rename to profiles/templates/3.6/6_ac_install_configure/network
diff --git a/profiles/templates/3.5/6_ac_install_configure/session b/profiles/templates/3.6/6_ac_install_configure/session
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/session
rename to profiles/templates/3.6/6_ac_install_configure/session
diff --git a/profiles/templates/3.5/6_ac_install_configure/themes b/profiles/templates/3.6/6_ac_install_configure/themes
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/themes
rename to profiles/templates/3.6/6_ac_install_configure/themes
diff --git a/profiles/templates/3.5/6_ac_install_configure/video b/profiles/templates/3.6/6_ac_install_configure/video
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_configure/video
rename to profiles/templates/3.6/6_ac_install_configure/video
diff --git a/profiles/templates/3.5/6_ac_install_flash/.calculate_directory b/profiles/templates/3.6/6_ac_install_flash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_flash/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_flash/README-eng.txt b/profiles/templates/3.6/6_ac_install_flash/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/README-eng.txt
rename to profiles/templates/3.6/6_ac_install_flash/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_install_flash/README-rus.txt b/profiles/templates/3.6/6_ac_install_flash/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/README-rus.txt
rename to profiles/templates/3.6/6_ac_install_flash/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_install_flash/calculate-utils/.calculate_directory b/profiles/templates/3.6/6_ac_install_flash/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_flash/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory b/profiles/templates/3.6/6_ac_install_flash/calculate-utils/linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_flash/calculate-utils/linux/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32 b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
diff --git a/profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg b/profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
rename to profiles/templates/3.6/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
diff --git a/profiles/templates/3.5/6_ac_install_flash/grub/.calculate_directory b/profiles/templates/3.6/6_ac_install_flash/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/grub/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_flash/grub/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_flash/grub/grub.cfg b/profiles/templates/3.6/6_ac_install_flash/grub/grub.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/grub/grub.cfg
rename to profiles/templates/3.6/6_ac_install_flash/grub/grub.cfg
diff --git a/profiles/templates/3.5/6_ac_install_flash/syslinux/.calculate_directory b/profiles/templates/3.6/6_ac_install_flash/syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/syslinux/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_flash/syslinux/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_flash/syslinux/isolinux/isolinux.bin b/profiles/templates/3.6/6_ac_install_flash/syslinux/isolinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/syslinux/isolinux/isolinux.bin
rename to profiles/templates/3.6/6_ac_install_flash/syslinux/isolinux/isolinux.bin
diff --git a/profiles/templates/3.5/6_ac_install_flash/syslinux/syslinux/isolinux.bin b/profiles/templates/3.6/6_ac_install_flash/syslinux/syslinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/syslinux/syslinux/isolinux.bin
rename to profiles/templates/3.6/6_ac_install_flash/syslinux/syslinux/isolinux.bin
diff --git a/profiles/templates/3.5/6_ac_install_patch/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/README-eng.txt b/profiles/templates/3.6/6_ac_install_patch/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/README-eng.txt
rename to profiles/templates/3.6/6_ac_install_patch/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_install_patch/README-rus.txt b/profiles/templates/3.6/6_ac_install_patch/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/README-rus.txt
rename to profiles/templates/3.6/6_ac_install_patch/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/app-office/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/app-office/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch b/profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch
rename to profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch b/profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch
rename to profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch b/profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch
rename to profiles/templates/3.6/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch
diff --git a/profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-lang/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/dev-lang/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-lang/erlang/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-lang/erlang/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch b/profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
rename to profiles/templates/3.6/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/app-office/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/app-office/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/dev-libs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch b/profiles/templates/3.6/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch
rename to profiles/templates/3.6/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-lang/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-python/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-lang/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/dev-python/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-python/python-twitter/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-python/python-twitter/message_len.patch b/profiles/templates/3.6/6_ac_install_patch/dev-python/python-twitter/message_len.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-python/python-twitter/message_len.patch
rename to profiles/templates/3.6/6_ac_install_patch/dev-python/python-twitter/message_len.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-libs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-libs/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/kde-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-base/kdelibs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch b/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
rename to profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch b/profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
rename to profiles/templates/3.6/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/dev-python/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-frameworks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/dev-python/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/kde-frameworks/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch b/profiles/templates/3.6/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
rename to profiles/templates/3.6/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-base/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/kde-plasma/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-plasma/kwin/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-plasma/kwin/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch b/profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch
rename to profiles/templates/3.6/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-frameworks/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-frameworks/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch b/profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
rename to profiles/templates/3.6/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/kde-plasma/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/mail-filter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/kde-plasma/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/mail-filter/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch b/profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch
rename to profiles/templates/3.6/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/lxqt-base/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/lxqt-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/digikam/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/digikam/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/digikam/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/digikam/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/gimp/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/gimp/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/inkscape/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/text_align.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/text_align.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/text_align.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/text_align.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch b/profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/mail-filter/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/mail-filter/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-sound/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-sound/clementine/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-sound/clementine/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-sound/clementine/compile_error.patch b/profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/compile_error.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-sound/clementine/compile_error.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-sound/clementine/compile_error.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-video/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-video/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-video/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-video/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-video/vdr/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/media-video/vdr/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-video/vdr/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/media-video/vdr/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch b/profiles/templates/3.6/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch
rename to profiles/templates/3.6/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-gfx/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-im/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/choqok/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-im/choqok/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/choqok/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-im/choqok/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/choqok/branding.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/choqok/branding.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/choqok/branding.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-im/choqok/branding.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/README.txt b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/README.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/README.txt
rename to profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/README.txt
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/gajim/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-im/gajim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/gajim/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-im/gajim/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch b/profiles/templates/3.6/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/media-sound/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/media-sound/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-libs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-libs/libproxy/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-libs/libproxy/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-libs/libproxy/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-libs/libproxy/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch b/profiles/templates/3.6/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch b/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch b/profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-im/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-im/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-misc/openconnect/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-misc/openconnect/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-misc/openconnect/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-misc/openconnect/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch b/profiles/templates/3.6/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-libs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-print/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-libs/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-print/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-print/cnijfilter/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-print/cnijfilter/libpng15.patch b/profiles/templates/3.6/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-misc/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch b/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch b/profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink b/profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch b/profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove b/profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
rename to profiles/templates/3.6/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-print/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-print/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch b/profiles/templates/3.6/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/openrc/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/openrc/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/openrc/branding.patch b/profiles/templates/3.6/6_ac_install_patch/sys-apps/openrc/branding.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/openrc/branding.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/openrc/branding.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/portage/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/portage/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch b/profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/v86d/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/v86d/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch b/profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/net-wireless/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/net-wireless/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/40grub2 b/profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/40grub2
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/40grub2
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/40grub2
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/chroot.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/chroot.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/chroot.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/chroot.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch b/profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-apps/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-apps/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86 b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64 b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15 b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86 b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64 b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86 b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64 b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch b/profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-boot/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-boot/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-libs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch b/profiles/templates/3.6/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch
rename to profiles/templates/3.6/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-kernel/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-kernel/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch b/profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/sys-libs/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/sys-libs/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/light-locker/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/xscreensaver/branding.patch b/profiles/templates/3.6/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
rename to profiles/templates/3.6/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-drivers/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-drivers/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-base/garcon/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-base/garcon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-base/garcon/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-base/garcon/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch b/profiles/templates/3.6/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
rename to profiles/templates/3.6/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch b/profiles/templates/3.6/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
rename to profiles/templates/3.6/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-base/xfwm4/black_background.patch b/profiles/templates/3.6/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
rename to profiles/templates/3.6/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/x11-misc/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/x11-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-extra/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh b/profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
rename to profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch b/profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
rename to profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch b/profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
rename to profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
diff --git a/profiles/templates/3.5/6_ac_install_pxe/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/README-eng.txt b/profiles/templates/3.6/6_ac_install_pxe/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/README-eng.txt
rename to profiles/templates/3.6/6_ac_install_pxe/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_install_pxe/README-rus.txt b/profiles/templates/3.6/6_ac_install_pxe/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/README-rus.txt
rename to profiles/templates/3.6/6_ac_install_pxe/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-base/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-base/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-fs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/nfs b/profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
rename to profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/exports b/profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/exports
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-fs/nfs-utils/exports
rename to profiles/templates/3.6/6_ac_install_pxe/net-fs/nfs-utils/exports
diff --git a/profiles/templates/3.5/6_ac_install_patch/xfce-extra/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-ftp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_patch/xfce-extra/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-ftp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd b/profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
rename to profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd b/profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
rename to profiles/templates/3.6/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-fs/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-fs/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-misc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/default/dhcpd b/profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
rename to profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf b/profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
rename to profiles/templates/3.6/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-ftp/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-ftp/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/bootlogo b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/bootlogo
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/bootlogo
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/bootlogo
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/chain.c32 b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/chain.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/chain.c32
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/chain.c32
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32 b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32 b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32 b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/libutil.c32 b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/libutil.c32
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/libutil.c32
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.cfg b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.cfg
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/menu.cfg
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.patch b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/menu.patch
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.patch
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/menu.patch
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0 b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default b/profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
rename to profiles/templates/3.6/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
diff --git a/profiles/templates/3.5/6_ac_install_pxe/zzz_Final/.calculate_directory b/profiles/templates/3.6/6_ac_install_pxe/zzz_Final/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/zzz_Final/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_pxe/zzz_Final/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/README-eng.txt b/profiles/templates/3.6/6_ac_install_unmerge/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/README-eng.txt
rename to profiles/templates/3.6/6_ac_install_unmerge/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/README-rus.txt b/profiles/templates/3.6/6_ac_install_unmerge/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/README-rus.txt
rename to profiles/templates/3.6/6_ac_install_unmerge/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/clean_runlevels b/profiles/templates/3.6/6_ac_install_unmerge/clean_runlevels
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/clean_runlevels
rename to profiles/templates/3.6/6_ac_install_unmerge/clean_runlevels
diff --git a/profiles/templates/3.5/6_ac_install_pxe/net-misc/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/net-misc/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/media-sound/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_pxe/sys-boot/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_pxe/sys-boot/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules b/profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/recreate_initrd b/profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/restartUdev b/profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/restartUdev
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-fs/udev/restartUdev
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-fs/udev/restartUdev
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/media-sound/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/media-sound/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/clear b/profiles/templates/3.6/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
rename to profiles/templates/3.6/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-fs/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-fs/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
rename to profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start b/profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
rename to profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop b/profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
rename to profiles/templates/3.6/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
diff --git a/profiles/templates/3.5/6_ac_update_sync/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/README-eng.txt b/profiles/templates/3.6/6_ac_update_sync/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/README-eng.txt
rename to profiles/templates/3.6/6_ac_update_sync/README-eng.txt
diff --git a/profiles/templates/3.5/6_ac_update_sync/README-rus.txt b/profiles/templates/3.6/6_ac_update_sync/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/README-rus.txt
rename to profiles/templates/3.6/6_ac_update_sync/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_update_sync/binhost/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/binhost/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/binhost/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/binhost/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/binhost/binhost b/profiles/templates/3.6/6_ac_update_sync/binhost/binhost
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/binhost/binhost
rename to profiles/templates/3.6/6_ac_update_sync/binhost/binhost
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/remerge/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
rename to profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/104 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/104
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/104
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/104
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/107 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/107
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/107
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/107
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/110 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/110
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/110
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/110
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/113 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/113
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/113
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/113
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/116 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/116
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/116
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/116
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/119 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/119
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/119
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/119
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/120 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/120
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/120
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/120
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/121 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/121
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/121
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/121
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/123 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/123
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/123
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/123
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/124 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/124
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/124
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/124
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/127 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/127
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/127
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/127
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/128 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/128
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/128
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/128
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/129 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/129
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/129
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/129
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/133 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/133
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/133
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/133
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/135 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/135
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/135
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/135
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/136 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/136
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/136
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/136
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/138 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/138
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/138
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/138
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/140 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/140
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/140
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/140
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/142 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/142
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/142
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/142
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/143 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/143
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/143
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/143
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/145 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/145
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/145
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/145
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/148 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/148
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/148
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/148
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/149 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/149
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/149
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/149
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/152 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/152
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/152
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/152
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/155 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/155
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/155
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/155
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/157 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/157
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/157
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/157
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/159 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/159
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/159
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/159
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/161 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/161
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/161
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/161
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/163 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/163
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/163
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/163
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/164 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/164
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/164
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/164
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/166 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/166
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/166
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/166
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/167 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/167
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/167
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/167
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/168 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/168
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/168
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/168
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/174 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/174
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/174
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/174
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/175 b/profiles/templates/3.6/6_ac_update_sync/remerge/100-old/175
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/100-old/175
rename to profiles/templates/3.6/6_ac_update_sync/remerge/100-old/175
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161213
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161213
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161219 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161219
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161219
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161219
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161221 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161221
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161221
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161221
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161222
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161222
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161222.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161222.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161222.2
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161222.2
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161222.2
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161223 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161223
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161223
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161223
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161226 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161226
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161226
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161226
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161226.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161226.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161226.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161226.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161227 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161227
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161227
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161227
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161229 b/profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161229
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161229
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2016/20161229
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170110 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170110
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170110
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170110
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170111 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170111
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170111
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170111
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170112 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170112
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170112
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170112
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170119
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170119
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170119.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170119.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170119.2
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170119.2
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170119.2
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170125 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170125
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170125
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170125
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170201 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170201
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170201
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170201
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170207 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170207
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170207
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170207
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170215 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170215
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170215
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170215
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170217 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170217
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170217
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170217
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170218 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170218
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170218
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170218
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170301 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170301
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170301
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170301
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170302 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170302
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170302
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170302
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170317 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170317
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170317
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170317
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170320 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170320
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170320
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170320
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170329 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170329
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170329
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170329
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170405 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170405
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170405
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170405
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170411 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170411
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170411
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170411
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170417 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170417
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170417
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170417
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170418 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170418
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170418
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170418
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170418.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170418.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170418.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170418.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170426 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170426
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170426
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170426
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170522 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170522
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170522
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170522
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170522.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170522.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170522.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170522.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170523 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170523
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170523
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170523
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170525 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170525
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170525
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170525
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170626 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170626
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170626
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170626
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170629 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170629
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170629
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170629
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170630.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170630.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170630.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170630.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170704 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170704
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170704
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170704
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170804 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170804
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170804
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170804
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170915 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170915
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20170915
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20170915
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171107 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171107
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171107
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171107
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171107.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171107.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171107.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171107.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171107.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171107.2
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171107.2
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171107.2
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171114 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171114
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171114
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171114
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171206 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171206
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171206
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171206
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171207.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171207.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171207.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171207.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171209 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171209
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171209
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171209
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171215.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171215.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171215.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171215.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171215.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171215.2
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171215.2
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171215.2
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171223 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171223
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171223
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171223
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171226 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171226
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171226
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171226
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171228 b/profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171228
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2017/20171228
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2017/20171228
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180111 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180111
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180111
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180111
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180116.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180116.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180116.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180116.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180118 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180118
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180118
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180118
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180202 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180202
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180202
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180202
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180213 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180213
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180213
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180213
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180214 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180214
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180214
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180214
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180216.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180216.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180216.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.2
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180216.2
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180216.2
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180226 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180226
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180226
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180226
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180301 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180301
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180301
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180301
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180302.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.1
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180302.1
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.1
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180302.2 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.2
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180302.2
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180302.2
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180307 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180307
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180307
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180307
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180327 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180327
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180327
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180327
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180409 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180409
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180409
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180409
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180412 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180412
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180412
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180412
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180507 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180507
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180507
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180507
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180514 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180514
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180514
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180514
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180530 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180530
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180530
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180530
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180601 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180601
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180601
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180601
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180608 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180608
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180608
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180608
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180618 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180618
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180618
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180618
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180621 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180621
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180621
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180621
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180625 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180625
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180625
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2018/20180625
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/revision/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/revision/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8 b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0 b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/67-rebuild_bash b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/67-rebuild_bash
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/67-rebuild_bash
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/67-rebuild_bash
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/69-fix_breeze b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/69-fix_breeze
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/69-fix_breeze
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/69-fix_breeze
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/70-revert_prelink b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/70-revert_prelink
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/70-revert_prelink
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/70-revert_prelink
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/73-change_profile b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/73-change_profile
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/73-change_profile
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/73-change_profile
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/74-fix_imageview b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/74-fix_imageview
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/74-fix_imageview
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/74-fix_imageview
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/75-change_profile b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/75-change_profile
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/75-change_profile
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/75-change_profile
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/76-change_python b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/76-change_python
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/76-change_python
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/76-change_python
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/77-apply_calculate_env b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/77-apply_calculate_env
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/77-apply_calculate_env
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/77-apply_calculate_env
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/79-fix_kde_dirs b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/79-fix_kde_dirs
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/79-fix_kde_dirs
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/79-fix_kde_dirs
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/80-fix_rc_conf b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/80-fix_rc_conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/80-fix_rc_conf
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/80-fix_rc_conf
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/81-fix_localmount_conf b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/81-fix_localmount_conf
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/81-fix_localmount_conf
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/81-fix_localmount_conf
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/85-fix_calculate-sources b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/85-fix_calculate-sources
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/85-fix_calculate-sources
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/85-fix_calculate-sources
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/86-fix_eudev b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/86-fix_eudev
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/86-fix_eudev
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/86-fix_eudev
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/88-rescan_mirrors b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/88-rescan_mirrors
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/88-rescan_mirrors
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/88-rescan_mirrors
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/89-rebuild_sddm b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/89-rebuild_sddm
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/89-rebuild_sddm
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/89-rebuild_sddm
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/90-clear-outdated b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/90-clear-outdated
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/90-clear-outdated
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/90-clear-outdated
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/92-locale_gen b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/92-locale_gen
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/92-locale_gen
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/92-locale_gen
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/95-fix-shadow b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/95-fix-shadow
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/95-fix-shadow
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/95-fix-shadow
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/98-fix_ati-drivers b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/98-fix_ati-drivers
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/98-fix_ati-drivers
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/98-fix_ati-drivers
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo b/profiles/templates/3.6/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo
rename to profiles/templates/3.6/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/revision/2016/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g b/profiles/templates/3.6/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/20161215-fix-utils-migration b/profiles/templates/3.6/6_ac_update_sync/revision/2016/20161215-fix-utils-migration
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/20161215-fix-utils-migration
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/20161215-fix-utils-migration
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/20161221-rebuild_themes b/profiles/templates/3.6/6_ac_update_sync/revision/2016/20161221-rebuild_themes
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/20161221-rebuild_themes
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/20161221-rebuild_themes
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep b/profiles/templates/3.6/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/20161223-rebuild_sip b/profiles/templates/3.6/6_ac_update_sync/revision/2016/20161223-rebuild_sip
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/20161223-rebuild_sip
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/20161223-rebuild_sip
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm b/profiles/templates/3.6/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/20161228-rebuild_libx11 b/profiles/templates/3.6/6_ac_update_sync/revision/2016/20161228-rebuild_libx11
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2016/20161228-rebuild_libx11
rename to profiles/templates/3.6/6_ac_update_sync/revision/2016/20161228-rebuild_libx11
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/revision/2017/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170119-fix_automagic b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170119-fix_automagic
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170119-fix_automagic
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170119-fix_automagic
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170119.1-fix_automagic b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170119.1-fix_automagic
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170119.1-fix_automagic
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170119.1-fix_automagic
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170120-fix_gmp b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170120-fix_gmp
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170120-fix_gmp
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170120-fix_gmp
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170120.1-fix_dep b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170120.1-fix_dep
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170120.1-fix_dep
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170120.1-fix_dep
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170125-fix_klibc b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170125-fix_klibc
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170125-fix_klibc
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170125-fix_klibc
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170201-fix_ejabberd b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170201-fix_ejabberd
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170201-fix_ejabberd
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170201-fix_ejabberd
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170207-add_autodeps_set b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170207-add_autodeps_set
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170207-add_autodeps_set
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170207-add_autodeps_set
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170215.1-fix_repos b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170215.1-fix_repos
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170215.1-fix_repos
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170215.1-fix_repos
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170215.2-fix_repos b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170215.2-fix_repos
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170215.2-fix_repos
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170215.2-fix_repos
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170310-fix_splashutils b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170310-fix_splashutils
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170310-fix_splashutils
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170310-fix_splashutils
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170314-fix_backgrounds b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170314-fix_backgrounds
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170314-fix_backgrounds
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170314-fix_backgrounds
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170330-rebuild_klibc b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170330-rebuild_klibc
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170330-rebuild_klibc
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170330-rebuild_klibc
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170412-set_binutils b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170412-set_binutils
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170412-set_binutils
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170412-set_binutils
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170525-fix_calculate-update b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170525-fix_calculate-update
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170525-fix_calculate-update
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170525-fix_calculate-update
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170620-set_binutils b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170620-set_binutils
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170620-set_binutils
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170620-set_binutils
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170623.0-update_group_right b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170623.0-update_group_right
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170623.0-update_group_right
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170623.0-update_group_right
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170629-rebuild_nemo b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170629-rebuild_nemo
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170629-rebuild_nemo
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170629-rebuild_nemo
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170824-fix_postgresql b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20170824-fix_postgresql
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20170824-fix_postgresql
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20170824-fix_postgresql
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171107.1-fix_porthole b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171107.1-fix_porthole
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171107.1-fix_porthole
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171107.1-fix_porthole
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171214-rebuild_dracut b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171214-rebuild_dracut
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171214-rebuild_dracut
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171214-rebuild_dracut
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171215-fix_calculate-core b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171215-fix_calculate-core
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171215-fix_calculate-core
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171215-fix_calculate-core
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171227-rebuild_gajim b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171227-rebuild_gajim
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171227-rebuild_gajim
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171227-rebuild_gajim
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities b/profiles/templates/3.6/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities
rename to profiles/templates/3.6/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/revision/2018/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180110-rebuild_gajim b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180110-rebuild_gajim
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180110-rebuild_gajim
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180110-rebuild_gajim
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180126-rescan_mirrors b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180126-rescan_mirrors
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180126-rescan_mirrors
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180126-rescan_mirrors
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180621-kernel_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180621-kernel_rebuild
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180621-kernel_rebuild
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180621-kernel_rebuild
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2018/20180701-firefox_rebuild b/profiles/templates/3.6/6_ac_update_sync/revision/2018/20180701-firefox_rebuild
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/revision/2018/20180701-firefox_rebuild
rename to profiles/templates/3.6/6_ac_update_sync/revision/2018/20180701-firefox_rebuild
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/world/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/world/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.6/6_ac_update_sync/world/0-ini
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/0-ini
rename to profiles/templates/3.6/6_ac_update_sync/world/0-ini
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/world/create/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/create/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/world/create/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/0-world b/profiles/templates/3.6/6_ac_update_sync/world/create/0-world
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/create/0-world
rename to profiles/templates/3.6/6_ac_update_sync/world/create/0-world
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/base b/profiles/templates/3.6/6_ac_update_sync/world/create/base
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/create/base
rename to profiles/templates/3.6/6_ac_update_sync/world/create/base
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/world/update/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/world/update/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/world/update/100-old/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/world/update/100-old/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/02 b/profiles/templates/3.6/6_ac_update_sync/world/update/100-old/02
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/100-old/02
rename to profiles/templates/3.6/6_ac_update_sync/world/update/100-old/02
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/03 b/profiles/templates/3.6/6_ac_update_sync/world/update/100-old/03
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/100-old/03
rename to profiles/templates/3.6/6_ac_update_sync/world/update/100-old/03
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/05 b/profiles/templates/3.6/6_ac_update_sync/world/update/100-old/05
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/100-old/05
rename to profiles/templates/3.6/6_ac_update_sync/world/update/100-old/05
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/06 b/profiles/templates/3.6/6_ac_update_sync/world/update/100-old/06
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/100-old/06
rename to profiles/templates/3.6/6_ac_update_sync/world/update/100-old/06
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/07 b/profiles/templates/3.6/6_ac_update_sync/world/update/100-old/07
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/100-old/07
rename to profiles/templates/3.6/6_ac_update_sync/world/update/100-old/07
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/world/update/2017/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/2017/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/world/update/2017/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170329 b/profiles/templates/3.6/6_ac_update_sync/world/update/2017/20170329
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170329
rename to profiles/templates/3.6/6_ac_update_sync/world/update/2017/20170329
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2018/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/world/update/2018/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/2018/.calculate_directory
rename to profiles/templates/3.6/6_ac_update_sync/world/update/2018/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2018/20180626 b/profiles/templates/3.6/6_ac_update_sync/world/update/2018/20180626
similarity index 100%
rename from profiles/templates/3.5/6_ac_update_sync/world/update/2018/20180626
rename to profiles/templates/3.6/6_ac_update_sync/world/update/2018/20180626
diff --git a/profiles/templates/3.5/7_ac_server_ldif/.calculate_directory b/profiles/templates/3.6/7_ac_server_ldif/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_ldif/.calculate_directory
rename to profiles/templates/3.6/7_ac_server_ldif/.calculate_directory
diff --git a/profiles/templates/3.5/7_ac_server_ldif/base.ldif b/profiles/templates/3.6/7_ac_server_ldif/base.ldif
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_ldif/base.ldif
rename to profiles/templates/3.6/7_ac_server_ldif/base.ldif
diff --git a/profiles/templates/3.5/7_ac_server_ldif/unix_base.ldif b/profiles/templates/3.6/7_ac_server_ldif/unix_base.ldif
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_ldif/unix_base.ldif
rename to profiles/templates/3.6/7_ac_server_ldif/unix_base.ldif
diff --git a/profiles/templates/3.5/7_ac_server_ldif/unix_group.ldif b/profiles/templates/3.6/7_ac_server_ldif/unix_group.ldif
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_ldif/unix_group.ldif
rename to profiles/templates/3.6/7_ac_server_ldif/unix_group.ldif
diff --git a/profiles/templates/3.5/7_ac_server_ldif/unix_user.ldif b/profiles/templates/3.6/7_ac_server_ldif/unix_user.ldif
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_ldif/unix_user.ldif
rename to profiles/templates/3.6/7_ac_server_ldif/unix_user.ldif
diff --git a/profiles/templates/3.5/7_ac_server_setup/.calculate_directory b/profiles/templates/3.6/7_ac_server_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_setup/.calculate_directory
rename to profiles/templates/3.6/7_ac_server_setup/.calculate_directory
diff --git a/profiles/templates/3.5/7_ac_server_setup/ldap b/profiles/templates/3.6/7_ac_server_setup/ldap
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_setup/ldap
rename to profiles/templates/3.6/7_ac_server_setup/ldap
diff --git a/profiles/templates/3.5/7_ac_server_setup/ldap.pre b/profiles/templates/3.6/7_ac_server_setup/ldap.pre
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_setup/ldap.pre
rename to profiles/templates/3.6/7_ac_server_setup/ldap.pre
diff --git a/profiles/templates/3.5/7_ac_server_setup/unix b/profiles/templates/3.6/7_ac_server_setup/unix
similarity index 100%
rename from profiles/templates/3.5/7_ac_server_setup/unix
rename to profiles/templates/3.6/7_ac_server_setup/unix
diff --git a/profiles/templates/3.5/9_ac_install_merge/.calculate_directory b/profiles/templates/3.6/9_ac_install_merge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/9_ac_install_merge/.calculate_directory
rename to profiles/templates/3.6/9_ac_install_merge/.calculate_directory
diff --git a/profiles/templates/3.5/9_ac_install_merge/README-eng.txt b/profiles/templates/3.6/9_ac_install_merge/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/9_ac_install_merge/README-eng.txt
rename to profiles/templates/3.6/9_ac_install_merge/README-eng.txt
diff --git a/profiles/templates/3.5/9_ac_install_merge/README-rus.txt b/profiles/templates/3.6/9_ac_install_merge/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/9_ac_install_merge/README-rus.txt
rename to profiles/templates/3.6/9_ac_install_merge/README-rus.txt
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/sys-kernel/.calculate_directory b/profiles/templates/3.6/9_ac_install_merge/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/sys-kernel/.calculate_directory
rename to profiles/templates/3.6/9_ac_install_merge/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/3.6/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/3.6/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env b/profiles/templates/3.6/9_ac_install_merge/sys-apps/calculate-utils/ini.env
similarity index 100%
rename from profiles/templates/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env
rename to profiles/templates/3.6/9_ac_install_merge/sys-apps/calculate-utils/ini.env
diff --git a/profiles/templates/3.5/README-eng.txt b/profiles/templates/3.6/README-eng.txt
similarity index 100%
rename from profiles/templates/3.5/README-eng.txt
rename to profiles/templates/3.6/README-eng.txt
diff --git a/profiles/templates/3.5/README-rus.txt b/profiles/templates/3.6/README-rus.txt
similarity index 100%
rename from profiles/templates/3.5/README-rus.txt
rename to profiles/templates/3.6/README-rus.txt
diff --git a/profiles/templates/deprecated/3.4/.calculate_directory b/profiles/templates/deprecated/3.4/.calculate_directory
deleted file mode 100644
index d965c4565..000000000
--- a/profiles/templates/deprecated/3.4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.4.0_alpha1&&cl_ver<3.4.9999
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/.calculate_directory
deleted file mode 100644
index e99c691dc..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install cl_ver>=3.4.0_beta3&&ac_install_disk==on
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/kdm/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/kdm/.calculate_directory
deleted file mode 100644
index 1d4ebb430..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/kdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg()!=
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/kdm/copyfaces b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/kdm/copyfaces
deleted file mode 100644
index c949adbc4..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/kde-base/kdm/copyfaces
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash
-
-cp /var/lib/kdm/faces/* #-cl_chroot_path-#/var/lib/kdm/faces/ &>/dev/null
-:
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
deleted file mode 100644
index 718d88e66..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate pkg()!= path=/etc/ssl
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
deleted file mode 100644
index fcd74a396..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/ssl/postfix/server.crt mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
deleted file mode 100644
index d56b9bd26..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chown=postfix:mail append=replace link=#-cl_install_path_from-#/etc/ssl/postfix/server.key mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
deleted file mode 100644
index 1ac24e02a..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chown=postfix:mail append=replace link=#-cl_install_path_from-#/etc/ssl/postfix/server.pem mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
deleted file mode 100644
index 718d88e66..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate pkg()!= path=/etc/ssl
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
deleted file mode 100644
index 66204353b..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/ssl/ejabberd/server.crt mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
deleted file mode 100644
index 216780044..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/ssl/ejabberd/server.key mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
deleted file mode 100644
index 556d817fd..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chown=root:jabber append=replace link=#-cl_install_path_from-#/etc/ssl/ejabberd/server.pem mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
deleted file mode 100644
index e5128c61b..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!= path=/etc/ssl
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
deleted file mode 100644
index b406144bc..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/ssl/dovecot/server.crt mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
deleted file mode 100644
index db84b699f..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chown=dovecot:mail append=replace link=#-cl_install_path_from-#/etc/ssl/dovecot/server.key mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
deleted file mode 100644
index 3c9d350fd..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chown=dovecot:mail append=replace link=#-cl_install_path_from-#/etc/ssl/dovecot/server.pem mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
deleted file mode 100644
index c2c200253..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy_wifi b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy_wifi
deleted file mode 100644
index c574d39c0..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy_wifi
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate exec=/bin/bash
-
-grep -l type=wifi /etc/NetworkManager/system-connections/* 2>/dev/null | while read fn
-do
-	cp "$fn" #-cl_chroot_path-#/etc/NetworkManager/system-connections/
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
deleted file mode 100644
index c2c200253..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
deleted file mode 100644
index cb18b3035..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/ip-down.sh mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
deleted file mode 100644
index 0e1c7bec8..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/ip-up.sh mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
deleted file mode 100644
index ada93e32f..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/manager-settings.conf mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
deleted file mode 100644
index 905b16174..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/wired-settings.conf mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
deleted file mode 100644
index c0ed9f76b..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/wicd/wireless-settings.conf mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
deleted file mode 100644
index c2c200253..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
deleted file mode 100644
index 56143ee79..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/wpa_supplicant/wpa_supplicant.conf mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
deleted file mode 100644
index c4cf2a9a1..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/conf.d/net mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
deleted file mode 100644
index f2d489b0e..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/resolv.conf mirror force protected
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
deleted file mode 100644
index d80c1efe0..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge(sys-fs/udev)!=&&pkg(sys-fs/udev)<197||merge(sys-fs/eudev)!=&&pkg(sys-fs/eudev)!= path=/etc/udev name=rules.d 
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules b/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
deleted file mode 100644
index 53ee8179d..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace link=#-cl_install_path_from-#/etc/udev/rules.d/70-persistent-net.rules mirror force
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
deleted file mode 100644
index 6856272d9..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc name=calculate
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/calculate.env b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/calculate.env
deleted file mode 100644
index 1597c14b3..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/calculate.env
+++ /dev/null
@@ -1,42 +0,0 @@
-# Calculate format=raw name=calculate.env comment=#  pkg(sys-apps/calculate-utils)>=3.4.0_beta1
-
-[install]
-#?os_root_type==hdd&&cl_autopartition_set==off#
-cl_install_dev_from = #-os_root_dev-#
-#os_root_type#
-#?cl_autopartition_set==on&&cl_install_dev_from!=#
-cl_install_dev_from = #-cl_install_dev_from-#
-#cl_autopartition_set#
-#?os_root_type==hdd#
-os_install_ntp = #-os_install_ntp-#
-#os_root_type#
-os_install_net_settings = #-os_install_net_conf-#
-#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
-cl_autologin = #-cl_autologin-#
-#cl_autologin#
-#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
-cl_autologin =
-#cl_autologin#
-
-[main]
-# Set auto-update configuration files.
-cl_autoupdate_set = off
-#?os_install_root_type!=livecd#
-# keep value of root dev uuid (8 char) for kernel symlink
-cl_kernel_uid = #-cl_install_kernel_uid-#
-#os_install_root_type#
-#?os_install_linux_build!=#
-# current linux build
-os_linux_build = #-os_install_linux_build-#
-#os_install_linux_build#
-cl_home_crypt_set = #-cl_install_home_crypt_set-#
-
-[update]
-# auto-check updates
-cl_update_autocheck_set = #-cl_install_autocheck_set-#
-# interval for update auto-check
-cl_update_autocheck_interval = #-cl_install_autocheck_interval-#
-# clean packages and distfiles
-cl_update_cleanpkg_set = #-cl_install_cleanpkg_set-#
-# update other overlays
-cl_update_other_set = #-cl_install_other_set-#
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/calculate.env.old b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/calculate.env.old
deleted file mode 100644
index e44b3a701..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/calculate.env.old
+++ /dev/null
@@ -1,42 +0,0 @@
-# Calculate format=raw name=calculate.env comment=# pkg(sys-apps/calculate-utils)<3.4.0_beta1
-
-[install]
-#?os_root_type==hdd&&cl_autopartition_set==off#
-os_install_dev_from = #-os_root_dev-#
-#os_root_type#
-#?cl_autopartition_set==on&&cl_install_dev_from!=#
-os_install_dev_from = #-cl_install_dev_from-#
-#cl_autopartition_set#
-#?os_root_type==hdd#
-os_install_ntp = #-os_install_ntp-#
-#os_root_type#
-os_install_net_settings = #-os_install_net_conf-#
-#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
-cl_autologin = #-cl_autologin-#
-#cl_autologin#
-#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
-cl_autologin =
-#cl_autologin#
-
-[main]
-# Set auto-update configuration files.
-cl_autoupdate_set = off
-#?os_install_root_type!=livecd#
-# keep value of root dev uuid (8 char) for kernel symlink
-cl_kernel_uid = #-cl_install_kernel_uid-#
-#os_install_root_type#
-#?os_install_linux_build!=#
-# current linux build
-os_linux_build = #-os_install_linux_build-#
-#os_install_linux_build#
-cl_home_crypt_set = #-cl_install_home_crypt_set-#
-
-[update]
-# auto-check updates
-cl_update_autocheck_set = #-cl_install_autocheck_set-#
-# interval for update auto-check
-cl_update_autocheck_interval = #-cl_install_autocheck_interval-#
-# clean packages and distfiles
-cl_update_cleanpkg_set = #-cl_install_cleanpkg_set-#
-# update other overlays
-cl_update_other_set = #-cl_install_other_set-#
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
deleted file mode 100644
index 814ccaf06..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/calculate
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
deleted file mode 100644
index 59810a410..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-apps/baselayout)!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/fstab b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
deleted file mode 100644
index 824c0e4ea..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate protected
-#-os_install_fstab_mount_conf-#
-
-#-os_install_fstab_swap_conf-#
-
-proc		/proc		proc	defaults		0 0
-shm		/dev/shm	tmpfs	nodev,nosuid,noexec	0 0
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/motd b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/motd
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/baselayout/motd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index 55322644b..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-apps/calculate-utils[client])!=&&env(client.os_remote_auth)!= path=/var name=calculate
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
deleted file mode 100644
index 8c3d55c22..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba
-
-[client]
-cl_remote_host = #-client.cl_remote_host-#
-cl_remote_pw = #-client.cl_remote_pw-#
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
deleted file mode 100644
index 0fa12a292..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-apps/openrc)!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
deleted file mode 100644
index afec7e616..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
deleted file mode 100644
index e8a66c40d..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# os_install_linux_system==server&&load(empty,/etc/conf.d/net)==
-modules="!plug"
-ifplugd="--no-beep"
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/init.d/root b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/init.d/root
deleted file mode 100644
index 5c6fd62a4..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/openrc/init.d/root
+++ /dev/null
@@ -1,43 +0,0 @@
-# Calculate os_install_scratch==on chmod=0755
-#!/sbin/runscript
-
-description="Mount the root fs read/write"
-
-depend()
-{
-	need fsck
-	keyword nojail noopenvz noprefix novserver
-}
-
-start()
-{
-	if echo 2>/dev/null >/.test.$$; then
-		rm -f /.test.$$ /fastboot /forcefsck
-		return 0
-	fi
-
-	ebegin "Remounting root filesystem read/write"
-	case "${RC_UNAME}" in
-		Linux)	SCRATCH_ROOT=`sed -nr 's/(\S+)\s+\/newroot\s+.*/\1/p' /proc/mounts`
-			if [ "$SCRATCH_ROOT" -a "${SCRATCH_ROOT}" != "tmpfs" ];
-			then
-				mount -n $SCRATCH_ROOT /mnt/scratch
-				if [[ -n `cat /proc/mounts | grep "none / aufs"` ]];
-				then
-					mount -n -t aufs -o remount,rw none /
-					mount -n -t aufs -o remount,rw none /mnt/builder
-				else
-					mount -n -t unionfs -o remount,dirs=/mnt/scratch/workspace=rw:/mnt/scratch/delta=ro:/mnt/scratch/calculate=ro unionfs /
-					mount -n -t unionfs -o remount,dirs=/mnt/scratch/delta=rw:/mnt/scratch/calculate=ro unionfs /mnt/builder
-				fi
-				mount -o loop -t squashfs /mnt/scratch/livecd.squashfs /mnt/scratch/calculate
-			else
-				mount -n -o remount,rw /
-			fi
-			;;
-		*)	mount -u -o rw /;;
-	esac
-	if eend $? "Root filesystem could not be mounted read/write"; then
-		rm -f /fastboot /forcefsck
-	fi
-}
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
deleted file mode 100644
index 56a260cb1..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-apps/sysvinit)!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
deleted file mode 100644
index 896961723..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=# format=patch
-<reg>^#(s[01])</reg>
-<text>\1</text>
-<reg>(c[0-9]:.*agetty).*(tty\d linux)</reg>
-<text>\1 38400 \2</text>
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
deleted file mode 100644
index 2623349d6..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share name=os-prober merge()!=&&pkg()!=
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh b/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
deleted file mode 100644
index a2f205754..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=patch
-<reg>(set \+f)
-(\s*)(printf '%s %s)</reg>
-<text>\1
-\2[[ $(mapdevfs "$1") != #-os_mapper_root_dev-# ]] || [[ $2 != / ]] &amp;&amp;
-\2\t\3</text>
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/README-eng.txt b/profiles/templates/deprecated/3.4/1_ac_install_disk/README-eng.txt
deleted file mode 100644
index 710dd4d45..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-The ac_install_disk event:
-- system installation on HDD
-
-Action: system setup for booting from a hard disk
-env: install
diff --git a/profiles/templates/deprecated/3.4/1_ac_install_disk/README-rus.txt b/profiles/templates/deprecated/3.4/1_ac_install_disk/README-rus.txt
deleted file mode 100644
index 5129d2782..000000000
--- a/profiles/templates/deprecated/3.4/1_ac_install_disk/README-rus.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_disk:
-- у�тановка �и�темы на же�ткий ди�к
-
-Дей�твие: на�тройка �и�темы дл� загрузки � же�ткого ди�ка
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/.calculate_directory
deleted file mode 100644
index 6aa20846c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install ac_install_merge==on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/.calculate_directory
deleted file mode 100644
index dfccc153e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_merge_pkg!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/bind b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/bind
deleted file mode 100644
index f774f9a1a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/bind
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(net-dns/bind)!= merge=sys-apps/openrc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/breeze b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/breeze
deleted file mode 100644
index 70eb216db..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/breeze
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-plasma/breeze)!= merge=x11-themes/calculate-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/calculate-icon-theme b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/calculate-icon-theme
deleted file mode 100644
index 92190a758..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/calculate-icon-theme
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-themes/calculate-icon-theme)!= merge=x11-themes/gnome-icon-theme,x11-themes/elementary-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/calculate-server b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/calculate-server
deleted file mode 100644
index b8aa0b59d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/calculate-server
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-server)!= merge=sys-auth/pambase
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/catfish b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/catfish
deleted file mode 100644
index 938057347..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/catfish
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(dev-util/catfish)!= merge=xfce-base/thunar
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/cinnamon-session b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/cinnamon-session
deleted file mode 100644
index 64b5327af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/cinnamon-session
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(gnome-extra/cinnamon-session)!= merge=x11-apps/xinit
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/colorschemes b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/colorschemes
deleted file mode 100644
index b3c3e4773..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/colorschemes
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-vim/colorschemes)!= merge=app-editors/vim
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/consolekit b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/consolekit
deleted file mode 100644
index b7db0f3d1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/consolekit
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-auth/consolekit)!= merge=sys-auth/pambase,x11-misc/sddm
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/dm-themes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/dm-themes-calculate
deleted file mode 100644
index 57a7a9d0b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/dm-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=gnome-base/gconf,gnome-base/gdm,kde-base/kdm,lxde-base/lxdm,x11-themes/gnome-themes-standard,media-gfx/gdm-themes-calculate,media-gfx/kdm-themes-calculate,x11-misc/lightdm-gtk-greeter,mate-base/mate-desktop
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/droid b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/droid
deleted file mode 100644
index 5cce37e44..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/droid
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-fonts/droid)!= merge=x11-libs/gtk+,kde-base/kdelibs,kde-base/kdm,media-video/mplayer,x11-apps/xmessage
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ecryptfs-utils b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ecryptfs-utils
deleted file mode 100644
index 7ca65e5f2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ecryptfs-utils
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-fs/ecryptfs-utils)!= merge=sys-auth/pambase
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ejabberd b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ejabberd
deleted file mode 100644
index 423c2e434..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ejabberd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(net-im/ejabberd)!= merge=sys-apps/openrc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/elementary-icon-theme b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/elementary-icon-theme
deleted file mode 100644
index 1f4b91c4a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/elementary-icon-theme
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-themes/elementary-icon-theme)!= merge=x11-themes/calculate-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gdm
deleted file mode 100644
index e9822979d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(gnome-base/gdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gdm-themes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gdm-themes-calculate
deleted file mode 100644
index 50a04bc51..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gdm-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/gdm-themes-calculate)!= merge=gnome-base/gdm
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gnome-icon-theme b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gnome-icon-theme
deleted file mode 100644
index ba4a1ad49..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gnome-icon-theme
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-themes/gnome-icon-theme)!= merge=x11-themes/calculate-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/greybird b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/greybird
deleted file mode 100644
index ec8729b14..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/greybird
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-themes/greybird)!= merge=x11-misc/lightdm-gtk-greeter
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/grub-splashes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/grub-splashes-calculate
deleted file mode 100644
index 3edc686e4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/grub-splashes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/grub-splashes-calculate)!= merge=sys-apps/baselayout,sys-boot/grub
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gwenview b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gwenview
deleted file mode 100644
index 6c74874e2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/gwenview
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-apps/gwenview)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kdm
deleted file mode 100644
index 41b44787f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-base/kdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kdm-themes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kdm-themes-calculate
deleted file mode 100644
index d6759b305..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kdm-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/kdm-themes-calculate)!= merge=kde-base/kdm
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kodi b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kodi
deleted file mode 100644
index 3a3f0251d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/kodi
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-tv/kodi)!= merge=x11-apps/xinit,x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ksmserver b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ksmserver
deleted file mode 100644
index c27ca6361..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/ksmserver
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-base/ksmserver)!= merge=x11-apps/xinit
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm
deleted file mode 100644
index 6a8453808..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-misc/lightdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm-gtk-greeter b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm-gtk-greeter
deleted file mode 100644
index 06f711485..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm-gtk-greeter
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-misc/lightdm-gtk-greeter)!= merge=x11-themes/gnome-themes-standard
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm-themes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm-themes-calculate
deleted file mode 100644
index 6015484d9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lightdm-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/lightdm-themes-calculate)!= merge=x11-misc/lightdm-gtk-greeter
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lxdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lxdm
deleted file mode 100644
index 122a1e795..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lxdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(lxde-base/lxdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lxdm-themes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lxdm-themes-calculate
deleted file mode 100644
index 8b219f5ae..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/lxdm-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/lxdm-themes-calculate)!= merge=lxde-base/lxdm
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/mate-icon-theme b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/mate-icon-theme
deleted file mode 100644
index 95d99558a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/mate-icon-theme
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-themes/mate-icon-theme)!= merge=x11-themes/calculate-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/mate-screensaver b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/mate-screensaver
deleted file mode 100644
index 5274e851b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/mate-screensaver
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(mate-extra/mate-screensaver)!= merge=x11-misc/lightdm
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/nemo b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/nemo
deleted file mode 100644
index 7e51a71be..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/nemo
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(gnome-extra/nemo)!= merge=gnome-base/nautilus
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/nss_ldap b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/nss_ldap
deleted file mode 100644
index 6c472f812..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/nss_ldap
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-auth/nss_ldap)!= merge=sys-libs/glibc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/openbox b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/openbox
deleted file mode 100644
index 4af153576..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/openbox
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-wm/openbox)!= merge=x11-apps/xinit
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/openldap b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/openldap
deleted file mode 100644
index 8b7267cc2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/openldap
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(net-nds/openldap)!= merge=sys-apps/openrc,net-dns/bind,net-im/ejabberd
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/oxygen-icons b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/oxygen-icons
deleted file mode 100644
index d4b09ed33..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/oxygen-icons
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-frameworks/oxygen-icons)!= merge=x11-themes/calculate-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_client b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_client
deleted file mode 100644
index 9d681864e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_client
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-auth/pam_client)!= merge=sys-auth/pambase
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_keystore b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_keystore
deleted file mode 100644
index df0d21c65..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_keystore
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-auth/pam_keystore)!= merge=sys-auth/pambase
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_update b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_update
deleted file mode 100644
index 13d5ef972..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/pam_update
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-auth/pam_update)!= merge=sys-auth/pambase
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plasma-workspace b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plasma-workspace
deleted file mode 100644
index 3c0faaf50..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plasma-workspace
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-plasma/plasma-workspace)!= merge=x11-apps/xinit
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plymouth b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plymouth
deleted file mode 100644
index 55a6eac88..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-boot/plymouth)!= merge=sys-kernel/dracut,sys-apps/openrc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plymouth-themes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plymouth-themes-calculate
deleted file mode 100644
index 1cfe4a227..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/plymouth-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/plymouth-themes-calculate)!= merge=sys-boot/plymouth
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/sddm b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/sddm
deleted file mode 100644
index d0e1b6dd5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/sddm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-misc/sddm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/slim b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/slim
deleted file mode 100644
index e6efe5283..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/slim
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-misc/slim)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/smplayer b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/smplayer
deleted file mode 100644
index 94b6f2e88..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/smplayer
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-video/smplayer)!= merge=x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/splash-themes-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/splash-themes-calculate
deleted file mode 100644
index 521207992..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/splash-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=media-gfx/splashutils,sys-boot/grub
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/splashutils b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/splashutils
deleted file mode 100644
index 5be6266f2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/splashutils
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/splashutils)!= merge=media-gfx/splash-themes-calculate,sys-kernel/dracut,sys-apps/openrc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/systemd b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/systemd
deleted file mode 100644
index 81665275b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/systemd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/systemd)!= merge=sys-auth/pambase
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/xbmc b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/xbmc
deleted file mode 100644
index b9d2d7e1c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/xbmc
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-tv/xbmc)!= merge=x11-apps/xinit,x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/xfce4-session b/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/xfce4-session
deleted file mode 100644
index 23623ff11..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Depends/xfce4-session
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfce4-session)!= merge=x11-apps/xinit
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/README-eng.txt b/profiles/templates/deprecated/3.4/2_ac_install_merge/README-eng.txt
deleted file mode 100644
index 92d938fcb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/README-eng.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate append=skip
-
-The ac_install_merge event:
-- package installation
-- package removal
-- system setup*
-- system installation
-- Portages syncing
-
-*When cl-setup-system is run with the defaul '--live=off' option.
-
-Action: package configuration
-env: install
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/README-rus.txt b/profiles/templates/deprecated/3.4/2_ac_install_merge/README-rus.txt
deleted file mode 100644
index d1af3c74a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/README-rus.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_merge:
-- у�тановка пакета
-- удаление пакета
-- на�тройка �и�темы*
-- у�тановка �и�темы
-- обновление портежей
-
-*При выполнении команды cl-setup-system �о значением по умолчанию '--live=off'.
-
-Дей�твие: на�тройка пакета
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/client-3.3.0_alpha2 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/client-3.3.0_alpha2
deleted file mode 100644
index 1d621eafe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/client-3.3.0_alpha2
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate env=client exec=/bin/bash merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase,sys-auth/nss_ldap,sys-libs/glibc
-
-#?cl_remote_host!=&&cl_remote_pw!=&&cl_chroot_status==off#
-/usr/sbin/cl-core --method client --mount
-#cl_remote_host#
-
-true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
deleted file mode 100644
index de8f3048a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!=&&ini(merge-calculate.client)<3.3.0_alpha2 merge=sys-apps/sysvinit,sys-auth/pambase
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha1 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
deleted file mode 100644
index cd4f7aa77..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/local.d name=logout.stop append=remove merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
deleted file mode 100644
index 786a0c417..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate name=ini.env format=samba merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha2 merge=sys-process/htop,x11-terms/xterm,sys-process/vixie-cron,media-gfx/calculate-wallpapers,sys-apps/sysvinit,sys-auth/pambase,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme,app-portage/layman,app-portage/eix
-
-[update]
-!packages =
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha3 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
deleted file mode 100644
index 7f3c42879..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate name=calculate.env format=samba merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.0_alpha3&&env(client.os_remote_client)!=
-
-[client]
-!os_remote_client =
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.2.5 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.2.5
deleted file mode 100644
index 0fa1b9645..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.3.2.5
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.3.2.5 merge=sys-fs/eudev
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.15 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.15
deleted file mode 100644
index 70e08a8b9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.15
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.4.6.15 merge=sys-libs/glibc,sys-apps/openrc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.19 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.19
deleted file mode 100644
index bf0f4b2d9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.19
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.4.6.19 merge=sys-apps/openrc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.6 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.6
deleted file mode 100644
index c14c6f2a4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.4.6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate path=/etc/calculate name=calculate.env format=patch merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.4.6.6
-<reg>os_install_dev_from</reg>
-<text>cl_install_dev_from</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.5.0_alpha25 b/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
deleted file mode 100644
index fa37af06a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(merge-calculate.utils)<3.5.0_alpha25 merge=x11-themes/calculate-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
deleted file mode 100644
index 607fa7fc8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications merge=x11-themes/hicolor-icon-theme,x11-themes/gnome-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
deleted file mode 100644
index 0d9ef0dac..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate mirror path=/usr/share/icons/gnome/48x48/apps name=hardinfo.png link=/usr/share/hardinfo/pixmaps/logo.png
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
deleted file mode 100644
index 54f38c993..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate mirror path=/usr/share/icons/hicolor/48x48/apps name=hardinfo.png link=/usr/share/hardinfo/pixmaps/logo.png
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
deleted file mode 100644
index edbdab66e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=samba path=/usr/share/applications
-[Desktop Entry]
-Icon=hardinfo
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/sudo/.calculate_directory
deleted file mode 100644
index 9f5c74c14..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/sudo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=sudoers.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/sudo/default b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/sudo/default
deleted file mode 100644
index 771b0bc6f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/sudo/default
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# chmod=0440
-
-Defaults	env_reset
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
deleted file mode 100644
index 5e0caa52e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
deleted file mode 100644
index bc912b579..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/syslog-ng symbolic ini(runlevels.syslog-ng)!=on&&ini(runlevels.syslog-ng,on)==||grep(/var/lib/calculate/-runlevels-syslog-ng,/syslog-ng)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-arch/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-arch/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-arch/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-cdr/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-cdr/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-cdr/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
deleted file mode 100644
index a81622e5a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/include name=scsilib.backup append=remove
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
deleted file mode 100644
index 756888f17..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=myspell
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru.aff b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
deleted file mode 100644
index 687597891..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/hunspell link=/usr/share/myspell/ru_RU_yo.aff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru.dic b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
deleted file mode 100644
index 0045ffec7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/hunspell link=/usr/share/myspell/ru_RU_yo.dic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
deleted file mode 100644
index 86c346cfe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/myspell/ru_RU_yo.aff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
deleted file mode 100644
index 1b25fe341..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/myspell/ru_RU_yo.dic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/99editor b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/99editor
deleted file mode 100644
index 23b539ea0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/99editor
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# path=/etc/env.d
-
-EDITOR="/usr/bin/vim"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/vimrc.local b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/vimrc.local
deleted file mode 100644
index 0e787acc6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-editors/vim/vimrc.local
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=" path=/etc/vim
-set t_Co=256
-#?pkg(app-vim/colorschemes)!=#
-colorscheme desert256
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
deleted file mode 100644
index 6ebba66f0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate exec=/bin/sh cl_ebuild_phase!=&&cl_chroot_status==off&&cl_system_boot_set==off
-modprobe -a vboxdrv vboxnetflt vboxnetadp
-true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/virtualbox.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/virtualbox.conf
deleted file mode 100644
index 61c2a23cc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-emulation/virtualbox-modules/virtualbox.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=# path=/etc/modules-load.d
-vboxdrv
-vboxnetflt
-vboxnetadp
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/screen/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/screen/.calculate_directory
deleted file mode 100644
index 8aff98b40..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/screen/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/screen/screenrc b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/screen/screenrc
deleted file mode 100644
index cecdf6398..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/screen/screenrc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=# path=/etc format=patch dotall
-<reg>(?:(?:
-#--- Start block generated by Calculate Utilities ---
-.*
-#--- End block generated by Calculate Utilities ---)|(?:
-$))(.*$)</reg>
-<text>
-#--- Start block generated by Calculate Utilities ---
-  shelltitle '$ |bash'
-  vbell off
-  altscreen on
-  defutf8 on
-  term screen-256color
-
-  hardstatus off
-  hardstatus string "%{wk}[%h]%?"
-  caption always "%{wk}%-w%{kw} %n %t %{-}%+w %{wk}%=$USER@%H"
-  setenv COLORTERM 'screen'
-#--- End block generated by Calculate Utilities ---\1</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory
deleted file mode 100644
index 54dccd632..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/ name=etc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf
deleted file mode 100644
index c120effe5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate comment=#
-set -g default-terminal "screen-256color" 
-set -g history-limit 10000
-#set-window-option -g utf8 on
-
-set -g status-fg white
-set -g status-bg black
-set -g status-right " #(whoami)@#H"
-set -g status-left "[#S]" 
-set -g status-position top
-
-set-option -g set-titles on
-set-option -g set-titles-string "#T"
-
-set -g window-status-format ' #I #W '
-set -g window-status-current-format ' #I #W '
-set -g window-status-separator ' '
-setw -g window-status-current-bg white
-setw -g window-status-current-fg black
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/draw.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/draw.desktop
deleted file mode 100644
index 70deccf09..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/draw.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/lib/libreoffice/share/xdg
-
-[Desktop Entry]
-Categories=Office
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/math.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/math.desktop
deleted file mode 100644
index 70deccf09..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/libreoffice/math.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/lib/libreoffice/share/xdg
-
-[Desktop Entry]
-Categories=Office
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/scribus/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/scribus/.calculate_directory
deleted file mode 100644
index cf1c45252..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/scribus/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()==1.4.6 append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/scribus/scribus.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/scribus/scribus.desktop
deleted file mode 100644
index 36dd8035e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-office/scribus/scribus.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-TryExec=scribus-1.4.6
-Exec=scribus-1.4.6 %f
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/50-calculate b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/50-calculate
deleted file mode 100644
index c8ca86896..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/50-calculate
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# path=/etc/eixrc pkg(app-portage/eix)>=0.29
-COLORSCHEME1="true"
-NOSTATUSLINE=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eix-sync.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eix-sync.conf
deleted file mode 100644
index 127c880b2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eix-sync.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate comment=#
-# checkout and repair repositories before sync
-#?pkg(app-portage/eix)>=0.29.3#
-!have_changed=:
-#pkg#
-!emergecmd='/usr/sbin/cl-core --method update --sync-only --skip-eix-update'
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eixrc b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eixrc
deleted file mode 100644
index d262937c6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eixrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate comment=# pkg(app-portage/eix)<0.29
-NOSTATUSLINE=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eixrc.backup.0000 b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
deleted file mode 100644
index 9938b81b6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove main.cl_chroot_status==on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/layman/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/layman/.calculate_directory
deleted file mode 100644
index 71933aab5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/layman/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/layman/layman.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/layman/layman.cfg
deleted file mode 100644
index d9d2f273f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-portage/layman/layman.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# format=patch multiline merge(app-portage/layman)!=
-<reg>^#?(git_command\s*:\s*)/.*$</reg>
-<text>\1/usr/libexec/calculate/cl-git-wrapper</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/.calculate_directory
deleted file mode 100644
index a6d6e428a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=4.3_p42-r1 path=/etc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
deleted file mode 100644
index 6d52fca23..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-#!/bin/bash
-
-alias glxgears='vblank_mode=0 glxgears'
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
deleted file mode 100644
index a68ac9811..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-# Calculate comment=#
-#!/bin/bash
-
-# the script used for the automatic changing of screen tab names
-
-if [[ "$SCREEN_RUN_HOST" == "" ]]
-then
-    SCREEN_RUN_HOST="$LC_SCREEN_RUN_HOST"
-    SCREEN_RUN_USER="$LC_SCREEN_RUN_USER"
-fi
-
-preexec_interactive_mode=""
-
-function preexec () {
-    true
-}
-
-function precmd () {
-    true
-}
-
-function preexec_invoke_cmd () {
-    precmd
-    preexec_interactive_mode="yes"
-}
-
-function preexec_invoke_exec () {
-    if [[ -n "$COMP_LINE" ]]
-    then
-        return
-    fi
-    if [[ -z "$preexec_interactive_mode" ]]
-    then
-        return
-    else
-        if [[ 0 -eq "$BASH_SUBSHELL" ]]
-        then
-            preexec_interactive_mode=""
-        fi
-    fi
-    if [[ "preexec_invoke_cmd" == "$BASH_COMMAND" ]]
-    then
-        preexec_interactive_mode=""
-        return
-    fi
-
-    local this_command=`history 1 | sed -e "s/^[ ]*[0-9]*[ ]*//g"`;
-
-    preexec "$this_command"
-}
-
-function preexec_install () {
-
-    set -o functrace > /dev/null 2>&1
-    shopt -s extdebug > /dev/null 2>&1
-
-    PROMPT_COMMAND="${PROMPT_COMMAND}"$'\n'"preexec_invoke_cmd;";
-    trap 'preexec_invoke_exec' DEBUG
-}
-
-case ${TERM} in
-
-    screen-256*)
-
-        precmd () {
-            echo -ne "\033kbash\033\\" > /dev/stderr
-        }
-        
-        preexec () {
-            local CMD=`echo "$BASH_COMMAND"  | cut -d " " -f 1`
-            if [[ "$CMD" == "exec" ]] || [[ "$CMD" == "sudo" ]]
-            then
-                local CMD=`echo "$BASH_COMMAND"  | cut -d " " -f 2`
-            fi
-            echo -ne "\033k$CMD\033\\" > /dev/stderr
-        }
-        
-        preexec_install
-
-;;
-
-esac
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
deleted file mode 100644
index 01be03df9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-#!/bin/bash
-
-case ${COLORTERM} in
-    xfce4-terminal*)
-        [[ -z $TMUX ]] && export TERM=xterm-256color
-    ;;
-esac
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
deleted file mode 100644
index a86c15efd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-#!/bin/bash
-
-# use color output for pastebin.calculate-linux.org by wgetpaste
-if ${use_color} ; then
-       alias emerge='emerge --color=y'
-       alias eix='eix -F'
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
deleted file mode 100644
index 883e93f19..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-#!/bin/bash
-
-export XZ_OPT="--threads=0 -8"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/gentoo-bashcomp/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/gentoo-bashcomp/.calculate_directory
deleted file mode 100644
index 008135d92..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/gentoo-bashcomp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=20140911&&pkg()<20140912 path=/usr/share/bash-completion name=helpers
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/gentoo-bashcomp/gentoo-common.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/gentoo-bashcomp/gentoo-common.sh
deleted file mode 100644
index 9bc192a45..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-shells/gentoo-bashcomp/gentoo-common.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate dotall format=patch
-<reg>
-(\s*)(source /etc/portage/make.conf)( 2&gt;/dev/null)
-(\s*
-\s*overlay)</reg>
-<text>
-\1\2\3
-\1\2/*\3
-\4</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/evince/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/evince/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/evince/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/evince/evince.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/evince/evince.desktop
deleted file mode 100644
index 1417408bf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/evince/evince.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-Categories=GNOME;GTK;Office;Viewer;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/.calculate_directory
deleted file mode 100644
index 5d211a2b9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/icons/hicolor/scalable name=apps  merge=x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
deleted file mode 100644
index d5e0de7d9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=samba path=/usr/share/applications
-[Desktop Entry]
-Icon=qpdfview
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/qpdfview.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
deleted file mode 100644
index 1e939ee02..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
+++ /dev/null
@@ -1,173 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<defs>
-<linearGradient id="linearGradient5060-2">
-<stop offset="0"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient7671" x2="0" y1="17.67725" y2="31.65264">
-<stop offset="0" stop-color="#8595bc"/>
-<stop offset="1" stop-color="#041a3b"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient2852" x1="27.3663" x2="31.336" y1="26.5803" y2="30.5578">
-<stop offset="0" stop-color="#8a8a8a"/>
-<stop offset="1" stop-color="#484848"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient4446" x1="33.93962" x2="37.35964" y1="36.4432" y2="32.65004">
-<stop offset="0" stop-color="#7d7d7d"/>
-<stop offset=".5" stop-color="#b1b1b1"/>
-<stop offset="1" stop-color="#686868"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient2372" x1="18.2927" x2="17.5009" y1="13.6021" y2="25.7435">
-<stop offset="0" stop-color="#fff"/>
-<stop offset=".5" stop-color="#fff" stop-opacity=".219"/>
-<stop offset="1" stop-color="#fff"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient5027" x2="0" y1="-150.69536" y2="327.66289">
-<stop offset="0" stop-opacity="0"/>
-<stop offset=".5"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient1471" x1="4.2499" x2="43.68743">
-<stop offset="0" stop-color="#8e8d87"/>
-<stop offset=".276" stop-color="#cbc9c1"/>
-<stop offset="1" stop-color="#8e8d87"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient1468" x1="4.31833" x2="43.56919">
-<stop offset="0" stop-color="#dcdcda"/>
-<stop offset="1" stop-color="#bab9b7"/>
-</linearGradient>
-<linearGradient gradientTransform="matrix(1.49016,0,0,.66874,.08895,2)" gradientUnits="userSpaceOnUse" id="linearGradient1464" x1="15.388" x2="15.4878" y1="32.5392" y2="58.8313">
-<stop offset="0" stop-color="#fff" stop-opacity=".124"/>
-<stop offset=".103" stop-color="#fff"/>
-<stop offset="1" stop-color="#fff" stop-opacity="0"/>
-</linearGradient>
-<linearGradient gradientTransform="matrix(.94494,0,0,1.07615,.06845,4.09318)" gradientUnits="userSpaceOnUse" id="linearGradient1459" x1="25.0567" x2="24.7897" y1="3.6785" y2="25.2473">
-<stop offset="0" stop-color="#e0e0e0"/>
-<stop offset=".405" stop-color="#fff"/>
-<stop offset=".534" stop-color="#cdcdcd"/>
-<stop offset="1" stop-color="#494949"/>
-</linearGradient>
-<linearGradient gradientTransform="matrix(1.19877,0,0,.85357,-.14309,2.03451)" gradientUnits="userSpaceOnUse" id="linearGradient1456" x1="20.7712" x2="20.7178" y1="25.1403" y2="19.3375">
-<stop offset="0" stop-color="#fff" stop-opacity="0"/>
-<stop offset="1" stop-color="#f8f8f8"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient1451" x2="0" y1="29.28133" y2="24.84381">
-<stop offset="0" stop-color="#f7f6f5"/>
-<stop offset="1" stop-color="#f7f6f5" stop-opacity="0"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient1453" x1="23.06257" x2="23.00001" y1="31.84383" y2="28.28135">
-<stop offset="0" stop-color="#666"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<linearGradient gradientUnits="userSpaceOnUse" id="linearGradient1447" x1="27.97869" x2="28.09789" y1="23.52816" y2="28.88036">
-<stop offset="0" stop-opacity=".237"/>
-<stop offset="1" stop-opacity="0"/>
-</linearGradient>
-<radialGradient cx="11.89795" cy="4.52564" gradientUnits="userSpaceOnUse" id="radialGradient15656" r="36.55384">
-<stop offset="0" stop-color="#a3a3a3"/>
-<stop offset="1" stop-color="#4c4c4c"/>
-</radialGradient>
-<radialGradient cx="32.60803" cy="37.20211" gradientUnits="userSpaceOnUse" id="radialGradient15658" r="83.24006">
-<stop offset="0" stop-color="#fafafa"/>
-<stop offset="1" stop-color="#bbb"/>
-</radialGradient>
-<radialGradient cx="11.23875" cy="8.15252" gradientUnits="userSpaceOnUse" id="radialGradient15668" r="36.94792">
-<stop offset="0" stop-color="#fff"/>
-<stop offset="1" stop-color="#f8f8f8"/>
-</radialGradient>
-<radialGradient cx="9.41245" cy="30.29617" gradientUnits="userSpaceOnUse" id="radialGradient2283" r="1.2073">
-<stop offset="0" stop-color="#f0f0f0"/>
-<stop offset="1" stop-color="#9a9a9a"/>
-</radialGradient>
-<radialGradient cx="9.41245" cy="18.81106" gradientUnits="userSpaceOnUse" id="radialGradient2285" r="1.20753">
-<stop offset="0" stop-color="#f0f0f0"/>
-<stop offset="1" stop-color="#9a9a9a"/>
-</radialGradient>
-<radialGradient cx="18.2409" cy="21.818" gradientUnits="userSpaceOnUse" id="radialGradient4460" r="8.3085">
-<stop offset="0" stop-color="#729fcf" stop-opacity=".208"/>
-<stop offset="1" stop-color="#729fcf" stop-opacity=".676"/>
-</radialGradient>
-<radialGradient cx="15.4144" cy="13.0784" gradientTransform="matrix(2.59296,0,0,2.2521,-25.05975,-18.941)" gradientUnits="userSpaceOnUse" id="radialGradient3501" r="6.6562">
-<stop offset="0" stop-color="#fff"/>
-<stop offset="1" stop-color="#fff" stop-opacity=".248"/>
-</radialGradient>
-<radialGradient cx="9.1295" cy="26.9256" gradientUnits="userSpaceOnUse" id="radialGradient1433" r="2.1227">
-<stop offset="0" stop-color="#fffffd"/>
-<stop offset=".5" stop-color="#bbbbb9"/>
-<stop offset="1"/>
-</radialGradient>
-<radialGradient cx="605.7143" cy="486.6479" gradientTransform="matrix(2.77439,0,0,1.96971,-1891.633,-872.8854)" gradientUnits="userSpaceOnUse" id="radialGradient5029" r="117.1429" xlink:href="#linearGradient5060-2"/>
-<radialGradient cx="605.7143" cy="486.6479" gradientTransform="matrix(-2.77439,0,0,1.96971,112.7623,-872.8854)" gradientUnits="userSpaceOnUse" id="radialGradient5031" r="117.1429" xlink:href="#linearGradient5060-2"/>
-</defs>
-<path d="m 7.7526,3.6464 h 32.577 a 1.149,1.149 0 0,1 1.149,1.149 v 38.6225 a 1.149,1.149 0 0,1 -1.149,1.149 h -32.577 a 1.149,1.149 0 0,1 -1.149,-1.149 v -38.6225 a 1.149,1.149 0 0,1 1.149,-1.149" display="block" fill="url(#radialGradient15658)" stroke="url(#radialGradient15656)" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="m 7.8151,4.5839 h 32.4779 a .149,.149 0 0,1 .149,.149 v 38.6484 a .149,.149 0 0,1 -.149,.149 h -32.4779 a .149,.149 0 0,1 -.149,-.149 v -38.6484 a .149,.149 0 0,1 .149,-.149" display="block" fill="none" stroke="url(#radialGradient15668)" stroke-linecap="round" stroke-linejoin="round"/>
-<g transform="translate(.6464,-3.798933e-2)">
-<g fill="#fff" stroke="#000" transform="matrix(.2297,0,0,.2297,4.96708,4.24497)">
-<path d="m 23.428,113.07 c 0,1.973 -1.6,3.572 -3.573,3.572 s -3.573,-1.6 -3.573,-3.572 1.6,-3.573 3.573,-3.573 3.573,1.6 3.573,3.573 z" stroke="none"/>
-<path d="m 23.428,63.07 c 0,1.973 -1.6,3.573 -3.573,3.573 s -3.573,-1.6 -3.573,-3.573 1.6,-3.573 3.573,-3.573 3.573,1.6 3.573,3.573 z" stroke="none"/>
-</g>
-<path d="m 9.995,29.9523 c 0,.4532 -.3675,.8205 -.8207,.8205 s -.8207,-.3675 -.8207,-.8205 .3675,-.8207 .8207,-.8207 .8207,.3675 .8207,.8207 z" fill="url(#radialGradient2283)"/>
-<path d="m 9.995,18.4672 c 0,.4532 -.3675,.8207 -.8207,.8207 s -.8207,-.3675 -.8207,-.8207 .3675,-.8208 .8207,-.8208 .8207,.3676 .8207,.8208 z" fill="url(#radialGradient2285)"/>
-</g>
-<path d="m 11.5057,5.4943 v 37.9066" fill="none" stroke="#000" stroke-opacity=".018" stroke-width=".9886"/>
-<path d="m 12.5,5.0205 v 38.0177" fill="none" stroke="#fff" stroke-opacity=".205"/>
-<path d="m 16.1378,35 h 19.7244 a .1378,0.0654 0 0,1 .1378,.0654 v .8692 a .1378,0.0654 0 0,1 -.1378,.0654 h -19.7244 a .1378,0.0654 0 0,1 -.1378,-.0654 v -.8692 a .1378,0.0654 0 0,1 .1378,-.0654" display="block" fill="#9b9b9b" fill-opacity=".55"/>
-<path d="m 16.1378,31 h 19.7244 a .1378,0.0654 0 0,1 .1378,.0654 v .8692 a .1378,0.0654 0 0,1 -.1378,.0654 h -19.7244 a .1378,0.0654 0 0,1 -.1378,-.0654 v -.8692 a .1378,0.0654 0 0,1 .1378,-.0654" display="block" fill="#9b9b9b" fill-opacity=".55"/>
-<path d="m 16.1378,33 h 19.7244 a .1378,0.0654 0 0,1 .1378,.0654 v .8692 a .1378,0.0654 0 0,1 -.1378,.0654 h -19.7244 a .1378,0.0654 0 0,1 -.1378,-.0654 v -.8692 a .1378,0.0654 0 0,1 .1378,-.0654" display="block" fill="#9b9b9b" fill-opacity=".55"/>
-<path d="m 16.0965,37 h 13.807 a 0.0965,0.0654 0 0,1 .0965,.0654 v .8692 a 0.0965,0.0654 0 0,1 -.0965,.0654 h -13.807 a 0.0965,0.0654 0 0,1 -.0965,-.0654 v -.8692 a 0.0965,0.0654 0 0,1 .0965,-.0654" display="block" fill="#9b9b9b" fill-opacity=".55"/>
-<g opacity=".665">
-<g transform="matrix(.60898,0,0,.60622,12.8233,10.5572)">
-<path d="m 5.5127,30 h 34.1305 v -10.3726 h -34.1305 v 10.3726 z" fill="url(#linearGradient7671)"/>
-<path d="m 5.5127,5.6791 h 34.1305 v 13.9483 h -34.1305 v -13.9483 z" fill="#729fcf"/>
-<g stroke="#000" stroke-width="2.0024" transform="matrix(1.18922,0,0,1.18922,-3.52536,-6.53541)">
-<path d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z" fill="#e8f52f" opacity=".05" stroke="none"/>
-<path d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 z" fill="#ecf751" opacity=".208" stroke="none"/>
-<path d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 s -3.3,-1.5 -3.3,-3.3 1.5,-3.3 3.3,-3.3 3.3,1.5 3.3,3.3 z" fill="#f0f972" opacity=".367" stroke="none"/>
-<path d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 s -2.9,-1.3 -2.9,-2.9 1.3,-2.9 2.9,-2.9 2.9,1.3 2.9,2.9 z" fill="#f4fa95" opacity=".525" stroke="none"/>
-<path d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 s -2.5,-1.1 -2.5,-2.5 1.1,-2.5 2.5,-2.5 2.5,1.1 2.5,2.5 z" fill="#f7fcb7" opacity=".683" stroke="none"/>
-<path d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 s -2.1,-1 -2.1,-2.1 1,-2.1 2.1,-2.1 2.1,1 2.1,2.1 z" fill="#fbfddb" opacity=".842" stroke="none"/>
-<path d="m 16,15.4 c 0,1 -.8,1.8 -1.8,1.8 s -1.8,-.8 -1.8,-1.8 .8,-1.8 1.8,-1.8 1.8,.8 1.8,1.8 z" fill="#fff" stroke="none"/>
-</g>
-<path d="m 25.0159,21.649 h 8.6812 l 1.665,.4757 h -2.8542 c 0,0 2.8542,.2379 4.2812,2.0217 1.4271,1.6649 -1.6649,3.6866 -1.6649,3.6866 -.1189,-.3568 -.8324,-3.2109 -2.2595,-4.4001 -1.0703,-.9514 -2.2595,-1.1892 -2.2595,-1.1892 h -5.5893 v -.4757 -.119 z" opacity=".3"/>
-<path d="m 30.7241,22.3626 h -4.9947 l 9.2759,5.2325 -4.2812,-5.2325 z" opacity=".3"/>
-<path d="m 25.0159,21.768 h 8.6812 l 1.3082,-.8325 h -2.8541 c 0,0 2.6162,-.4757 2.973,-3.4487 s -4.0433,-6.3029 -4.0433,-6.3029 v .119 c .1189,.7135 1.3081,5.7082 .4757,7.6109 -.3568,1.6649 -1.4271,2.0217 -1.4271,2.0217 h -5.4704 l .2378,.8325 h .119 z" fill="#515151"/>
-<path d="m 30.2484,20.4598 h -4.9947 l 5.9461,-9.038 -.9514,9.038 z" fill="#515151"/>
-</g>
-<path d="m 16.5085,14.4858 h 19.9955 v 13.9975 h -19.9955 z" fill="none" stroke="#9e9e9e"/>
-</g>
-<path d="m 16.1378,9 h 19.7244 a .1378,0.0654 0 0,1 .1378,.0654 v .8692 a .1378,0.0654 0 0,1 -.1378,.0654 h -19.7244 a .1378,0.0654 0 0,1 -.1378,-.0654 v -.8692 a .1378,0.0654 0 0,1 .1378,-.0654" display="block" fill="#9b9b9b" fill-opacity=".55"/>
-<path d="m 16.0965,11 h 13.807 a 0.0965,0.0654 0 0,1 .0965,.0654 v .8692 a 0.0965,0.0654 0 0,1 -.0965,.0654 h -13.807 a 0.0965,0.0654 0 0,1 -.0965,-.0654 v -.8692 a 0.0965,0.0654 0 0,1 .0965,-.0654" display="block" fill="#9b9b9b" fill-opacity=".55"/>
-<g transform="matrix(.36211,0,0,.36211,11.44227,31.05838)">
-<g transform="matrix(.02411,0,0,.01929,45.48953,39.75228)">
-<path d="m -1559.2523,-150.6969 h 1339.6335 v 478.3572 h -1339.6335 z" fill="url(#linearGradient5027)" opacity=".402"/>
-<path d="m -219.6188,-150.6804 v 478.3308 c 142.8742,.9004 345.4002,-107.1697 345.4001,-239.1962 s -159.4368,-239.1346 -345.4001,-239.1346 z" fill="url(#radialGradient5029)" opacity=".402"/>
-<path d="m -1559.2523,-150.6804 v 478.3308 c -142.8742,.9004 -345.4002,-107.1697 -345.4002,-239.1962 s 159.4368,-239.1346 345.4002,-239.1346 z" fill="url(#radialGradient5031)" opacity=".402"/>
-</g>
-<path d="m 6.4615,36.0042 h 35.0145 a 1.7115,1.7115 0 0,1 1.7115,1.7115 v 3.0686 a 1.7115,1.7115 0 0,1 -1.7115,1.7115 h -35.0145 a 1.7115,1.7115 0 0,1 -1.7115,-1.7115 v -3.0686 a 1.7115,1.7115 0 0,1 1.7115,-1.7115" fill="url(#linearGradient1471)" stroke="#595959"/>
-<path d="m 7.1309,21.5 h 33.7397 c .385,0 .877,.2882 1.1804,.7239 s 1.7365,2.61 2.0584,3.074 .3929,.9039 .3929,1.4761 v 12.0769 c 0,.9136 -.732,1.649 -1.6412,1.649 h -37.7208 c -.9093,0 -1.6412,-.7355 -1.6412,-1.649 v -12.0769 c 0,-.494 .1012,-1.2024 .4464,-1.6533 .4356,-.569 1.6043,-2.5479 1.9126,-2.9676 s .8743,-.6531 1.2728,-.6531 z" fill="url(#linearGradient1468)" stroke="#676767"/>
-<path d="m 7.7053,21.9755 c -.498,0 -1.1383,.1318 -1.4009,.5357 l -1.8387,2.8284 c -.296,.4553 .0336,1.5285 .9243,1.5285 h 37.2885 c 1.2047,0 1.2082,-1.0101 .9243,-1.4401 l -1.7511,-2.6517 c -.3175,-.4808 -.4328,-.8009 -1.2258,-.8009 h -32.9207 z" fill="#fbfbfb" fill-rule="evenodd"/>
-<path d="m 7.6003,22.4458 h 32.7744 c .3651,0 .8316,.2729 1.1193,.6855 s 1.2941,2.0297 1.5994,2.4691 .4349,.856 .4349,1.3978 v 11.2811 c 0,.8651 -.1335,1.2491 -.9956,1.2491 h -37.002 c -.8621,0 -1.0579,-.384 -1.0579,-1.2491 v -11.2811 c 0,-.4678 .2205,-1.1386 .5478,-1.5656 .4131,-.5388 1.0808,-1.9709 1.3731,-2.3683 s .829,-.6185 1.2068,-.6185 z" fill="none" stroke="url(#linearGradient1464)" stroke-width=".947"/>
-<path d="m 11.6818,4.4978 h 24.6321 c .6502,0 1.1737,.5102 1.1737,1.1439 v 18.7064 h -26.9795 v -18.7064 c 0,-.6337 .5235,-1.1439 1.1737,-1.1439 z" display="block" fill="url(#linearGradient1459)" stroke="#898989" stroke-linecap="round"/>
-<path d="m 11.6753,5.4992 h 24.647 a .1768,.1768 0 0,1 .1768,.1768 v 18.4828 a .1768,.1768 0 0,1 -.1768,.1768 h -24.647 a .1768,.1768 0 0,1 -.1768,-.1768 v -18.4828 a .1768,.1768 0 0,1 .1768,-.1768" display="block" fill="none" stroke="url(#linearGradient1456)" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="m 8.5865,27.375 h 30.327 a 1.7115,1.7115 0 0,1 1.7115,1.7115 v 1.7645 a 1.7115,1.7115 0 0,1 -1.7115,1.7115 h -30.327 a 1.7115,1.7115 0 0,1 -1.7115,-1.7115 v -1.7645 a 1.7115,1.7115 0 0,1 1.7115,-1.7115" fill="url(#linearGradient1451)" stroke="url(#linearGradient1453)"/>
-<path d="m 10.8718,27.6265 c 0,.7078 -.5738,1.2816 -1.2816,1.2816 s -1.2816,-.5738 -1.2816,-1.2816 .5738,-1.2816 1.2816,-1.2816 1.2816,.5738 1.2816,1.2816 z" fill="url(#radialGradient1433)" transform="translate(0,2)"/>
-<path d="m 11.7437,25.4161 25.5625,.0625 c .6875,.0017 .9878,-.371 .9375,-1 l -.125,-1.5625 h 1.8661 c .8125,0 .9902,.1926 1.1875,.5625 l .5,.9375 c .5268,.9877 1.8112,1.9741 .4982,1.9741 -4.5027,0 -28.1768,-.3491 -30.4268,-.9741 z" fill="url(#linearGradient1447)" fill-rule="evenodd" opacity=".366"/>
-<path d="m 42.9375,26.5 h -38.125" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
-<g opacity=".436" transform="translate(0,2)">
-<path d="m 14,5 h 19 v 1 h -19 z" fill-opacity=".292"/>
-<path d="m 14,7 h 19 v 1 h -19 z" fill-opacity=".292"/>
-<path d="m 14,9 h 19 v 1 h -19 z" fill-opacity=".292"/>
-<path d="m 14,11 h 19 v 1 h -19 z" fill-opacity=".292"/>
-<path d="m 14,13 h 11 v 1 h -11 z" fill-opacity=".292"/>
-</g>
-</g>
-<g transform="matrix(.70226,0,0,.70226,16.08199,17.62959)">
-<path d="m 18.6276,3.1436 c -8.1391,0 -14.7448,6.6057 -14.7448,14.7448 s 6.6057,14.7448 14.7448,14.7448 c 3.4796,0 6.551,-1.3844 9.0737,-3.4026 -.2054,1.0069 -.078,2.0354 .7561,2.7599 l 10.9641,9.5274 c 1.2334,1.0713 3.0875,.931 4.1588,-.3025 s .931,-3.0875 -.3025,-4.1588 l -10.964,-9.5274 c -.6715,-.5833 -1.4929,-.756 -2.3062,-.6427 1.9867,-2.5124 3.3648,-5.5488 3.3648,-8.9981 0,-8.1391 -6.6057,-14.7448 -14.7448,-14.7448 z m -.0756,1.2262 c 7.6395,0 13.2918,4.789 13.2918,13.2918 0,8.6751 -5.8167,13.2918 -13.2918,13.2918 -7.3029,0 -13.2918,-5.4781 -13.2918,-13.2918 0,-7.9841 5.8246,-13.2918 13.2918,-13.2918 z" fill="#dcdcdc" fill-rule="evenodd" stroke="url(#linearGradient2852)" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
-<path d="m 18.6029,3.0804 c -8.1654,0 -14.7925,6.627 -14.7925,14.7925 s 6.627,14.7925 14.7925,14.7925 c 3.4908,0 6.5722,-1.3889 9.1031,-3.4136 -.206,1.0101 -.0783,2.0419 .7586,2.7688 l 10.9995,9.5582 c 1.2374,1.0748 3.0974,.934 4.1722,-.3034 s .934,-3.0974 -.3034,-4.1722 l -10.9996,-9.5584 c -.6737,-.5852 -1.4977,-.7584 -2.3137,-.6448 1.9931,-2.5205 3.3757,-5.5667 3.3757,-9.0272 0,-8.1654 -6.627,-14.7925 -14.7925,-14.7925 z m -.0759,3.1861 c 6.2811,2e-07 11.3788,5.0977 11.3788,11.3788 s -5.0977,11.3788 -11.3788,11.3788 -11.3788,-5.0977 -11.3788,-11.3788 5.0977,-11.3788 11.3788,-11.3788 z" fill="#dcdcdc" fill-rule="evenodd"/>
-<path d="m 39.507,41.5777 c -.4787,-2.2732 1.3973,-4.8114 3.5841,-4.7884 l -10.7604,-9.2581 c -2.9448,-.0567 -4.2695,2.2726 -3.7768,4.5999 l 10.9531,9.4466 z" fill="url(#linearGradient4446)" fill-rule="evenodd"/>
-<path d="m 28.5494,18.9202 c 0,6.1019 -4.9466,11.0485 -11.0485,11.0485 s -11.0485,-4.9466 -11.0485,-11.0485 4.9466,-11.0485 11.0485,-11.0485 11.0485,4.9466 11.0485,11.0485 z" fill="none" stroke="url(#linearGradient2372)" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".8027" transform="matrix(1.24574,0,0,1.24574,-3.42535,-6.17703)"/>
-<path d="m 42.51,.1409 h 14.775 a 2.1367,1.8879 0 0,1 2.1367,1.8879 v .6647 a 2.1367,1.8879 0 0,1 -2.1367,1.8879 h -14.775 a 2.1367,1.8879 0 0,1 -2.1367,-1.8879 v -.6647 a 2.1367,1.8879 0 0,1 2.1367,-1.8879" fill="none" opacity=".433" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" transform="matrix(.75299,.65804,-.6489,.76087,0,0)"/>
-<path d="m 25.8978,18.4783 c 0,4.5887 -3.7198,8.3085 -8.3085,8.3085 s -8.3085,-3.7198 -8.3085,-8.3085 3.7198,-8.3085 8.3085,-8.3085 8.3085,3.7198 8.3085,8.3085 z" fill="url(#radialGradient4460)" fill-rule="evenodd" stroke="#3063a3" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".715" transform="matrix(1.39861,0,0,1.39861,-6.22434,-8.29896)"/>
-<path d="m 18.1569,7.3967 c -5.2076,0 -9.4245,4.217 -9.4245,9.4245 0,1.504 .4203,2.8878 1.0472,4.1499 1.2524,.4616 2.5828,.7757 3.9948,.7757 6.171,0 11.0993,-4.8616 11.4801,-10.9371 -1.7311,-2.0455 -4.2101,-3.413 -7.0976,-3.413 z" fill="url(#radialGradient3501)" fill-rule="evenodd" opacity=".834"/>
-</g>
-</svg>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/update-desktop-database b/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/update-desktop-database
deleted file mode 100644
index 7a94414d9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/app-text/qpdfview/update-desktop-database
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off
-
-echo "Updating desktop database"
-/usr/bin/update-desktop-database /usr/share/applications &>/dev/null
-true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-db/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-db/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-db/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/python/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/python/.calculate_directory
deleted file mode 100644
index 14f6100de..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/python/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg(dev-lang/python:2.7)!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/python/python2.7_env b/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/python/python2.7_env
deleted file mode 100644
index 0d50ff2b7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-lang/python/python2.7_env
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate exec=/bin/bash cl_merge_pkg!=
-
-if [[ -e /etc/env.d/python/config ]]
-then
-	if grep -q python2\.6 /etc/env.d/python/config ||
-		grep -q python2\.5 /etc/env.d/python/config
-	then
-		if [[ -x /usr/bin/eselect ]]
-		then
-			eselect python set python2.7
-		else
-			echo python2.7 >/etc/env.d/python/config
-		fi
-	fi
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/pexpect/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/pexpect/.calculate_directory
deleted file mode 100644
index 910c5959c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/pexpect/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=3.3 path=/usr/lib/python2.7/site-packages
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing b/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
deleted file mode 100644
index 7083b1f42..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=diff
-index cace43b..ab2acaf 100644
---- /usr/lib/python2.7/site-packages/pexpect/__init__.py
-+++ /usr/lib/python2.7/site-packages/pexpect/__init__.py
-@@ -490,10 +490,13 @@ class spawn(object):
-         # inherit EOF and INTR definitions from controlling process.
-         try:
-             from termios import VEOF, VINTR
--            fd = sys.__stdin__.fileno()
-+            try:
-+                fd = sys.__stdin__.fileno()
-+            except ValueError:
-+                fd = sys.__stdout__.fileno()
-             self._INTR = ord(termios.tcgetattr(fd)[6][VINTR])
-             self._EOF = ord(termios.tcgetattr(fd)[6][VEOF])
--        except (ImportError, OSError, IOError, termios.error):
-+        except (ImportError, OSError, ValueError, IOError, termios.error):
-             # unless the controlling process is also not a terminal,
-             # such as cron(1). Fall-back to using CEOF and CINTR.
-             try:
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
deleted file mode 100644
index 6ae836146..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Calculate append=replace format=xml_gconf_tree
-<?xml version="1.0"?>
-<gconf>
-	<dir name="schemas">
-		<dir name="desktop">
-			<dir name="gnome">
-				<dir name="background">
-					<entry name="picture_filename" mtime="1267285026" type="schema" stype="string" owner="gnome">
-						<local_schema locale="C" short_desc="Picture Filename">
-							<default type="string">
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)!=&&pkg(media-gfx/cldg-themes)<12.0_alpha1#
-								<stringvalue>/usr/share/pixmaps/calculate-gdm.jpg</stringvalue>
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)>=12.0_alpha1#
-								<stringvalue>/usr/share/pixmaps/calculate-gdm-#-os_x11_standart-#.jpg</stringvalue>
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
-								<stringvalue>/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg</stringvalue>
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
-                                                                <stringvalue>/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg</stringvalue>
-#pkg#
-							</default>
-							<longdesc>File to use for the background image.</longdesc>
-						</local_schema>
-					</entry>
-				</dir>
-			</dir>
-		</dir>
-		<dir name="system">
-			<dir name="storage">
-				<dir name="default_options">
-					<dir name="ntfs-3g">
-						<entry name="mount_options" mtime="1267283808" type="schema" stype="list" list_type="string">
-							<local_schema locale="C" short_desc="Default mount options for ntfs-3g fs">
-								<default type="list" ltype="string">
-										<li type="string">
-											<stringvalue> </stringvalue>
-										</li>
-								</default>
-								<longdesc>A list of default mount options for volumes formatted with the ntfs file system using ntfs-3g.</longdesc> </local_schema>
-						</entry>
-					</dir>
-				</dir>
-			</dir>
-		</dir>
-	</dir>
-</gconf>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gconf/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gconf/.calculate_directory
deleted file mode 100644
index d7d0c0075..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gconf/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/gconf name=gconf.xml.mandatory
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
deleted file mode 100644
index 6e9e7a91e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!=&&merge()!= path=/etc/xdg name=autostart
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-gpg.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-gpg.desktop
deleted file mode 100644
index 660170a0d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-gpg.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
deleted file mode 100644
index 660170a0d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
deleted file mode 100644
index 660170a0d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
deleted file mode 100644
index 660170a0d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gvfs/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gvfs/network.mount b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gvfs/network.mount
deleted file mode 100644
index 44c44e421..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/gvfs/network.mount
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=/usr/share/gvfs/mounts
-[Mount]
-AutoMount=false
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
deleted file mode 100644
index 7fbb613a7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=3.4 path=/etc/xdg name=autostart
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
deleted file mode 100644
index 6e8bbb3fe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-AutostartCondition=GNOME3 if-session gnome
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
deleted file mode 100644
index 9e597433e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications pkg(gnome-extra/nemo)!=
-
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/nemo/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/nemo/.calculate_directory
deleted file mode 100644
index 7fbb613a7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/nemo/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=3.4 path=/etc/xdg name=autostart
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/nemo/nemo-autostart.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/nemo/nemo-autostart.desktop
deleted file mode 100644
index 6e8bbb3fe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/gnome-extra/nemo/nemo-autostart.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-AutostartCondition=GNOME3 if-session gnome
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
deleted file mode 100644
index ab872f9e9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()==15.12.3-r1 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde-l10n/fix b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde-l10n/fix
deleted file mode 100644
index b956a6b22..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde-l10n/fix
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash
-
-/bin/rm -rf /usr/share/doc/HTML/sr@latin
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1 b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
deleted file mode 100644
index 57f020228..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash pkg(kde-apps/kde4-l10n)==15.12.3-r1
-
-/bin/rm -rf /usr/share/doc/HTML/sr@latin
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1 b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
deleted file mode 100644
index 26f15d691..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash pkg(kde-apps/kde4-l10n)==4.14.3-r1
-
-/bin/rm -rf /usr/share/locale/*/LC_MESSAGES/akonadi_baloo_indexer.mo
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
deleted file mode 100644
index 3ebf42e69..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()==15.12.3 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kdepim-l10n/fix b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kdepim-l10n/fix
deleted file mode 100644
index 5265e8044..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/kdepim-l10n/fix
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash
-
-/bin/rm -rf /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES /usr/share/locale/sr@ijekavian/LC_MESSAGES /usr/share/locale/sr@latin/LC_MESSAGES /usr/share/doc/HTML/sr@latin
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/konsole/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/konsole/.calculate_directory
deleted file mode 100644
index 92187e7c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/konsole/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=15 path=/usr/share name=konsole
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
deleted file mode 100644
index 0e87f3680..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
+++ /dev/null
@@ -1,73 +0,0 @@
-[Background]
-Color=44,44,44
-
-[BackgroundIntense]
-Bold=true
-Color=44,44,44
-
-[Color0]
-Color=44,44,44
-
-[Color0Intense]
-Bold=true
-Color=112,144,128
-
-[Color1]
-Color=112,80,80
-
-[Color1Intense]
-Bold=true
-Color=220,163,163
-
-[Color2]
-Color=96,180,138
-
-[Color2Intense]
-Bold=true
-Color=114,213,163
-
-[Color3]
-Color=223,175,143
-
-[Color3Intense]
-Bold=true
-Color=240,223,175
-
-[Color4]
-Color=154,184,215
-
-[Color4Intense]
-Bold=true
-Color=148,191,243
-
-[Color5]
-Color=220,140,195
-
-[Color5Intense]
-Bold=true
-Color=236,147,211
-
-[Color6]
-Color=140,208,211
-
-[Color6Intense]
-Bold=true
-Color=147,224,227
-
-[Color7]
-Color=220,220,204
-
-[Color7Intense]
-Bold=true
-Color=255,255,255
-
-[Foreground]
-Color=220,220,204
-
-[ForegroundIntense]
-Bold=true
-Color=220,220,204
-
-[General]
-Description=Calculate
-Opacity=1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
deleted file mode 100644
index f52191fcd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/apps name=desktoptheme
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
deleted file mode 100644
index 8c6f1ecd4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=../slim-glow/colors symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
deleted file mode 100644
index 0ea7fbb0e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=../slim-glow/dialogs symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
deleted file mode 100644
index 45b1a3093..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=../slim-glow/icons symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
deleted file mode 100644
index e27fe3989..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde 
-
-[Desktop Entry]
-Name=Calculate
-
-[Wallpaper]
-defaultWallpaperTheme=Calculate_Linux
-defaultFileSuffix=.jpg
-defaultWidth=2560
-defaultHeight=1600
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
deleted file mode 100644
index 8c18beeb4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=../slim-glow/opaque symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
deleted file mode 100644
index 88a6f15cc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=../slim-glow/widgets symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdelibs/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
deleted file mode 100644
index 5e0caa52e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdelibs/kdeglobals b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdelibs/kdeglobals
deleted file mode 100644
index ffb43c761..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdelibs/kdeglobals
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=plasma path=/usr/share/config
-[Directories][$i]
-dir_apps=
-dir_mime=
-
-[General]
-#?pkg(media-fonts/droid)==#
-menuFont=Verdana,10,-1,5,50,0,0,0,0,0
-font=Verdana,10,-1,5,50,0,0,0,0,0
-#pkg#
-#?pkg(media-fonts/droid)!=#
-menuFont=Droid Sans,10,-1,5,50,0,0,0,0,0
-font=Droid Sans,10,-1,5,50,0,0,0,0,0
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
deleted file mode 100644
index f52191fcd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/apps name=desktoptheme
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
deleted file mode 100644
index 2ad4c2e4b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=../slim-glow/lancelot symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/.calculate_directory
deleted file mode 100644
index 2e8fed6a4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/config
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/gnome.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/gnome.desktop
deleted file mode 100644
index 703f88415..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/gnome.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(gnome-base/gnome-session)== path=/usr/share/xsessions link=/usr/share/xsessions/KDE-4.desktop
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/kdmrc b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/kdmrc
deleted file mode 100644
index 001ef52b8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/kdmrc
+++ /dev/null
@@ -1,96 +0,0 @@
-# Calculate format=kde
-
-[General]
-ConfigVersion=2.4
-ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
-PidFile=/var/run/kdm.pid
-ReserveServers=:1,:2,:3
-ServerVTs=-7
-StaticServers=:0
-
-[Shutdown]
-BootManager=None
-HaltCmd=/sbin/halt
-RebootCmd=/sbin/reboot
-
-[X-*-Core]
-AllowNullPasswd=false
-AllowRootLogin=false
-AllowShutdown=Root
-AutoReLogin=false
-ClientLogFile=.xsession-errors-%d
-Resources=/usr/share/wallpapers/fulmine.jpg
-SessionsDirs=/usr/share/xsessions
-
-[X-*-Greeter]
-AntiAliasing=true
-ColorScheme=Oxygen
-FaceDir=/var/lib/kdm/faces/
-FaceSource=AdminOnly
-#?pkg(media-fonts/droid)==#
-FailFont=Verdana,10,-1,5,75,0,0,0,0,0
-#pkg#
-#?pkg(media-fonts/droid)!=#
-FailFont=Droid Sans,10,-1,5,75,0,0,0,0,0
-#pkg#
-ForgingSeed=1224337366
-GUIStyle=Oxygen
-#?pkg(media-fonts/droid)==#
-GreetFont=Verdana,20,-1,5,50,0,0,0,0,0
-#pkg#
-#?pkg(media-fonts/droid)!=#
-GreetFont=Droid Sans,20,-1,5,50,0,0,0,0,0
-#pkg#
-GreetString=
-GreeterPos=50,50
-HiddenUsers=
-LogoArea=Logo
-LogoPixmap=/usr/share/wallpapers/calculate-logo.png
-MaxShowUID=65000
-Preloader=/usr/bin/preloadkde
-SelectedUsers=
-ShowUsers=NotHidden
-SortUsers=true
-#?pkg(media-fonts/droid)==#
-StdFont=Verdana,10,-1,5,50,0,0,0,0,0
-#pkg#
-#?pkg(media-fonts/droid)!=#
-StdFont=Droid Sans,10,-1,5,50,0,0,0,0,0
-#pkg#
-UseBackground=true
-UserCompletion=true
-UserList=true
-Language=#-os_install_locale_lang-#
-#?pkg(media-gfx/kdm-themes-calculate)<14#
-UseTheme=false
-Theme=
-#pkg#
-#?pkg(media-gfx/kdm-themes-calculate)>=14#
-UseTheme=true
-Theme=/usr/share/apps/kdm/themes/calculate
-#pkg#
-
-[X-:*-Core]
-AllowNullPasswd=true
-AllowShutdown=All
-NoPassEnable=false
-NoPassUsers=
-ServerArgsLocal=-nolisten tcp -dpi 96
-ServerCmd=/usr/bin/X -br -novtswitch
-
-[X-:*-Greeter]
-AllowClose=false
-DefaultUser=cxz
-FocusPasswd=true
-LoginMode=DefaultLocal
-PreselectUser=Previous
-
-[X-:0-Core]
-AutoLoginEnable=false
-AutoLoginUser=
-AutoLoginLocked=false
-ClientLogFile=.xsession-errors
-
-[Xdmcp]
-Enable=false
-Willing=/usr/share/config/kdm/Xwilling
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/xfce.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/xfce.desktop
deleted file mode 100644
index 7d1541272..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/kdm/xfce.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(xfce-base/xfce4-session)== path=/usr/share/xsessions link=/usr/share/xsessions/KDE-4.desktop
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/konqueror/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/konqueror/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/konqueror/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
deleted file mode 100644
index 52b8e1b33..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/usr/share/applications/kde4 name=Home.desktop
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/marble/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/marble/.calculate_directory
deleted file mode 100644
index 89b213500..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/marble/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/applications name=kde4
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/marble/marble-touch.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/marble/marble-touch.desktop
deleted file mode 100644
index 363dbc0f0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-base/marble/marble-touch.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-NotShowIn=KDE;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
deleted file mode 100644
index 7325b3fe1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=15 merge=x11-themes/calculate-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
deleted file mode 100644
index 497553580..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share name=icons
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
deleted file mode 100644
index c6dd5dd93..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/breeze-dark/places/64 name=start-here-kde.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic force
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
deleted file mode 100644
index 4619aa23c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/breeze-dark/places/22 name=start-here-kde.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic force
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
deleted file mode 100644
index 9226875d6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/breeze/places/22 name=start-here-kde.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic force
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
deleted file mode 100644
index 5cc7d4dc9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/breeze/places/64 name=start-here-kde.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic force
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
deleted file mode 100644
index 761369a31..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
deleted file mode 100644
index 5c3e0ebad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons name=oxygen
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
deleted file mode 100644
index 73e91b56d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/oxygen/64x64/apps name=start-here.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
deleted file mode 100644
index d38d27a95..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/oxygen/64x64/apps name=start-calculate.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
deleted file mode 100644
index 521872531..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/oxygen/scalable/apps name=start-here.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
deleted file mode 100644
index 0ed58fac1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/oxygen/scalable/apps name=start-calculate.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
deleted file mode 100644
index 761369a31..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
deleted file mode 100644
index 4c5af8eca..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/plasma/desktoptheme/default/icons name=start.svgz append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-misc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
deleted file mode 100644
index 627d38d89..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/themes/Breeze/gtk-2.0 name=Lines
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/Breeze.colors b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
deleted file mode 100644
index 8a7e8297a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde comment= path=/usr/share/color-schemes
-[Colors:Tooltip]
-BackgroundNormal=239,240,241
-ForegroundNormal=49,54,59
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png
deleted file mode 100644
index 35587e9fe..000000000
Binary files a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
deleted file mode 100644
index ecc922187..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde path=/etc/xdg
-[General]
-Name=Calculate Linux
-!LogoPath=
-Website=http://www.calculate-linux.org/
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
deleted file mode 100644
index 76f64376a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-[Desktop Entry]
-Categories=System;Security;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
deleted file mode 100644
index 2e97d0769..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/X11 name=Sessions
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma b/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
deleted file mode 100644
index ee68b0384..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate chmod=0755
-startkde
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm
deleted file mode 100644
index d6b1c6d11..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# path=/etc/env.d
-
-DESKTOP="xfce"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/lxdm.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
deleted file mode 100644
index 31dada1a7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# Calculate format=kde path=/etc/lxdm
-
-[base]
-## uncomment and set autologin username to enable autologin
-# autologin=dgod
-
-## uncomment and set timeout to enable timeout autologin,
-## the value should >=5
-# timeout=10
-
-## default session or desktop used when no systemwide config
-#session=/usr/bin/startxfce4
-
-## uncomment and set to set numlock on your keyboard
-# numlock=0
-
-## set this if you don't want to put xauth file at ~/.Xauthority
-# xauth_path=/tmp
-
-## greeter used to welcome the user
-greeter=/usr/libexec/lxdm-greeter-gtk
-
-[server]
-## arg used to start xserver, not fully function
-# arg=/usr/bin/X -background vt1
-
-[display]
-## gtk theme used by greeter
-
-#?main.os_linux_ver>=13#
-gtk_theme=Calculate
-#main.os_linux_ver#
-#?main.os_linux_ver<13#
-gtk_theme=Adwaita
-#main.os_linux_ver#
-
-## background of the greeter
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldx-themes)>=11.15-r1&&pkg(media-gfx/cldx-themes)<12.0_alpha1#
-bg=/usr/share/lxdm/themes/Calculate/bg.jpg
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldx-themes)>=12.0_alpha1#
-bg=/usr/share/lxdm/themes/Calculate/calculate-lxdm-#-os_x11_standart-#.jpg
-#pkg#
-
-## if show bottom pane
-bottom_pane=1
-
-## if show language select control
-lang=0
-
-## if show keyboard layout select control
-keyboard=0
-
-## the theme of greeter
-#?pkg(media-gfx/cldx-themes)>=11.15-r1||pkg(media-gfx/lxdm-themes-calculate)!=#
-theme=Calculate
-#pkg#
-
-[input]
-
-[userlist]
-## if disable the user list control at greeter
-disable=1
-
-## whitelist user
-white=
-
-## blacklist user
-black=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
deleted file mode 100644
index 62e09ae24..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-!Categories=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
deleted file mode 100644
index 18eeb3e98..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
deleted file mode 100644
index 4f98257f8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Categories=X-Leave;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
deleted file mode 100644
index f3dfc2e84..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Categories=X-Leave;
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
deleted file mode 100644
index ba4d5abbd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Exec=dm-tool lock
-Categories=X-Leave;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
deleted file mode 100644
index 4f98257f8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Categories=X-Leave;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
deleted file mode 100644
index 4f98257f8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Categories=X-Leave;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
deleted file mode 100644
index 4f98257f8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Categories=X-Leave;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
deleted file mode 100644
index 4f98257f8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Categories=X-Leave;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/claws-mail/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
deleted file mode 100644
index aeb3a6042..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-Categories=Network;Email;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/trojita/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/trojita/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/trojita/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/trojita/trojita.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/trojita/trojita.desktop
deleted file mode 100644
index e4b5e7434..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/mail-client/trojita/trojita.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-Categories=Qt;Network;Email;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/.calculate_directory
deleted file mode 100644
index 7b69b16a9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=fonts
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/terminus-font/change-unifont b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/terminus-font/change-unifont
deleted file mode 100644
index 7a8853032..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-fonts/terminus-font/change-unifont
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate run=/bin/bash pkg(sys-boot/grub)!=&&ac_install_disk==off merge=sys-boot/grub
-
-#?exists(#-cl_chroot_path-#/usr/share/fonts/terminus/ter-x18n.pcf.gz)!=#
-/usr/bin/grub-mkfont -o #-cl_chroot_path-#/usr/share/grub/unicode.pf2 #-cl_chroot_path-#/usr/share/fonts/terminus/ter-x18n.pcf.gz
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/feh/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/feh/.calculate_directory
deleted file mode 100644
index de7d03c01..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/feh/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/feh/feh.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/feh/feh.desktop
deleted file mode 100644
index bb065d8ac..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/feh/feh.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/fontforge/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
deleted file mode 100644
index 611520de7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg(media-gfx/fontforge[-X])!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
deleted file mode 100644
index bc946ce9c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/usr/share/applications name=fontforge.desktop
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/.calculate_directory
deleted file mode 100644
index 1f5b714da..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/gdm/themes name=calculate
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png
deleted file mode 100644
index a2a8a6f0f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png.14-r1 b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png.14-r1
deleted file mode 100644
index be016aefe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png.14-r1
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=background.png pkg(media-gfx/dm-themes-calculate)>=14-r1 link=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gimp/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gimp/.calculate_directory
deleted file mode 100644
index 654b35a6b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gimp/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gimp/99gimp b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gimp/99gimp
deleted file mode 100644
index 82806183b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/gimp/99gimp
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-# discard /usr/lib64/gimp/2.0/plug-ins/hot due to an segfault prelink
-# prelink (20110106-20110511), gimp (2.6.11) (CLD-64)
-PRELINK_PATH_MASK=/usr/lib64/gimp/2.0/plug-ins/hot
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
deleted file mode 100644
index a1c1846b4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
deleted file mode 100644
index 64f23e79a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-Categories=Graphics;RasterGraphics;Viewer;2DGraphics;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
deleted file mode 100644
index f96ccbd20..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&exists(/usr/share/kwin/tabbox/thumbnails/contents/ui/main.qml)!= path=/usr/share/plasma/look-and-feel/org.kde.calculate name=contents
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
deleted file mode 100644
index b68a4209e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=kde
-
-[kwinrc][WindowSwitcher]
-LayoutName=org.kde.calculate
-
-[kwinrc][DesktopSwitcher]
-LayoutName=org.kde.calculate
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
deleted file mode 100644
index a30d56c25..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/kwin/tabbox/thumbnails/contents/ui/main.qml mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
deleted file mode 100644
index d2dbb01ab..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc name=splash pkg(media-gfx/splash-themes-calculate)>=14&&pkg(media-gfx/splash-themes-calculate)<15
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
deleted file mode 100644
index 17299f740..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x576.jpg
-
-# progress bar for silent mode
-box silent inter 0 574 0 576 #ffdfa0
-box silent 0 574 1024 576 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
deleted file mode 100644
index 019777d7e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x600.jpg
-
-# progress bar for silent mode
-box silent inter 0 598 0 600 #ffdfa0
-box silent 0 598 1024 600 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
deleted file mode 100644
index dd752b035..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 766 0 768 #ffdfa0
-box silent 0 766 1024 768 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
deleted file mode 100644
index 6f7c55de9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1200x800.jpg
-
-# progress bar for silent mode
-box silent inter 0 798 0 800 #ffdfa0
-box silent 0 798 1200 800 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
deleted file mode 100644
index aa3c0dce8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x1024.jpg
-
-# progress bar for silent mode
-box silent inter 0 1022 0 1024 #ffdfa0
-box silent 0 1022 1280 1024 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
deleted file mode 100644
index 42ece4344..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x720.jpg
-
-# progress bar for silent mode
-box silent inter 0 718 0 720 #ffdfa0
-box silent 0 718 1280 720 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
deleted file mode 100644
index 3409ecf66..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 766 0 768 #ffdfa0
-box silent 0 766 1280 768 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
deleted file mode 100644
index 8d8f94227..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x800.jpg
-
-# progress bar for silent mode
-box silent inter 0 798 0 800 #ffdfa0
-box silent 0 798 1280 800 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
deleted file mode 100644
index 5f60293b2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1360x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 766 0 768 #ffdfa0
-box silent 0 766 1360 768 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
deleted file mode 100644
index fde150fee..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1366x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 766 0 768 #ffdfa0
-box silent 0 766 1366 768 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
deleted file mode 100644
index e87badd26..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1368x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 766 0 768 #ffdfa0
-box silent 0 766 1368 768 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
deleted file mode 100644
index 5b6857a62..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1400x1050.jpg
-
-# progress bar for silent mode
-box silent inter 0 1048 0 1050 #ffdfa0
-box silent 0 1048 1400 1050 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
deleted file mode 100644
index 4b1dbd8b7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1440x900.jpg
-
-# progress bar for silent mode
-box silent inter 0 898 0 900 #ffdfa0
-box silent 0 898 1440 900 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
deleted file mode 100644
index 62499a116..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x1200.jpg
-
-# progress bar for silent mode
-box silent inter 0 1198 0 1200 #ffdfa0
-box silent 0 1198 1600 1200 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
deleted file mode 100644
index 3374796f3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 766 0 768 #ffdfa0
-box silent 0 766 1600 768 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
deleted file mode 100644
index 442d94143..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x900.jpg
-
-# progress bar for silent mode
-box silent inter 0 898 0 900 #ffdfa0
-box silent 0 898 1600 900 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
deleted file mode 100644
index c40987413..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x1050.jpg
-
-# progress bar for silent mode
-box silent inter 0 1048 0 1050 #ffdfa0
-box silent 0 1048 1680 1050 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
deleted file mode 100644
index f64c32da0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x945.jpg
-
-# progress bar for silent mode
-box silent inter 0 943 0 945 #ffdfa0
-box silent 0 943 1680 945 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
deleted file mode 100644
index ffcfb0534..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1080.jpg
-
-# progress bar for silent mode
-box silent inter 0 1078 0 1080 #ffdfa0
-box silent 0 1078 1920 1080 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
deleted file mode 100644
index ed9002087..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1200.jpg
-
-# progress bar for silent mode
-box silent inter 0 1198 0 1200 #ffdfa0
-box silent 0 1198 1920 1200 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
deleted file mode 100644
index b5494af49..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2048x1152.jpg
-
-# progress bar for silent mode
-box silent inter 0 1150 0 1152 #ffdfa0
-box silent 0 1150 2048 1152 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
deleted file mode 100644
index 276ab5155..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1440.jpg
-
-# progress bar for silent mode
-box silent inter 0 1438 0 1440 #ffdfa0
-box silent 0 1438 2560 1440 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
deleted file mode 100644
index 743c51300..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1600.jpg
-
-# progress bar for silent mode
-box silent inter 0 1598 0 1600 #ffdfa0
-box silent 0 1598 2560 1600 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
deleted file mode 100644
index a45a24a67..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-640x480.jpg
-
-# progress bar for silent mode
-box silent inter 0 478 0 480 #ffdfa0
-box silent 0 478 640 480 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
deleted file mode 100644
index 29130a8c1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x480.jpg
-
-# progress bar for silent mode
-box silent inter 0 478 0 480 #ffdfa0
-box silent 0 478 800 480 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
deleted file mode 100644
index 727aad4c4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x600.jpg
-
-# progress bar for silent mode
-box silent inter 0 598 0 600 #ffdfa0
-box silent 0 598 800 600 #ffdfa0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
deleted file mode 100644
index 4d13677dd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate append=skip
-
-for fn in *.cfg;
-do
-    resol=${fn%.cfg}
-    width=$( echo $resol | cut -dx -f1 )
-    height=$( echo $resol | cut -dx -f2 )
-    orig_height=1080
-    boxtop=$(( $height - 2 ))
-
-cat >$fn <<EOF
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-${resol}.jpg
-
-# progress bar for silent mode
-box silent inter 0 ${boxtop} 0 ${height} #ffdfa0
-box silent 0 ${boxtop} ${width} ${height} #ffdfa0
-EOF
-done
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
deleted file mode 100644
index 85c0cfc48..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x576.jpg
-
-# Coords of system messages
-text_x=512
-text_y=200
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 574 0 576 #9aedf3
-box silent 0 574 1024 576 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
deleted file mode 100644
index 55ca50bb0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x600.jpg
-
-# Coords of system messages
-text_x=512
-text_y=212
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 598 0 600 #9aedf3
-box silent 0 598 1024 600 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
deleted file mode 100644
index 3708ed626..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x768.jpg
-
-# Coords of system messages
-text_x=512
-text_y=295
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 766 0 768 #9aedf3
-box silent 0 766 1024 768 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
deleted file mode 100644
index 4ee5afba1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1200x800.jpg
-
-# Coords of system messages
-text_x=600
-text_y=311
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 798 0 800 #9aedf3
-box silent 0 798 1200 800 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
deleted file mode 100644
index 3df1c5dfa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x1024.jpg
-
-# Coords of system messages
-text_x=640
-text_y=423
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1022 0 1024 #9aedf3
-box silent 0 1022 1280 1024 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
deleted file mode 100644
index e8ff60d2a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x720.jpg
-
-# Coords of system messages
-text_x=640
-text_y=272
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 718 0 720 #9aedf3
-box silent 0 718 1280 720 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
deleted file mode 100644
index 767435fbf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x768.jpg
-
-# Coords of system messages
-text_x=640
-text_y=295
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 766 0 768 #9aedf3
-box silent 0 766 1280 768 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
deleted file mode 100644
index 29de1e559..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x800.jpg
-
-# Coords of system messages
-text_x=640
-text_y=311
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 798 0 800 #9aedf3
-box silent 0 798 1280 800 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
deleted file mode 100644
index 35ffca34d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1360x768.jpg
-
-# Coords of system messages
-text_x=680
-text_y=295
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 766 0 768 #9aedf3
-box silent 0 766 1360 768 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
deleted file mode 100644
index c9e08ba90..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1366x768.jpg
-
-# Coords of system messages
-text_x=683
-text_y=295
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 766 0 768 #9aedf3
-box silent 0 766 1366 768 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
deleted file mode 100644
index 21595f794..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1368x768.jpg
-
-# Coords of system messages
-text_x=684
-text_y=295
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 766 0 768 #9aedf3
-box silent 0 766 1368 768 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
deleted file mode 100644
index 78c99facc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1400x1050.jpg
-
-# Coords of system messages
-text_x=700
-text_y=436
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1048 0 1050 #9aedf3
-box silent 0 1048 1400 1050 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
deleted file mode 100644
index 7aa4430ae..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1440x900.jpg
-
-# Coords of system messages
-text_x=720
-text_y=361
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 898 0 900 #9aedf3
-box silent 0 898 1440 900 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
deleted file mode 100644
index 594fe57e2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x1200.jpg
-
-# Coords of system messages
-text_x=800
-text_y=510
-text_align middle middle
-
-# system messages font size
-text_size=28
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1198 0 1200 #9aedf3
-box silent 0 1198 1600 1200 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
deleted file mode 100644
index a3af84357..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x768.jpg
-
-# Coords of system messages
-text_x=800
-text_y=295
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 766 0 768 #9aedf3
-box silent 0 766 1600 768 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
deleted file mode 100644
index 438071e5c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x900.jpg
-
-# Coords of system messages
-text_x=800
-text_y=361
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 898 0 900 #9aedf3
-box silent 0 898 1600 900 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
deleted file mode 100644
index 0c2b97bb2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x1050.jpg
-
-# Coords of system messages
-text_x=840
-text_y=436
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1048 0 1050 #9aedf3
-box silent 0 1048 1680 1050 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
deleted file mode 100644
index 3ba8ab3f9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x945.jpg
-
-# Coords of system messages
-text_x=840
-text_y=383
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 943 0 945 #9aedf3
-box silent 0 943 1680 945 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
deleted file mode 100644
index f5def31bd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1080.jpg
-
-# Coords of system messages
-text_x=960
-text_y=450
-text_align middle middle
-
-# system messages font size
-text_size=28
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1078 0 1080 #9aedf3
-box silent 0 1078 1920 1080 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
deleted file mode 100644
index d3540df4f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1200.jpg
-
-# Coords of system messages
-text_x=960
-text_y=510
-text_align middle middle
-
-# system messages font size
-text_size=28
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1198 0 1200 #9aedf3
-box silent 0 1198 1920 1200 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
deleted file mode 100644
index 70565b7ba..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2048x1152.jpg
-
-# Coords of system messages
-text_x=1024
-text_y=486
-text_align middle middle
-
-# system messages font size
-text_size=28
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1150 0 1152 #9aedf3
-box silent 0 1150 2048 1152 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
deleted file mode 100644
index 08371bb8c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1440.jpg
-
-# Coords of system messages
-text_x=1280
-text_y=629
-text_align middle middle
-
-# system messages font size
-text_size=28
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1438 0 1440 #9aedf3
-box silent 0 1438 2560 1440 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
deleted file mode 100644
index 1e169f160..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1600.jpg
-
-# Coords of system messages
-text_x=1280
-text_y=709
-text_align middle middle
-
-# system messages font size
-text_size=28
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1598 0 1600 #9aedf3
-box silent 0 1598 2560 1600 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
deleted file mode 100644
index db08a4017..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-640x480.jpg
-
-# Coords of system messages
-text_x=320
-text_y=152
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 478 0 480 #9aedf3
-box silent 0 478 640 480 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
deleted file mode 100644
index 3519a0215..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x480.jpg
-
-# Coords of system messages
-text_x=400
-text_y=152
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 478 0 480 #9aedf3
-box silent 0 478 800 480 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
deleted file mode 100644
index 15b5d7f34..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x600.jpg
-
-# Coords of system messages
-text_x=400
-text_y=212
-text_align middle middle
-
-# system messages font size
-text_size=27
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 598 0 600 #9aedf3
-box silent 0 598 800 600 #9aedf3
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
deleted file mode 100644
index 93309ceaa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/fonts/droid/DroidSans.ttf mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
deleted file mode 100644
index 2f996b647..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-# Calculate append=skip
-
-for fn in *.cfg;
-do
-    resol=${fn%.cfg}
-    width=$( echo $resol | cut -dx -f1 )
-    height=$( echo $resol | cut -dx -f2 )
-    orig_height=1080
-    k="$((1000 - ( 1000 - ${height}000 / ${orig_height} ) / 25 )) / 1000"
-    boxtop=$(( $height - 2 ))
-    text_x=$(( $width / 2 ))
-    text_y=$(( $height / 2 - 90 * $k ))
-    text_size=$(( 28 * $k ))
-
-cat >$fn <<EOF
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-${resol}.jpg
-
-# Coords of system messages
-text_x=${text_x}
-text_y=${text_y}
-text_align middle middle
-
-# system messages font size
-text_size=${text_size}
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 ${boxtop} 0 ${height} #9aedf3
-box silent 0 ${boxtop} ${width} ${height} #9aedf3
-
-EOF
-done
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
deleted file mode 100644
index 302cfcb11..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc name=splash pkg(media-gfx/splash-themes-calculate)>=15
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
deleted file mode 100644
index ccaa63884..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x576.jpg
-
-# progress bar for silent mode
-box silent inter 0 575 0 576 #ffffff
-box silent 0 575 1024 576 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
deleted file mode 100644
index e80f2a38a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x600.jpg
-
-# progress bar for silent mode
-box silent inter 0 599 0 600 #ffffff
-box silent 0 599 1024 600 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
deleted file mode 100644
index 6f25c4c0c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1024 768 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
deleted file mode 100644
index eb93d6acd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1200x800.jpg
-
-# progress bar for silent mode
-box silent inter 0 799 0 800 #ffffff
-box silent 0 799 1200 800 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
deleted file mode 100644
index b758ee34f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x1024.jpg
-
-# progress bar for silent mode
-box silent inter 0 1023 0 1024 #ffffff
-box silent 0 1023 1280 1024 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
deleted file mode 100644
index 2f6ad5b6e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x720.jpg
-
-# progress bar for silent mode
-box silent inter 0 719 0 720 #ffffff
-box silent 0 719 1280 720 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
deleted file mode 100644
index 9318842e5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1280 768 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
deleted file mode 100644
index 2389e1301..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x800.jpg
-
-# progress bar for silent mode
-box silent inter 0 799 0 800 #ffffff
-box silent 0 799 1280 800 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
deleted file mode 100644
index 3cbf62a65..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1360x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1360 768 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
deleted file mode 100644
index 45adb2f52..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1366x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1366 768 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
deleted file mode 100644
index 63c0fa009..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1368x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1368 768 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
deleted file mode 100644
index e66245ecd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1400x1050.jpg
-
-# progress bar for silent mode
-box silent inter 0 1049 0 1050 #ffffff
-box silent 0 1049 1400 1050 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
deleted file mode 100644
index 362231655..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1440x900.jpg
-
-# progress bar for silent mode
-box silent inter 0 899 0 900 #ffffff
-box silent 0 899 1440 900 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
deleted file mode 100644
index 69941ea46..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x1200.jpg
-
-# progress bar for silent mode
-box silent inter 0 1199 0 1200 #ffffff
-box silent 0 1199 1600 1200 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
deleted file mode 100644
index 5b8459f15..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x768.jpg
-
-# progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1600 768 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
deleted file mode 100644
index 6cdf3d907..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x900.jpg
-
-# progress bar for silent mode
-box silent inter 0 899 0 900 #ffffff
-box silent 0 899 1600 900 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
deleted file mode 100644
index 02307afe6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x1050.jpg
-
-# progress bar for silent mode
-box silent inter 0 1049 0 1050 #ffffff
-box silent 0 1049 1680 1050 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
deleted file mode 100644
index b1fbcf0ea..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x945.jpg
-
-# progress bar for silent mode
-box silent inter 0 944 0 945 #ffffff
-box silent 0 944 1680 945 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
deleted file mode 100644
index af8532a15..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1080.jpg
-
-# progress bar for silent mode
-box silent inter 0 1079 0 1080 #ffffff
-box silent 0 1079 1920 1080 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
deleted file mode 100644
index b7354d8cd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1200.jpg
-
-# progress bar for silent mode
-box silent inter 0 1199 0 1200 #ffffff
-box silent 0 1199 1920 1200 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
deleted file mode 100644
index d90c7cfc2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2048x1152.jpg
-
-# progress bar for silent mode
-box silent inter 0 1151 0 1152 #ffffff
-box silent 0 1151 2048 1152 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
deleted file mode 100644
index 7bb88cf47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1440.jpg
-
-# progress bar for silent mode
-box silent inter 0 1439 0 1440 #ffffff
-box silent 0 1439 2560 1440 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
deleted file mode 100644
index 35b59921f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1600.jpg
-
-# progress bar for silent mode
-box silent inter 0 1599 0 1600 #ffffff
-box silent 0 1599 2560 1600 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
deleted file mode 100644
index 254642f96..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-640x480.jpg
-
-# progress bar for silent mode
-box silent inter 0 479 0 480 #ffffff
-box silent 0 479 640 480 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
deleted file mode 100644
index 7f2d22f1b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x480.jpg
-
-# progress bar for silent mode
-box silent inter 0 479 0 480 #ffffff
-box silent 0 479 800 480 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
deleted file mode 100644
index fd9072275..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x600.jpg
-
-# progress bar for silent mode
-box silent inter 0 599 0 600 #ffffff
-box silent 0 599 800 600 #ffffff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
deleted file mode 100644
index 670d453d5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate append=skip
-
-for fn in *.cfg;
-do
-    resol=${fn%.cfg}
-    width=$( echo $resol | cut -dx -f1 )
-    height=$( echo $resol | cut -dx -f2 )
-    orig_height=1080
-    boxtop=$(( $height - 1 ))
-
-cat >$fn <<EOF
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-${resol}.jpg
-
-# progress bar for silent mode
-box silent inter 0 ${boxtop} 0 ${height} #ffffff
-box silent 0 ${boxtop} ${width} ${height} #ffffff
-EOF
-done
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
deleted file mode 100644
index 1c2466b19..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x576.jpg
-
-# Coords of system messages
-text_x=512
-text_y=346
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 575 0 576 #ffffff
-box silent 0 575 1024 576 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
deleted file mode 100644
index c2f989f7c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x600.jpg
-
-# Coords of system messages
-text_x=512
-text_y=358
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 599 0 600 #ffffff
-box silent 0 599 1024 600 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
deleted file mode 100644
index 5df03d82c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1024x768.jpg
-
-# Coords of system messages
-text_x=512
-text_y=443
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1024 768 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
deleted file mode 100644
index 0b9112bb3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1200x800.jpg
-
-# Coords of system messages
-text_x=600
-text_y=459
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 799 0 800 #ffffff
-box silent 0 799 1200 800 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
deleted file mode 100644
index 831d5dc93..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x1024.jpg
-
-# Coords of system messages
-text_x=640
-text_y=571
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1023 0 1024 #ffffff
-box silent 0 1023 1280 1024 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
deleted file mode 100644
index 1ae0d7204..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x720.jpg
-
-# Coords of system messages
-text_x=640
-text_y=419
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 719 0 720 #ffffff
-box silent 0 719 1280 720 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
deleted file mode 100644
index b473ec8a0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x768.jpg
-
-# Coords of system messages
-text_x=640
-text_y=443
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1280 768 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
deleted file mode 100644
index 4310cb7e2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1280x800.jpg
-
-# Coords of system messages
-text_x=640
-text_y=459
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 799 0 800 #ffffff
-box silent 0 799 1280 800 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
deleted file mode 100644
index 66fdc0c1d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1360x768.jpg
-
-# Coords of system messages
-text_x=680
-text_y=443
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1360 768 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
deleted file mode 100644
index bae2eaaf4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1366x768.jpg
-
-# Coords of system messages
-text_x=683
-text_y=443
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1366 768 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
deleted file mode 100644
index 4db242452..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1368x768.jpg
-
-# Coords of system messages
-text_x=684
-text_y=443
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1368 768 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
deleted file mode 100644
index c44ad7a05..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1400x1050.jpg
-
-# Coords of system messages
-text_x=700
-text_y=584
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1049 0 1050 #ffffff
-box silent 0 1049 1400 1050 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
deleted file mode 100644
index d168be9fb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1440x900.jpg
-
-# Coords of system messages
-text_x=720
-text_y=509
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 899 0 900 #ffffff
-box silent 0 899 1440 900 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
deleted file mode 100644
index 49c6f3b51..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x1200.jpg
-
-# Coords of system messages
-text_x=800
-text_y=660
-text_align middle middle
-
-# system messages font size
-text_size=20
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1199 0 1200 #ffffff
-box silent 0 1199 1600 1200 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
deleted file mode 100644
index 01bf85f29..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x768.jpg
-
-# Coords of system messages
-text_x=800
-text_y=443
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 767 0 768 #ffffff
-box silent 0 767 1600 768 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
deleted file mode 100644
index 62beccacf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1600x900.jpg
-
-# Coords of system messages
-text_x=800
-text_y=509
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 899 0 900 #ffffff
-box silent 0 899 1600 900 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
deleted file mode 100644
index 0029bdde1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x1050.jpg
-
-# Coords of system messages
-text_x=840
-text_y=584
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1049 0 1050 #ffffff
-box silent 0 1049 1680 1050 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
deleted file mode 100644
index 0f3b4f9ef..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1680x945.jpg
-
-# Coords of system messages
-text_x=840
-text_y=531
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 944 0 945 #ffffff
-box silent 0 944 1680 945 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
deleted file mode 100644
index 64d8d1fa7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1080.jpg
-
-# Coords of system messages
-text_x=960
-text_y=600
-text_align middle middle
-
-# system messages font size
-text_size=20
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1079 0 1080 #ffffff
-box silent 0 1079 1920 1080 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
deleted file mode 100644
index cc6e9402c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-1920x1200.jpg
-
-# Coords of system messages
-text_x=960
-text_y=660
-text_align middle middle
-
-# system messages font size
-text_size=20
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1199 0 1200 #ffffff
-box silent 0 1199 1920 1200 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
deleted file mode 100644
index 0443e4c5d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2048x1152.jpg
-
-# Coords of system messages
-text_x=1024
-text_y=636
-text_align middle middle
-
-# system messages font size
-text_size=20
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1151 0 1152 #ffffff
-box silent 0 1151 2048 1152 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
deleted file mode 100644
index fe9cf16e7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1440.jpg
-
-# Coords of system messages
-text_x=1280
-text_y=780
-text_align middle middle
-
-# system messages font size
-text_size=20
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1439 0 1440 #ffffff
-box silent 0 1439 2560 1440 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
deleted file mode 100644
index 81def1ccf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-2560x1600.jpg
-
-# Coords of system messages
-text_x=1280
-text_y=861
-text_align middle middle
-
-# system messages font size
-text_size=20
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 1599 0 1600 #ffffff
-box silent 0 1599 2560 1600 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
deleted file mode 100644
index 66414c62e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-640x480.jpg
-
-# Coords of system messages
-text_x=320
-text_y=298
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 479 0 480 #ffffff
-box silent 0 479 640 480 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
deleted file mode 100644
index 5c5e1bed9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x480.jpg
-
-# Coords of system messages
-text_x=400
-text_y=298
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 479 0 480 #ffffff
-box silent 0 479 800 480 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
deleted file mode 100644
index dcf08f084..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-800x600.jpg
-
-# Coords of system messages
-text_x=400
-text_y=358
-text_align middle middle
-
-# system messages font size
-text_size=19
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 599 0 600 #ffffff
-box silent 0 599 800 600 #ffffff
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
deleted file mode 100644
index 93309ceaa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/fonts/droid/DroidSans.ttf mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
deleted file mode 100644
index 28f11f0b3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-# Calculate append=skip
-
-for fn in *.cfg;
-do
-    resol=${fn%.cfg}
-    width=$( echo $resol | cut -dx -f1 )
-    height=$( echo $resol | cut -dx -f2 )
-    orig_height=1080
-    k="$((1000 - ( 1000 - ${height}000 / ${orig_height} ) / 25 )) / 1000"
-    boxtop=$(( $height - 1 ))
-    text_x=$(( $width / 2 ))
-    text_y=$(( $height / 2 + 60 * $k ))
-    text_size=$(( 20 * $k ))
-
-cat >$fn <<EOF
-# Calculate comment=#
-
-# background image
-silentpic=images/silent-${resol}.jpg
-
-# Coords of system messages
-text_x=${text_x}
-text_y=${text_y}
-text_align middle middle
-
-# system messages font size
-text_size=${text_size}
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xdddddd
-
-# Path to TTF font, for system messages. Path may be:
-text_font=DroidSans.ttf
-
-#progress bar for silent mode
-box silent inter 0 ${boxtop} 0 ${height} #ffffff
-box silent 0 ${boxtop} ${width} ${height} #ffffff
-
-EOF
-done
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
deleted file mode 100644
index 4a43951d8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/splash pkg(media-gfx/splash-themes-calculate)<14
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
deleted file mode 100644
index 16b6fcef6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1024x576.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=24
-ty=20
-tw=978
-th=486
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1024x576.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=5
-text_y=556
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=512
-text_y=501
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=11
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 571 0 576 #FFF596
-box silent 0 571 1024 576 #FFF596
-
-#rectangle around text window in verbose mode
-box  19 13 19 507 #8C9096
-box  19 13 1003 13 #8C9096
-box  1003 13 1003 507 #eef4ff
-box  19 507 1003 507 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
deleted file mode 100644
index f095e71e5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1024x600.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=24
-ty=21
-tw=978
-th=506
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1024x600.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=5
-text_y=579
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=512
-text_y=522
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=11
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 595 0 600 #FFF596
-box silent 0 595 1024 600 #FFF596
-
-#rectangle around text window in verbose mode
-box  19 14 19 528 #8C9096
-box  19 14 1003 14 #8C9096
-box  1003 14 1003 528 #eef4ff
-box  19 528 1003 528 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
deleted file mode 100644
index e12ff98cc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1024x768.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=24
-ty=27
-tw=978
-th=648
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1024x768.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=5
-text_y=741
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=512
-text_y=668
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 761 0 768 #FFF596
-box silent 0 761 1024 768 #FFF596
-
-#rectangle around text window in verbose mode
-box  19 18 19 676 #8C9096
-box  19 18 1003 18 #8C9096
-box  1003 18 1003 676 #eef4ff
-box  19 676 1003 676 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
deleted file mode 100644
index bce4ac83c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1200x800.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=28
-ty=28
-tw=1146
-th=675
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1200x800.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=6
-text_y=772
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=600
-text_y=696
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 793 0 800 #FFF596
-box silent 0 793 1200 800 #FFF596
-
-#rectangle around text window in verbose mode
-box  22 19 22 705 #8C9096
-box  22 19 1176 19 #8C9096
-box  1176 19 1176 705 #eef4ff
-box  22 705 1176 705 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
deleted file mode 100644
index 76bc79e23..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1280x1024.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=30
-ty=36
-tw=1223
-th=864
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1280x1024.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=6
-text_y=988
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=640
-text_y=891
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=17
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1015 0 1024 #FFF596
-box silent 0 1015 1280 1024 #FFF596
-
-#rectangle around text window in verbose mode
-box  24 24 24 902 #8C9096
-box  24 24 1254 24 #8C9096
-box  1254 24 1254 902 #eef4ff
-box  24 902 1254 902 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
deleted file mode 100644
index d1fe853e7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1280x720.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=30
-ty=26
-tw=1223
-th=608
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1280x720.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=6
-text_y=695
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=640
-text_y=627
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=12
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 714 0 720 #FFF596
-box silent 0 714 1280 720 #FFF596
-
-#rectangle around text window in verbose mode
-box  24 17 24 634 #8C9096
-box  24 17 1254 17 #8C9096
-box  1254 17 1254 634 #eef4ff
-box  24 634 1254 634 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
deleted file mode 100644
index 53e4317ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1280x768.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=30
-ty=27
-tw=1223
-th=648
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1280x768.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=6
-text_y=741
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=640
-text_y=668
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 761 0 768 #FFF596
-box silent 0 761 1280 768 #FFF596
-
-#rectangle around text window in verbose mode
-box  24 18 24 676 #8C9096
-box  24 18 1254 18 #8C9096
-box  1254 18 1254 676 #eef4ff
-box  24 676 1254 676 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
deleted file mode 100644
index 8bda8a5f7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1280x800.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=30
-ty=28
-tw=1223
-th=675
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1280x800.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=6
-text_y=772
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=640
-text_y=696
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 793 0 800 #FFF596
-box silent 0 793 1280 800 #FFF596
-
-#rectangle around text window in verbose mode
-box  24 19 24 705 #8C9096
-box  24 19 1254 19 #8C9096
-box  1254 19 1254 705 #eef4ff
-box  24 705 1254 705 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
deleted file mode 100644
index 249f9e495..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1360x768.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=32
-ty=27
-tw=1299
-th=648
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1360x768.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=7
-text_y=741
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=680
-text_y=668
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 761 0 768 #FFF596
-box silent 0 761 1360 768 #FFF596
-
-#rectangle around text window in verbose mode
-box  25 18 25 676 #8C9096
-box  25 18 1333 18 #8C9096
-box  1333 18 1333 676 #eef4ff
-box  25 676 1333 676 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
deleted file mode 100644
index febbe0004..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1366x768.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=32
-ty=27
-tw=1305
-th=648
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1366x768.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=7
-text_y=741
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=683
-text_y=668
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 761 0 768 #FFF596
-box silent 0 761 1366 768 #FFF596
-
-#rectangle around text window in verbose mode
-box  25 18 25 676 #8C9096
-box  25 18 1338 18 #8C9096
-box  1338 18 1338 676 #eef4ff
-box  25 676 1338 676 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
deleted file mode 100644
index c06277d16..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1368x768.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=32
-ty=27
-tw=1307
-th=648
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1368x768.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=7
-text_y=741
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=684
-text_y=668
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 761 0 768 #FFF596
-box silent 0 761 1368 768 #FFF596
-
-#rectangle around text window in verbose mode
-box  25 18 25 676 #8C9096
-box  25 18 1340 18 #8C9096
-box  1340 18 1340 676 #eef4ff
-box  25 676 1340 676 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
deleted file mode 100644
index 9555af330..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1400x1050.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=33
-ty=37
-tw=1338
-th=886
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1400x1050.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=7
-text_y=1014
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=700
-text_y=914
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=17
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1041 0 1050 #FFF596
-box silent 0 1041 1400 1050 #FFF596
-
-#rectangle around text window in verbose mode
-box  26 25 26 925 #8C9096
-box  26 25 1372 25 #8C9096
-box  1372 25 1372 925 #eef4ff
-box  26 925 1372 925 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
deleted file mode 100644
index 75f9f56c1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1440x900.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=34
-ty=32
-tw=1376
-th=760
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1440x900.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=7
-text_y=869
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=720
-text_y=783
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=15
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 892 0 900 #FFF596
-box silent 0 892 1440 900 #FFF596
-
-#rectangle around text window in verbose mode
-box  27 21 27 793 #8C9096
-box  27 21 1411 21 #8C9096
-box  1411 21 1411 793 #eef4ff
-box  27 793 1411 793 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
deleted file mode 100644
index dba45bf5c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1600x1200.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=38
-ty=43
-tw=1529
-th=1013
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1600x1200.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=8
-text_y=1158
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=800
-text_y=1044
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=18
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1189 0 1200 #FFF596
-box silent 0 1189 1600 1200 #FFF596
-
-#rectangle around text window in verbose mode
-box  30 28 30 1057 #8C9096
-box  30 28 1568 28 #8C9096
-box  1568 28 1568 1057 #eef4ff
-box  30 1057 1568 1057 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
deleted file mode 100644
index cd0be97ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1600x768.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=38
-ty=27
-tw=1529
-th=648
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1600x768.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=8
-text_y=741
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=800
-text_y=668
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=13
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 761 0 768 #FFF596
-box silent 0 761 1600 768 #FFF596
-
-#rectangle around text window in verbose mode
-box  30 18 30 676 #8C9096
-box  30 18 1568 18 #8C9096
-box  1568 18 1568 676 #eef4ff
-box  30 676 1568 676 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
deleted file mode 100644
index 3ef33bb75..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1600x900.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=38
-ty=32
-tw=1529
-th=760
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1600x900.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=8
-text_y=869
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=800
-text_y=783
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=15
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 892 0 900 #FFF596
-box silent 0 892 1600 900 #FFF596
-
-#rectangle around text window in verbose mode
-box  30 21 30 793 #8C9096
-box  30 21 1568 21 #8C9096
-box  1568 21 1568 793 #eef4ff
-box  30 793 1568 793 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
deleted file mode 100644
index 92869ed68..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1680x1050.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=40
-ty=37
-tw=1605
-th=886
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1680x1050.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=8
-text_y=1014
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=840
-text_y=914
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=17
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1041 0 1050 #FFF596
-box silent 0 1041 1680 1050 #FFF596
-
-#rectangle around text window in verbose mode
-box  31 25 31 925 #8C9096
-box  31 25 1646 25 #8C9096
-box  1646 25 1646 925 #eef4ff
-box  31 925 1646 925 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
deleted file mode 100644
index da478e110..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1680x945.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=40
-ty=34
-tw=1605
-th=798
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1680x945.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=8
-text_y=912
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=840
-text_y=823
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=16
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 937 0 945 #FFF596
-box silent 0 937 1680 945 #FFF596
-
-#rectangle around text window in verbose mode
-box  31 22 31 833 #8C9096
-box  31 22 1646 22 #8C9096
-box  1646 22 1646 833 #eef4ff
-box  31 833 1646 833 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
deleted file mode 100644
index 82fe8f043..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1920x1080.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=46
-ty=39
-tw=1835
-th=912
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1920x1080.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=10
-text_y=1043
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=960
-text_y=940
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=17
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1070 0 1080 #FFF596
-box silent 0 1070 1920 1080 #FFF596
-
-#rectangle around text window in verbose mode
-box  36 26 36 952 #8C9096
-box  36 26 1882 26 #8C9096
-box  1882 26 1882 952 #eef4ff
-box  36 952 1882 952 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
deleted file mode 100644
index 14360c80b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-1920x1200.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=46
-ty=43
-tw=1835
-th=1013
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-1920x1200.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=10
-text_y=1158
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=960
-text_y=1044
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=18
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1189 0 1200 #FFF596
-box silent 0 1189 1920 1200 #FFF596
-
-#rectangle around text window in verbose mode
-box  36 28 36 1057 #8C9096
-box  36 28 1882 28 #8C9096
-box  1882 28 1882 1057 #eef4ff
-box  36 1057 1882 1057 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
deleted file mode 100644
index 9f76208e2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-2048x1152.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=49
-ty=41
-tw=1957
-th=972
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-2048x1152.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=10
-text_y=1112
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=1024
-text_y=1003
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=18
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1142 0 1152 #FFF596
-box silent 0 1142 2048 1152 #FFF596
-
-#rectangle around text window in verbose mode
-box  38 27 38 1015 #8C9096
-box  38 27 2007 27 #8C9096
-box  2007 27 2007 1015 #eef4ff
-box  38 1015 2007 1015 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
deleted file mode 100644
index ce1615dd7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-2560x1440.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=61
-ty=52
-tw=2446
-th=1216
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-2560x1440.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=13
-text_y=1390
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=1280
-text_y=1253
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=21
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1427 0 1440 #FFF596
-box silent 0 1427 2560 1440 #FFF596
-
-#rectangle around text window in verbose mode
-box  48 34 48 1269 #8C9096
-box  48 34 2509 34 #8C9096
-box  2509 34 2509 1269 #eef4ff
-box  48 1269 2509 1269 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
deleted file mode 100644
index 59bc8b619..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-2560x1600.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=61
-ty=57
-tw=2446
-th=1351
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-2560x1600.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=13
-text_y=1545
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=1280
-text_y=1393
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=23
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 1586 0 1600 #FFF596
-box silent 0 1586 2560 1600 #FFF596
-
-#rectangle around text window in verbose mode
-box  48 38 48 1410 #8C9096
-box  48 38 2509 38 #8C9096
-box  2509 38 2509 1410 #eef4ff
-box  48 1410 2509 1410 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
deleted file mode 100644
index 584da9398..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-640x480.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=15
-ty=17
-tw=611
-th=405
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-640x480.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=3
-text_y=463
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=320
-text_y=418
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=10
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 476 0 480 #FFF596
-box silent 0 476 640 480 #FFF596
-
-#rectangle around text window in verbose mode
-box  12 11 12 423 #8C9096
-box  12 11 627 11 #8C9096
-box  627 11 627 423 #eef4ff
-box  12 423 627 423 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
deleted file mode 100644
index 56516f05d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-800x480.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=19
-ty=17
-tw=764
-th=405
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-800x480.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=4
-text_y=463
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=400
-text_y=418
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=10
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 476 0 480 #FFF596
-box silent 0 476 800 480 #FFF596
-
-#rectangle around text window in verbose mode
-box  15 11 15 423 #8C9096
-box  15 11 784 11 #8C9096
-box  784 11 784 423 #eef4ff
-box  15 423 784 423 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
deleted file mode 100644
index c4be1fb23..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate
-# Full path to background image JPG/PNG
-# Image must has 240 colors, 16 need for fbcon.
-pic=/etc/splash/calculate/images/verbose-800x600.jpg
-
-# transparent background color from fbcon. Usually is 0.
-bgcolor=0
-
-# Coordinates text window
-#tx,ty - top left corner
-#tw,th - width and height of text window, cann't be more screen resolution
-tx=19
-ty=21
-tw=764
-th=506
-
-# Full path to background image JPG/PNG silend mode.
-# Image must has 256 colors.
-silentpic=/etc/splash/calculate/images/silent-800x600.jpg
-
-# Coords of system messages
-#?pkg(media-gfx/splashutils)<1.5.4.4-r2#
-text_x=4
-text_y=579
-#pkg#
-#?pkg(media-gfx/splashutils)>=1.5.4.4-r2#
-text_x=400
-text_y=522
-text_align middle middle
-#pkg#
-
-# system messages font size
-text_size=11
-
-# System messages color in format [0x|#]rrggbb, or [0x|#]rrggbbaa
-text_color=0xffffff
-
-# Path to TTF font, for system messages. Path may be:
-#- absolute (starts with '/')
-#- relative THEME_DIR (example /etc/splash)
-#- relative THEME_DIR/<theme_name> (example: /etc/splash/default)
-#text_font=<file>
-
-#progress bar for silent mode
-box silent inter 0 595 0 600 #FFF596
-box silent 0 595 800 600 #FFF596
-
-#rectangle around text window in verbose mode
-box  15 14 15 528 #8C9096
-box  15 14 784 14 #8C9096
-box  784 14 784 528 #eef4ff
-box  15 528 784 528 #eef4ff
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splashutils/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splashutils/conf.d/splash b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
deleted file mode 100644
index 504db9194..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=openrc
-SPLASH_VERBOSE_ON_ERRORS="no"
-#?pkg(media-gfx/splash-themes-calculate)>=14#
-SPLASH_THEME="calculate"
-_splash_theme="calculate"
-SPLASH_THEME_SHUTDOWN="calculate_shutdown"
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
deleted file mode 100644
index 7b69b16a9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=fonts
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
deleted file mode 100644
index 81e0eaaa3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=patch
-<reg>
-	&lt;alias binding="same"&gt;
-	  &lt;family&gt;Helvetica&lt;/family&gt;
-	  &lt;accept&gt;
-	  &lt;family&gt;Nimbus Sans L&lt;/family&gt;
-	  &lt;/accept&gt;
-	&lt;/alias&gt;
-</reg>
-<text>
-	&lt;alias binding="same"&gt;
-	  &lt;family&gt;Helvetica&lt;/family&gt;
-	  &lt;accept&gt;
-	  &lt;family&gt;Arial&lt;/family&gt;
-	  &lt;/accept&gt;
-	&lt;/alias&gt;
-</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
deleted file mode 100644
index f9dec448e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>Droid Sans Mono Slashed</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>Droid Sans Mono Slashed</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
deleted file mode 100644
index 4997c7d06..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>Droid Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Droid Sans</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
deleted file mode 100644
index 6e404f6ab..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>Droid Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>Droid Serif</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/90-synthetic.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/90-synthetic.conf
deleted file mode 100644
index b8d1e85e1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.avail/90-synthetic.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-<!-- 
- Artificial oblique for fonts without an italic or oblique version
- -->
- 
-	<match target="font">
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-		<!-- and disable embedded bitmaps for artificial oblique -->
-		<edit name="embeddedbitmap" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-<!--
- Synthetic emboldening for fonts that do not have bold face available
- -->
-
-	<match target="font">
-		<!-- check to see if the font is just regular -->
-		<test name="weight" compare="less_eq">
-			<const>medium</const>
-		</test>
-		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more">
-			<const>medium</const>
-		</test>
-		<!--
-		  set the embolden flag
-		  needed for applications using cairo, e.g. gucharmap, gedit, ...
-		-->
-		<edit name="embolden" mode="assign">
-			<bool>true</bool>
-		</edit>
-		<!--
-		 set weight to bold
-		 needed for applications using Xft directly, e.g. Firefox, ...
-		-->
-		<edit name="weight" mode="assign">
-			<const>bold</const>
-		</edit>
-	</match>
-</fontconfig>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/30-metric-aliases.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/30-metric-aliases.conf
deleted file mode 100644
index 8ff4e8f61..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/30-metric-aliases.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/fonts/conf.avail/30-metric-aliases.conf symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
deleted file mode 100644
index 083f0dd8b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/fonts/conf.avail/58-droid-sans-mono.conf symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
deleted file mode 100644
index 3c47012cd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/fonts/conf.avail/58-droid-sans.conf symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
deleted file mode 100644
index a97b8b282..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/fonts/conf.avail/58-droid-serif.conf symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/90-synthetic.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/90-synthetic.conf
deleted file mode 100644
index e32daa6aa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/fontconfig/conf.d/90-synthetic.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/fonts/conf.avail/90-synthetic.conf symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/libsdl/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/libsdl/.calculate_directory
deleted file mode 100644
index 654b35a6b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/libsdl/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/libsdl/99sdl b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/libsdl/99sdl
deleted file mode 100644
index b29bf6ae5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-libs/libsdl/99sdl
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=procmail
-SDL_AUDIODRIVER=alsa
-AUDIODEV=default
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/default/alsasound b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
deleted file mode 100644
index 7ee11e03e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/alsasound symbolic ini(runlevels.alsa-utils)!=on&&ini(runlevels.alsa-utils,on)==||grep(/var/lib/calculate/-runlevels-alsa-utils,/alsasound)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/pulseaudio/daemon.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
deleted file mode 100644
index 6d9bd67c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=postfix path=/etc/pulse
-
-resample-method = speex-float-3
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/kodi/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/kodi/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/kodi/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/kodi/xbmc.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/kodi/xbmc.desktop
deleted file mode 100644
index e5c86d201..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/kodi/xbmc.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/usr/share/xsessions
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/.calculate_directory
deleted file mode 100644
index 12621dcd7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/xbmc name=addons
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
deleted file mode 100644
index 778151f0f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate append=replace path=/etc/polkit-1/rules.d os_linux_shortname==CMC
-/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */
-
-// Restart in CMC by wheel group rules for polkit
-//
-
-polkit.addRule(function(action, subject) {
-    if ((action.id.indexOf("org.freedesktop.consolekit.system.stop") == 0 ||
-         action.id.indexOf("org.freedesktop.consolekit.system.restart") == 0 ) &&
-        subject.isInGroup("wheel")) {
-             return polkit.Result.YES;
-   }
-});
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
deleted file mode 100644
index d0a4ba2af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=remove
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
deleted file mode 100644
index d0a4ba2af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=remove
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
deleted file mode 100644
index d0a4ba2af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=remove
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
deleted file mode 100644
index d0a4ba2af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=remove
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
deleted file mode 100644
index 439d1911f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-Categories=Utility;Recorder;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/mplayer/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/mplayer/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/mplayer/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/mplayer/mplayer.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/mplayer/mplayer.conf
deleted file mode 100644
index 3d6819ee9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/mplayer/mplayer.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=samba path=/etc/mplayer autoupdate
-[default]
-#?pkg(media-fonts/droid)!=#
-font="Droid Sans"
-#pkg#
-#?pkg(media-fonts/droid)==#
-font="Verdana"
-#pkg#
-!ao=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
deleted file mode 100644
index 439d1911f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-Categories=Utility;Recorder;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/smtube/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/smtube/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/smtube/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/smtube/smtube.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/smtube/smtube.desktop
deleted file mode 100644
index 755d3a2d5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/media-video/smtube/smtube.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-Categories=Network;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/bind/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/bind/.calculate_directory
deleted file mode 100644
index 11e6379af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/bind/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&pkg(net-nds/openldap)!= path=/etc name=conf.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/bind/named b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/bind/named
deleted file mode 100644
index 477b2e376..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-dns/bind/named
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=openrc
-
-rc_after="ldap"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/ejabberd/.calculate_directory
deleted file mode 100644
index 11e6379af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/ejabberd/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&pkg(net-nds/openldap)!= path=/etc name=conf.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/ejabberd/ejabberd b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/ejabberd/ejabberd
deleted file mode 100644
index 477b2e376..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/ejabberd/ejabberd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=openrc
-
-rc_after="ldap"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/skype/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/skype/.calculate_directory
deleted file mode 100644
index 654b35a6b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/skype/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/skype/99skype b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/skype/99skype
deleted file mode 100644
index dbaf71624..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-im/skype/99skype
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=#
-# discard /opt/bin/skype, because prelink call segfault
-PRELINK_PATH_MASK=/opt/bin/skype
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/dhcp/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/dhcp/.calculate_directory
deleted file mode 100644
index 15fd4eef4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/dhcp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc merge()!=&&pkg()!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/dhcp/dhclient.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/dhcp/dhclient.conf
deleted file mode 100644
index 7c1f18d35..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/dhcp/dhclient.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=dhcp
-
-# передавать dhcp �ерверу hostname
-send host-name = pick-first-value(gethostname(), "ISC-dhclient");
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
deleted file mode 100644
index 607fa7fc8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications merge=x11-themes/hicolor-icon-theme,x11-themes/gnome-icon-theme
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
deleted file mode 100644
index 3978404bf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate mirror path=/usr/share/icons/gnome/128x128/apps name=modem-manager-gui.png link=/usr/share/pixmaps/modem-manager-gui.png
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
deleted file mode 100644
index e018423c4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate mirror path=/usr/share/icons/hicolor/128x128/apps name=modem-manager-gui.png link=/usr/share/pixmaps/modem-manager-gui.png
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
deleted file mode 100644
index eba1897b4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=samba path=/usr/share/applications
-[Desktop Entry]
-Icon=modem-manager-gui
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
deleted file mode 100644
index 18d86576c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service)!= path=/usr/share/dbus-1 name=system-services
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
deleted file mode 100644
index f7a663336..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[D-BUS Service]
-Exec=/usr/sbin/ModemManager --log-level=ERR
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/.calculate_directory
deleted file mode 100644
index 6105b4f64..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!=&&merge()!= path=/etc name=conf.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
deleted file mode 100644
index aa3303002..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate run=/bin/bash
-
-SOURCE=/usr/share/doc/netifrc-*/net.example.bz2
-DEST=/etc/conf.d/net.example
-[ -f $SOURCE ] && bzip2 -dc $SOURCE >$DEST
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/02_link_net.example b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/02_link_net.example
deleted file mode 100644
index d6dfe234a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/netifrc/02_link_net.example
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch name=net.example exists(/etc/conf.d/net.example)!=
-<reg>QUICK-START</reg>
-<text>QUICK-START</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/ssh_config b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
deleted file mode 100644
index 3631fe2f1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=squid
-SendEnv LANG LC_*
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/sshd_config b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
deleted file mode 100644
index 4acff0d85..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate format=squid
-DenyUsers guest
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
deleted file mode 100644
index b0e464ff1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=patch name=sshd_config
-<reg>\n.*[^"]PermitRootLogin.*</reg>
-<text></text>
-<reg>\nUsePAM</reg>
-<text>\nPermitRootLogin yes\nUsePAM</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/default/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/default/portmap b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/default/portmap
deleted file mode 100644
index dbeba8c52..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-nds/portmap/default/portmap
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/portmap symbolic ini(runlevels.portmap)!=on&&ini(runlevels.portmap,on)==||grep(/var/lib/calculate/-runlevels-portmap,/portmap)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/.calculate_directory
deleted file mode 100644
index 9b427bb79..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()>=1.4 name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/default/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/default/cupsd b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/default/cupsd
deleted file mode 100644
index ef316ffaa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/default/cupsd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/cupsd symbolic ini(runlevels.cups)!=on&&ini(runlevels.cups,on)==||grep(/var/lib/calculate/-runlevels-cups,/cupsd)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/ru.index/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/ru.index/.calculate_directory
deleted file mode 100644
index 2aafd3834..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/ru.index/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/cups/html name=ru append=remove pkg(net-print/cups)==1.6.2-r5
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/ru/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/ru/.calculate_directory
deleted file mode 100644
index ac78faf36..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-print/cups/ru/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/cups/templates append=remove pkg(net-print/cups)==1.6.2-r5
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0 b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
deleted file mode 100644
index 5161fb541..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=net.lo symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
deleted file mode 100644
index 6f34487cf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/udev
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
deleted file mode 100644
index 57653a115..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=patch
-<reg>(ACTION!="add", GOTO="madwimax_rules_end")
-
-(# detach buggy disk)</reg>
-<text>\1
-
-# modprobe tun for samsung wimax modem
-ATTRS{idVendor}=="04e8", ATTRS{idProduct}=="6761", ATTR{bInterfaceNumber}=="01", RUN+="/sbin/modprobe -q tun"
-
-\2</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/filesystems b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/filesystems
deleted file mode 100644
index 38516e854..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/filesystems
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=patch
-<reg>(# 'mount -t auto' command.
-#
-)
-</reg>
-<text>\1ntfs-3g
-
-</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/gentoo-release b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/gentoo-release
deleted file mode 100644
index 739cc33af..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/gentoo-release
+++ /dev/null
@@ -1,6 +0,0 @@
-#?os_install_linux_subname!=#
-#-os_install_linux_name-# #-os_install_linux_ver-# #-os_install_linux_subname-#
-#os_install_linux_subname#
-#?os_install_linux_subname==#
-#-os_install_linux_name-# #-os_install_linux_ver-#
-#os_install_linux_subname#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/issue b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/issue
deleted file mode 100644
index a13fc8170..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/issue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#?os_install_linux_subname!=#
-Welcome to \n.\O (#-os_install_linux_name-# #-os_install_linux_ver-# #-os_install_linux_subname-#)
-#os_install_linux_subname#
-#?os_install_linux_subname==#
-Welcome to \n.\O (#-os_install_linux_name-# #-os_install_linux_ver-#)
-#os_install_linux_subname#
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/os-release b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/os-release
deleted file mode 100644
index c622284a9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/os-release
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=procmail
-NAME=Calculate
-ID=calculate
-PRETTY_NAME="Calculate/Linux"
-ANSI_COLOR="1;32"
-HOME_URL="http://www.calculate-linux.org"
-SUPPORT_URL="http://www.calculate-linux.org/main/en/community"
-BUG_REPORT_URL="http://www.calculate-linux.org/projects/calculatelinux/issues"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/sysctl.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
deleted file mode 100644
index 7d3153fe8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=procmail
-# IssueID 848
-vm.dirty_background_ratio = 1
-vm.dirty_ratio = 3
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/.calculate_directory
deleted file mode 100644
index b4905d061..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&cl_chroot_status==on&&pkg()!= path=/etc name=runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/boot/calculate-builder b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/boot/calculate-builder
deleted file mode 100644
index 18454a6a4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/boot/calculate-builder
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/calculate-builder symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/calculate-builder.default.del b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/calculate-builder.default.del
deleted file mode 100644
index 8cfdfb88c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-builder/calculate-builder.default.del
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/runlevels/default name=calculate-builder
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index 4d56f2315..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/calculate name=profile.bashrc.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache
deleted file mode 100644
index fd6a676e9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache
+++ /dev/null
@@ -1,32 +0,0 @@
-# Calculate comment=# protected
-# vim: set syntax=sh
-#
-# Copyright 2015 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-
-update_cache() {
-	[[ -x /usr/libexec/calculate/cl-pkg-cache ]] &&
-		/usr/libexec/calculate/cl-pkg-cache
-}
-
-if [[ ${EBUILD_PHASE} == "setup" ]]
-then
-	if  tail -5 /var/log/emerge.log | grep -P "\(1 of.*${CATEGORY}/${P}" &>/dev/null
-	then
-		update_cache
-	fi
-fi
-
-if [[ ${EBUILD_PHASE} == "postrm" ]]
-then
-	if  tail -2 /var/log/emerge.log | grep "*** emerge " &>/dev/null
-	then
-		update_cache
-	fi
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages
deleted file mode 100644
index e5b82047b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate comment=# protected
-# vim: set syntax=sh
-#
-# Copyright 2014 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-if [[ ${CATEGORY}/${PN} == "sys-auth/nss_ldap" ]] && [[ ${EBUILD_PHASE} == "preinst" ]]
-then
-    mv ${D}/etc/ldap.conf ${D}/etc/ldap.conf.example &>/dev/null
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure
deleted file mode 100644
index cd0fa8ff0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate comment=# protected
-# vim: set syntax=sh
-#
-# Copyright 2014 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-
-check_skip() {
-	declare -A SKIPPKGS=( 
-	   ["calculate-install"]="1"
-	   ["calculate-lib"]="1"
-	   ["calculate-console"]="1"
-	   ["calculate-console-gui"]="1"
-	   ["calculate-core"]="1"
-	   ["calculate-desktop"]="1"
-	   ["calculate-client"]="1"
-	   ["calculate-update"]="1" )
-
-	[[ -z ${SKIPPKGS[$PN]} ]]
-}
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
deleted file mode 100644
index b9ee8727f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=# protected
-# vim: set syntax=sh
-#
-# Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-CL_CORE_PATCH=/usr/bin/cl-core-patch
-[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/sbin/cl-core-patch
-
-if [[ ${EBUILD_PHASE} == "compile" ]] && [[ -d ${S} ]] && check_skip; then
-	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-patch.list ]] ||
-		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-patch.list &>/dev/null
-	then
-		[ -f ${CL_CORE_PATCH} ] && ${CL_CORE_PATCH} --no-progress --pkg-version ${PVR} \
-			--pkg-slot ${SLOT} --pkg-category ${CATEGORY} \
-			--pkg-path ${S} --pkg-name ${PN} --verbose
-	fi
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
deleted file mode 100644
index 59ba13f92..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
+++ /dev/null
@@ -1,57 +0,0 @@
-# Calculate comment=# protected
-# vim: set syntax=sh
-#
-# Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-CL_UPDATE_PROG=/usr/sbin/cl-core
-CORE_METHOD="--method core_setup"
-
-
-post_setup_package() {
-	if [ -f ${CL_UPDATE_PROG} ] && [[ -f  /var/lib/calculate/-postmerge ]] && check_skip
-	then
-		OLDIFS=$IFS
-		IFS=/
-		while read category pkgname;do
-			[ -d /var/db/pkg/${category}/${pkgname}-* ] || continue
-			IFS=$OLDIFS
-			if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
-				grep ${category}/${pkgname} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
-			then
-				CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} ${CORE_METHOD} --no-progress --pkg-name $pkgname --pkg-category $category --pkg-path "/"
-			fi
-			IFS=/
-		done < <(sort /var/lib/calculate/-postmerge | uniq)
-		IFS=$OLDIFS
-	fi
-	rm -f /var/lib/calculate/-postmerge
-}
-
-fix_kernel_symlink() {
-	# restore kernel symlink to preferred by cl_install_kernel_build variable
-	local kernel_build=$(/usr/libexec/calculate/cl-variable --value install.cl_install_kernel_build 2>/dev/null)
-	if [[ $? -ne 1 ]] && [[ -n $kernel_build ]] && [[ -L /usr/src/linux ]]
-	then
-		[[ "$kernel_build" =~ ^[0-9]+\.[0-9]+$ ]] && kernel_build="${kernel_build}."
-		last_kernel="$(ls -1d /usr/src/linux-${kernel_build}* | sed 's/.*linux-//' | sort -V | tail -1)"
-		if [[ -n $last_kernel ]]
-		then
-			if [[ "$(readlink /usr/src/linux)" != "linux-${last_kernel}" ]]
-			then
-				rm /usr/src/linux
-				ln -sf linux-${last_kernel} /usr/src/linux
-			fi
-		fi
-	fi
-}
-
-post_pkg_postinst() {
-	[[ "$PN" == "calculate-sources" ]] && fix_kernel_symlink
-	post_setup_package
-}
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles
deleted file mode 100644
index 2a5cddf5f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles
+++ /dev/null
@@ -1,68 +0,0 @@
-# Calculate comment=# pkg(sys-apps/calculate-server)!=
-# vim: set syntax=sh
-#
-# Copyright 2014 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-# added for calculate server 2.2
-# FUNC: change_permissions
-# DESC: change permissions for all files and directories into specified
-change_permissions() {
-	local directory=$1
-	[[ -d $1 ]] || return
-	
-	addwrite ${directory}
-	# get owner from parent directory
-	local diruid=$(stat -c"%u" ${directory})
-	local dirgid=$(stat -c"%g" ${directory})
-	local dirowner="${diruid}:${dirgid}"
-	# get permissions from parent directory
-	local dirmode=0$(stat -c%a ${directory})
-	
-	# turnoff execute for all (permission for files in parent directory)
-	if type bc &>/dev/null;
-	then
-		local filemode=0$(echo "obase=8;$(( $dirmode & 0666 ))" | bc)
-	elif type printf &>/dev/null;
-	then
-		local filemode=$(printf "0%o" $(( $dirmode & 0666 )) )
-	else
-		local filemode=
-	fi
-	# set for all files and directories dirowner
-	find ${directory} \! -uid ${diruid} -o \! -gid ${dirgid} -exec chown ${dirowner} {} \;
-	# set permissions for all directories in parent directory
-	find ${directory} \! -perm ${dirmode} -type d -exec chmod ${dirmode} {} \;
-	if [[ -n $filemode ]]
-	then
-		# set permissions for all files in parent directory
-		find ${directory} \! -perm ${filemode} -type f -exec chmod ${filemode} {} \;
-	fi
-}
-
-# system has "remote" share
-if grep "\[remote\]" /etc/samba/smb.conf &>/dev/null
-then
-    pre_pkg_preinst() {
-        einfo "Performing permissions change for packages directory"
-        change_permissions ${PKGDIR}
-    }
-
-    post_src_unpack() {
-        einfo "Performing permissions change for distdir directory"
-        change_permissions ${PORTAGE_ACTUAL_DISTDIR}
-    }
-else
-    post_src_unpack() {
-        :
-    }
-
-    pre_pkg_preinst() {
-        :
-    }
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-protect b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-protect
deleted file mode 100644
index 32bff7f2a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-protect
+++ /dev/null
@@ -1,76 +0,0 @@
-# Calculate comment=# pkg(sys-apps/calculate-server)!=
-# vim: set syntax=sh
-#
-# Copyright 2016 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-# added for calculate server 2.2
-# FUNC: protect_server_files
-# DESC: protect server changed files from rewrite
-
-protect_server_files() {
-    local protected_files=(
-        "${D}/etc/bind/named.conf"
-        "${D}/etc/conf.d/sortmilter"
-        "${D}/etc/dhcp/dhcpd.conf"
-        "${D}/etc/dhcp/dhcp.ldap"
-        "${D}/etc/dovecot/conf.d/10-auth.conf"
-        "${D}/etc/dovecot/conf.d/10-logging.conf"
-        "${D}/etc/dovecot/conf.d/10-mail.conf"
-        "${D}/etc/dovecot/conf.d/10-master.conf"
-        "${D}/etc/dovecot/conf.d/auth-ldap.conf.ext"
-        "${D}/etc/dovecot/conf.d/auth-system.conf.ext"
-        "${D}/etc/dovecot/dovecot.conf"
-        "${D}/etc/dovecot/dovecot-ldap.conf"
-        "${D}/etc/jabber/ejabberd.cfg"
-        "${D}/etc/jabber/ejabberd.yml"
-        "${D}/etc/openldap/schema/dnszone.schema"
-        "${D}/etc/openldap/schema/mail.schema"
-        "${D}/etc/openldap/slapd.conf"
-        "${D}/etc/postfix/ldap-aliases.cf"
-        "${D}/etc/postfix/ldap-aliases-gr.cf"
-        "${D}/etc/postfix/ldap-aliases-repl.cf"
-        "${D}/etc/postfix/ldap-recipient.cf"
-        "${D}/etc/postfix/ldap-recipient-gr.cf"
-        "${D}/etc/postfix/ldap-recipient-repl.cf"
-        "${D}/etc/postfix/main.cf"
-        "${D}/etc/procmailrc"
-        "${D}/etc/proftpd/proftpd.conf"
-        "${D}/etc/samba/smb.conf"
-        "${D}/etc/squid/squid.conf"
-        "${D}/etc/squid/squid.ldap"
-    )
-    local packages=(
-        "net-ftp/proftpd"
-        "net-fs/samba"
-        "net-mail/dovecot"
-        "net-misc/dhcp"
-        "net-dns/bind"
-        "mail-filter/procmail"
-        "net-im/ejabberd"
-        "mail-mta/postfix"
-        "net-nds/openldap"
-        "net-proxy/squid"
-    )
-    local install_pkg="${CATEGORY}/${PN}"
-    for pkg in ${packages[@]}
-    do
-        if [[ $pkg == $install_pkg ]]
-        then
-            for fn in ${protected_files[@]}
-            do
-                [[ -f $fn ]] && mv -- "$fn" "${fn}.origin"
-            done
-            break
-        fi
-    done
-}
-
-post_pkg_preinst() {
-    protect_server_files
-}
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
deleted file mode 100644
index 91b7f335a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
+++ /dev/null
@@ -1,103 +0,0 @@
-# Calculate comment=# protected
-# vim: set syntax=sh
-
-# Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-CL_UPDATE_PROG="/usr/sbin/cl-core"
-CORE_METHOD="--method core_setup"
-[[ -d /var/lib/calculate ]] || mkdir /var/lib/calculate
-
-clear_systemd() {
-	local contents_fn="/var/db/pkg/${CATEGORY}/${PF}/CONTENTS"
-	cat $contents_fn | grep -e ^obj -e ^sym  | grep -e /usr/lib/systemd -e /etc/systemd | awk '{print $2}' |
-	while read fn
-	do
-		rm -f "$fn"
-	done
-	cat $contents_fn | grep ^dir  | grep -e /usr/lib/systemd -e /etc/systemd | awk '{print $2}'  | sort -r |
-	while read dn
-	do
-		[[ -d "$dn" ]] && [[ $(ls -A "$dn" | wc -l) -eq 0 ]] && rmdir "$dn"
-	done
-	sed -i '/ \/usr\/lib\/systemd/d' $contents_fn
-	sed -i '/ \/etc\/systemd/d' $contents_fn
-}
-
-# setup package and create postmerge package list
-setup_merge_package() {
-	rm -f /var/lib/calculate/-postmerge
-	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
-		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
-	then
-		[ -f ${CL_UPDATE_PROG} ] && check_skip && CTARGET=${CTARGET} GCC_CONFIG_VER=${GCC_CONFIG_VER} ${CL_UPDATE_PROG} ${CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path "/" --pkg-name ${PN}
-	fi
-	rm -f /var/lib/calculate/-runlevels-$PN
-
-	ls /var/db/pkg/sys-apps | grep -q systemd- || clear_systemd
-}
-
-# remove mark: package updating
-clean_update_mark() {
-	rm -f /var/lib/calculate/-merge-$PN-*
-}
-
-# remove contents file which need for cl-core-setup
-clean_contents_mark() {
-	rm -f /var/lib/calculate/-CONTENTS-*
-}
-
-# mark: package updating
-mark_update_package() {
-	touch "/var/lib/calculate/-merge-$PN--${SLOT/\//_}-$PPID"
-}
-
-# save services runlevels
-save_runlevels() {
-	find /etc/runlevels/{default,boot,sysinit,shutdown} >/var/lib/calculate/-runlevels-$PN
-}
-
-# dispatching unmerge or update package
-pkg_postrm_dispatch() {
-	if [[ ! -f /var/lib/calculate/-merge-$PN--${SLOT/\//_}-$PPID ]]
-	then
-		pkg_postrm_unmerge
-	else
-		pkg_postrm_update
-	fi
-}
-
-# setup package umerging
-pkg_postrm_unmerge() {
-	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-setup.list ]] ||
-		grep ${CATEGORY}/${PN} /var/lib/calculate/calculate-core/cache/merge-setup.list &>/dev/null
-	then
-		[ -f ${CL_UPDATE_PROG} ] && check_skip && ${CL_UPDATE_PROG} ${CORE_METHOD} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path / --pkg-name ${PN}
-	fi
-}
-
-# save contents file for correct package updating by cl-core-setup
-pkg_postrm_update() {
-	cp /var/db/pkg/${CATEGORY}/${PF}/CONTENTS /var/lib/calculate/-CONTENTS-$PN
-}
-
-pre_pkg_postrm() {
-	pkg_postrm_dispatch
-	clean_update_mark
-}
-
-pre_pkg_postinst() {
-	setup_merge_package
-	clean_contents_mark
-	clean_update_mark
-}
-
-pre_pkg_preinst() {
-	mark_update_package
-	save_runlevels
-}
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6
deleted file mode 100644
index 9963c6bb4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6
+++ /dev/null
@@ -1,37 +0,0 @@
-# Calculate comment=#
-# vim: set syntax=sh
-#
-# Copyright 2014 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-
-if [[ ${CATEGORY}/${PN} == "sys-libs/db" ]]
-then
-fix_libdb_6() {
-	if [[ -f /usr/include/db4.8/db.h ]] &&
-	   [[ -f /usr/include/db4.8/db_185.h ]] &&
-	   [[ -f /usr/lib/libdb-4.8.so ]]
-	then
-		ln -sf db4.8/db.h /usr/include/db.h
-		ln -sf db4.8/db_185.h /usr/include/db_185.h
-		ln -sf libdb-4.8.so /usr/lib/libdb.so
-	fi
-}
-post_pkg_postrm() {
-	if [[ $PV == '0_rc73' ]]
-	then
-		fix_libdb_6
-	fi
-}
-
-post_pkg_postinst() {
-	if [[ $SLOT == "4.8" ]] && [[ -d /var/db/pkg/sys-libs/db-0_rc73 ]]
-	then
-		fix_libdb_6
-	fi
-}
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/calculate-core-default b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/calculate-core-default
deleted file mode 100644
index 713a17ac6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/calculate-core-default
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/calculate-core path=/etc/runlevels/default name=calculate-core symbolic ini(runlevels.calculate-utils/calculate-core)!=on&&ini(runlevels.calculate-utils/calculate-core,on)==&&pkg(x11-base/xorg-server)!=||grep(/var/lib/calculate/-runlevels-calculate-utils,/calculate-core)!=&&pkg(x11-base/xorg-server)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
deleted file mode 100644
index 6ed27f12d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/lib/calculate
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
deleted file mode 100644
index df3dec502..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate format=diff pkg(sys-apps/calculate-utils)<3.4.1
-Поддержка названи� gentoo дл� /usr/portage
-
---- /usr/lib/python2.7/site-packages/calculate/builder/builder.py
-+++ /usr/lib/python2.7/site-packages/calculate/builder/builder.py
-@@ -149,7 +149,7 @@ class Builder(Update):
-                         self.clVars.Get('update.cl_update_layman_make'),
-                         self.clVars.Get('update.cl_update_layman_conf'),
-                         prefix=self.clVars.Get('cl_builder_path'))
--        if repname != "portage":
-+        if repname not in ("portage", "gentoo"):
-             layman.remove(repname, rpath_orig)
-             removeDir(rpath)
-         return True
---- /usr/lib/python2.7/site-packages/calculate/update/update.py
-+++ /usr/lib/python2.7/site-packages/calculate/update/update.py
-@@ -293,7 +293,7 @@ class Update(object):
-                                 dv.Get('cl_update_layman_make'),
-                                 dv.Get('cl_update_layman_conf'),
-                                 prefix=chroot_path)
--                if repname != "portage":
-+                if repname not in ("portage", "gentoo"):
-                     layman.add(repname, url, rpath_orig)
-                 if not self._syncRepository(repname, url, rpath, revision,
-                                      cb_progress=self.setProgress):
-@@ -328,7 +328,7 @@ class Update(object):
-                         dv.Get('cl_update_layman_make'),
-                         dv.Get('cl_update_layman_conf'),
-                         prefix=chroot_path)
--        if repname != "portage":
-+        if repname not in ("portage", "gentoo"):
-             # TODO: debug block
-             #print "EEEE",repname, url, rpath_orig
-             layman.add(repname, url, rpath_orig)
-@@ -340,7 +340,7 @@ class Update(object):
-         """
-         Спр�тать к�ш
-         """
--        if name in ("portage",):
-+        if name in ("portage", "gentoo"):
-             return
-         if not name in OverlayOwnCache(self.clVars):
-             for cachename in self.metadata_cache_names:
-@@ -360,7 +360,7 @@ class Update(object):
-         """
-         Извлеч к�ш
-         """
--        if name in ("portage",):
-+        if name in ("portage", "gentoo"):
-             return
-         cachenames = self.metadata_cache_names
-         if not name in OverlayOwnCache(self.clVars):
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
deleted file mode 100644
index 9b704112e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-# Calculate format=diff pkg(sys-apps/calculate-utils)<=3.4.5.27&&pkg(sys-apps/calculate-utils)>3.4.1
-Поддержка названи� gentoo дл� /usr/portage
-
---- /usr/lib/python2.7/site-packages/calculate/builder/builder.py
-+++ /usr/lib/python2.7/site-packages/calculate/builder/builder.py
-@@ -162,7 +162,7 @@ class Builder(Update):
-                         self.clVars.Get('update.cl_update_layman_make'),
-                         self.clVars.Get('update.cl_update_layman_conf'),
-                         prefix=self.clVars.Get('cl_builder_path'))
--        if repname != "portage":
-+        if repname not in ("gentoo", "portage"):
-             layman.remove(repname, rpath_orig)
-             removeDir(rpath)
-         return True
---- /usr/lib/python2.7/site-packages/calculate/update/update.py
-+++ /usr/lib/python2.7/site-packages/calculate/update/update.py
-@@ -328,7 +328,7 @@ class Update(MethodsInterface):
-                                     dv.Get('cl_update_layman_make'),
-                                     dv.Get('cl_update_layman_conf'),
-                                     prefix=chroot_path)
--                    if repname != "portage":
-+                    if repname not in ("portage", "gentoo"):
-                         layman.add(repname, url, rpath_orig)
-                     if not self._syncRepository(repname, url, rpath, revision,
-                                                 cb_progress=self.setProgress,
-@@ -367,7 +367,7 @@ class Update(MethodsInterface):
-                             dv.Get('cl_update_layman_make'),
-                             dv.Get('cl_update_layman_conf'),
-                             prefix=chroot_path)
--            if repname != "portage":
-+            if repname not in ("portage", "gentoo"):
-                 layman.add(repname, url, rpath_orig)
-         finally:
-             mtime.restore()
-@@ -379,7 +379,7 @@ class Update(MethodsInterface):
-         """
-         Спр�тать к�ш
-         """
--        if name in ("portage",):
-+        if name in ("portage", "gentoo"):
-             return
-         if not name in OverlayOwnCache(self.clVars):
-             for cachename in self.metadata_cache_names:
-@@ -399,7 +399,7 @@ class Update(MethodsInterface):
-         """
-         Извлеч к�ш
-         """
--        if name in ("portage",):
-+        if name in ("portage", "gentoo"):
-             return
-         cachenames = self.metadata_cache_names
-         if not name in OverlayOwnCache(self.clVars):
-diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py
-index 35bd04a..e40a112 100644
---- /usr/lib/python2.7/site-packages/calculate/update/variables/update.py
-+++ /usr/lib/python2.7/site-packages/calculate/update/variables/update.py
-@@ -470,7 +470,8 @@ class VariableClUpdateSyncOverlayRep(ReadonlyVariable):
-     type = "list"
- 
-     def get(self):
--        return filter(lambda x: x != "portage", self.Get('cl_update_sync_rep'))
-+        return filter(lambda x: x not in ("portage", "gentoo"),
-+               self.Get('cl_update_sync_rep'))
- 
- 
- class VariableClUpdateOutdateSet(ReadonlyVariable):
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
deleted file mode 100644
index 3ae42169e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off
-
-/usr/sbin/cl-core --create-symlink &>/dev/null
-true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/boot/dbus b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/boot/dbus
deleted file mode 100644
index 74fc216bb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/boot/dbus
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/dbus symbolic ini(runlevels.dbus)!=on&&ini(runlevels.dbus,on)==||grep(/var/lib/calculate/-runlevels-dbus,/dbus)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/default/dbus.del b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/default/dbus.del
deleted file mode 100644
index 2f1432069..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/dbus/default/dbus.del
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=dbus
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/hdparm/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
deleted file mode 100644
index 5be3d72cd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=conf.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/hdparm/hdparm b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/hdparm/hdparm
deleted file mode 100644
index 6f756948d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/hdparm/hdparm
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=openrc
-
-pata_all_args="-d1 -X69 -c1"
-sata_all_args=""
-all_args=""
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
deleted file mode 100644
index fe2a1607f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=grub.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
deleted file mode 100644
index 13858ede0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/bin/sh
-exec tail -n +3 $0
-
-menuentry "memtest86+ 4.20" {
-	linux16 /boot/memtest86plus/memtest
-}
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
deleted file mode 100644
index e5f23f42e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels name=boot
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
deleted file mode 100644
index c4ebbe9ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/consolefont symbolic ini(runlevels.openrc/consolefont)!=on&&ini(runlevels.openrc/consolefont,on)==||grep(/var/lib/calculate/-runlevels-openrc,/consolefont)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
deleted file mode 100644
index 0f839249c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/lib/rc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
deleted file mode 100644
index 6c724db14..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calclulate path=/etc name=conf.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/conf.d/hostname b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
deleted file mode 100644
index 131634106..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=openrc
-
-rc_before="net.lo"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/consolefont b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/consolefont
deleted file mode 100644
index 9295f8ee3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/consolefont
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=openrc path=/etc/conf.d
-
-consolefont="ter-v18n"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/init.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/init.sh
deleted file mode 100644
index 3edd736fb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/init.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=patch merge(sys-apps/openrc)!=&&pkg(sys-apps/openrc)!= path=/lib/rc/sh name=init.sh
-<reg>(cp -p "\$RC_LIBEXECDIR"/cache/\* "\$RC_SVCDIR" 2&gt;/dev/null
-fi
-)(
-echo sysinit &gt;"\$RC_SVCDIR"/softlevel
-exit)</reg>
-<text>\1
-rc-update -u
-\2</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/killprocs b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/killprocs
deleted file mode 100644
index 815b57e1c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/killprocs
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate comment=# path=/etc/conf.d
-# If you wish to pass any options to killall5 during shutdown,
-# you should do so here.
-killall5_opts=""
-
-#?pkg(media-gfx/splashutils)!=#
-if pgrep -f fbsplashd &>/dev/null
-then
-    killall5_opts="${killall5_opts} -o $(pgrep -f fbsplashd)"
-fi
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/modules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/modules
deleted file mode 100644
index 9cc3154eb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/modules
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate comment=# path=/etc/conf.d
-
-# autoload modules from /etc/modules-load.d/*.conf files
-if ls /etc/modules-load.d/*.conf &>/dev/null;then
-	for f in /etc/modules-load.d/*.conf;do
-		[ -d "${f}" ] && continue
-		modules="${modules} $(/bin/sed -re 's/\s*([#;].*$)?//' -e 's/^(\S+)\s.*/\1/' -e '/^$/d' "${f}")" || :
-	done
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/mtab b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/mtab
deleted file mode 100644
index c2369694c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/mtab
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/proc/self/mounts symbolic pkg(sys-apps/openrc)>=0.16 protected
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/rc.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/rc.conf
deleted file mode 100644
index c9a476de1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/rc.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=openrc
-#able to press the I key during boot so you can choose to start specific services
-#?pkg(sys-boot/plymouth)==#
-rc_interactive="YES"
-#pkg#
-#?pkg(sys-boot/plymouth)!=#
-rc_interactive="NO"
-#pkg#
-#use all net.* for network atapters (need for CDS)
-rc_hotplug="*"
-#nothing special type
-rc_sys=""
-rc_parallel="YES"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/runlevels.mtab b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
deleted file mode 100644
index d46fea1ec..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/runlevels/boot name=mtab pkg(sys-apps/openrc)>=0.16
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
deleted file mode 100644
index 302252ee3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-apps/portage)>=2.2.14&&pkg(sys-apps/portage)<2.2.18 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
deleted file mode 100644
index ed2020ac4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate path=/usr/lib/python2.7/site-packages/_emerge format=patch
-<reg>(self._dynamic_config._scheduler_graph = scheduler_graph
-\s+raise self._unknown_internal_error\(\)
-\s*
-)(\s+)(return retlist, scheduler_graph
-\s*
-\s+def _show_circular_deps\(self, mygraph\):)</reg>
-<text>\1\2# pull calculate package at tail
-\2retlist = sorted(retlist,
-\2\tkey=lambda x:(1 if u"calculate" in x.cp else 0,
-\2\tretlist.index(x)))
-\2\3</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/main.py b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
deleted file mode 100644
index 3bb6971f6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate multiline path=/usr/lib/python2.7/site-packages/_emerge format=patch
-<reg>locale[.]setlocale.*$</reg>
-<text>pass</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
deleted file mode 100644
index e49f573c7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-apps/portage)>=2.2.18 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
deleted file mode 100644
index aaab54176..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate path=/usr/lib/python2.7/site-packages/portage/dbapi format=patch
-<reg>_unicode\(e</reg>
-<text>_unicode(str(e)</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
deleted file mode 100644
index 535ae77e6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-apps/portage)>=2.2.0_alpha190 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
deleted file mode 100644
index f69ecc229..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/usr/share/portage/config name=repos.conf
-
-[gentoo]
-sync-type = git
-sync-uri = git://git.calculate-linux.org/repo/gentoo.git
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
deleted file mode 100644
index 661acc679..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate format=samba path=/etc/portage/repos.conf name=gentoo.conf link=/usr/share/portage/config/repos.conf mirror force
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/depgraph.py b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/depgraph.py
deleted file mode 100644
index 6bdbd8e90..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/depgraph.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate path=/usr/lib/portage/pym/_emerge pkg(sys-apps/portage)<2.2.14 format=patch
-<reg>(self._dynamic_config._scheduler_graph = scheduler_graph
-\s+raise self._unknown_internal_error\(\)
-\s*
-)(\s+)(return retlist, scheduler_graph
-\s*
-\s+def _show_circular_deps\(self, mygraph\):)</reg>
-<text>\1\2# pull calculate package at tail
-\2retlist = sorted(retlist,
-\2\tkey=lambda x:(1 if u"calculate" in x.cp else 0,
-\2\tretlist.index(x)))
-\2\3</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/make.conf.base b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/make.conf.base
deleted file mode 100644
index e94172479..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/portage/make.conf.base
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate comment=# protected path=/etc/portage/make.conf name=0-base
-#?os_install_locale_language!=ru#
-# Connecting overlays layman. You should not change this setting, as this may
-# disrupt the package manager.
-#os_install_locale_language#
-#?os_install_locale_language==ru#
-# Подключение оверлеев в layman. Вы не должны измен�ть �тот параметр, т.к.
-# �то может нарушить работу пакетного менеджера.
-#os_install_locale_language#
-source /var/lib/layman/make.conf
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sandbox/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
deleted file mode 100644
index 249fe6206..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/applications append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/shadow/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/shadow/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/shadow/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/shadow/login.defs b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/shadow/login.defs
deleted file mode 100644
index 66f7b6c5f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/shadow/login.defs
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate comment=# format=patch path=/etc
-<reg>
-ENV_SUPATH\tPATH=/sbin:/bin:/usr/sbin:/usr/bin
-</reg>
-<text>
-ENV_SUPATH\tPATH=/usr/sbin:/usr/bin:/sbin:/bin
-</text>
-<reg>
-ENV_PATH\tPATH=/bin:/usr/bin
-</reg>
-<text>
-ENV_PATH\tPATH=/usr/bin:/bin
-</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
deleted file mode 100644
index 56a260cb1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-apps/sysvinit)!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab
deleted file mode 100644
index b9544a1e0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate comment=# format=patch
-<reg>(si::sysinit:/sbin/(?:open)?rc sysinit
-)
-(# Further system initialization, brings up the boot runlevel.)
-([\s\S]+?)
-([^\n]+tty2 linux[\s\S]+tty6 linux)</reg>
-<text>\1
-# TERMINALS
-\4
-
-\2
-\3</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/boot/consolekit b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
deleted file mode 100644
index b6da82965..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/consolekit symbolic ini(runlevels.consolekit)!=on&&ini(runlevels.consolekit,on)==||grep(/var/lib/calculate/-runlevels-consolekit,/consolekit)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/consolekit b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/consolekit
deleted file mode 100644
index d05ee5933..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/consolekit/consolekit
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=patch path=/etc/init.d
-<reg>(start-stop-daemon --start -q \\
-\s*--pidfile /var/run/ConsoleKit/pid \\
-\s*--exec /usr/sbin/console-kit-daemon --\s*)(
-\s*eend)\s+\$\?</reg>
-<text>\1
-	res=$?
-	for waiting in {0..24}
-	do
-		[[ -f /var/run/ConsoleKit/pid ]] &amp;&amp; break
-		sleep 0.1
-	done
-\2 $res</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/.calculate_directory
deleted file mode 100644
index 8e56a4caf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=pam.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/su b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/su
deleted file mode 100644
index bba6bd36e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/su
+++ /dev/null
@@ -1,36 +0,0 @@
-# Calculate comment=#
-#%PAM-1.0
-
-auth       sufficient   pam_rootok.so
-
-# If you want to restrict users begin allowed to su even more,
-# create /etc/security/suauth.allow (or to that matter) that is only
-# writable by root, and add users that are allowed to su to that
-# file, one per line.
-#auth       required     pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
-
-# Uncomment this to allow users in the wheel group to su without
-# entering a passwd.
-#auth       sufficient   pam_wheel.so use_uid trust
-
-# Alternatively to above, you can implement a list of users that do
-# not need to supply a passwd with a list.
-#auth       sufficient   pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
-
-# Comment this to allow any user, even those not in the 'wheel'
-# group to su
-auth       required     pam_wheel.so use_uid
-
-auth       include      system-auth
-
-account    include      system-auth
-
-password   include      system-auth
-
-session    include      system-auth
-session    required     pam_env.so
-session    optional     pam_xauth.so
-# need for xautologin
-#?pkg(sys-auth/consolekit)!=#
-session    optional     pam_ck_connector.so nox11
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/system-auth b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/system-auth
deleted file mode 100644
index e77327c4e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/system-auth
+++ /dev/null
@@ -1,51 +0,0 @@
-# Calculate chmod=0644 chown=root:root comment=#
-auth       required     pam_env.so
-#?pkg(sys-auth/pam_client)!=&&pkg(sys-apps/calculate-utils[client])!=&&pkg(sys-apps/calculate-server)==#
-auth       [success=3 new_authtok_reqd=done default=ignore]   pam_unix.so try_first_pass
-auth       requisite    pam_client.so
-auth       [success=1 new_authtok_reqd=done default=ignore]   pam_ldap.so use_first_pass
-auth       requisite     pam_deny.so
-auth       required     pam_permit.so
-#pkg#
-#?pkg(sys-apps/calculate-server)!=#
-auth       [success=2 new_authtok_reqd=done default=ignore]   pam_unix.so try_first_pass
-auth       [success=1 new_authtok_reqd=done default=ignore]   pam_ldap.so use_first_pass
-auth       requisite    pam_deny.so
-auth       required     pam_permit.so
-#pkg#
-#?pkg(sys-auth/pam_client)==&&pkg(sys-apps/calculate-server)==||pkg(sys-apps/calculate-utils[client])==&&pkg(sys-apps/calculate-server)==#
-auth       required     pam_unix.so try_first_pass
-#pkg#
-#?pkg(sys-auth/pam_keystore)!=#
-auth       optional     pam_keystore.so use_first_pass
-#pkg#
-#?pkg(sys-fs/ecryptfs-utils)!=#
-auth       optional     pam_ecryptfs.so unwrap
-#pkg#
-
-account    required     pam_unix.so
-#?pkg(sys-auth/pam_client)!=&&pkg(sys-apps/calculate-utils[client])!=||pkg(sys-apps/calculate-server)!=#
-account    sufficient   pam_ldap.so
-#pkg#
-
-password   required     pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-password   sufficient   pam_unix.so nullok sha256 shadow use_authtok
-#?pkg(sys-fs/ecryptfs-utils)!=#
-password   optional     pam_ecryptfs.so
-#pkg#
-#?pkg(sys-auth/pam_client)!=&&pkg(sys-apps/calculate-utils[client])!=||pkg(sys-apps/calculate-server)!=#
-password   sufficient   pam_ldap.so
-#pkg#
-password   required     pam_deny.so
-
-session    required     pam_limits.so
-session    required     pam_unix.so
-#?pkg(sys-fs/ecryptfs-utils)!=#
-session    optional     pam_ecryptfs.so unwrap
-#pkg#
-#?pkg(sys-auth/pam_client)!=&&pkg(sys-apps/calculate-utils[client])!=||pkg(sys-apps/calculate-server)!=#
-session    optional     pam_ldap.so
-#pkg#
-#?pkg(sys-apps/systemd)!=#
-session    optional     pam_systemd.so
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/system-login b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/system-login
deleted file mode 100644
index 9c53c4bf5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-auth/pambase/system-login
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calculate comment=#
-
-auth		required	pam_tally.so file=/var/log/faillog onerr=succeed 
-auth		required	pam_nologin.so 
-auth		substack	system-auth
-auth		required	pam_shells.so 
-
-account		required	pam_access.so 
-account		required	pam_nologin.so 
-account		include	system-auth
-account		required	pam_tally.so file=/var/log/faillog onerr=succeed 
- 
-password	include		system-auth
- 
-session		required	pam_env.so 
-session		include		system-auth
-#session	optional	pam_motd.so motd=/etc/motd
-session		optional	pam_mail.so
-#?pkg(sys-auth/pam_update)!=#
-session		optional	pam_update.so
-#pkg#
-#?pkg(sys-auth/consolekit)!=#
-session		optional	pam_ck_connector.so nox11
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/.calculate_directory
deleted file mode 100644
index 1993aee72..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-boot/grub:2)!= path=/boot name=grub
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/00_header b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/00_header
deleted file mode 100644
index 7a5fcd7fb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/00_header
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate comment=# format=patch autoupdate path=/etc/grub.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/10_linux b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/10_linux
deleted file mode 100644
index 8011438e4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/10_linux
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=# multiline format=patch autoupdate path=/etc/grub.d
-<reg>(replacement_title=.*?Advanced options.*?)g'\)"</reg>
-<text>\1g') ..."</text>
-<reg>("submenu '.*?Advanced options for.*?grub_quote\))'</reg>
-<text>\1 ...'</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/30_os-prober b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/30_os-prober
deleted file mode 100644
index 8011438e4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/30_os-prober
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=# multiline format=patch autoupdate path=/etc/grub.d
-<reg>(replacement_title=.*?Advanced options.*?)g'\)"</reg>
-<text>\1g') ..."</text>
-<reg>("submenu '.*?Advanced options for.*?grub_quote\))'</reg>
-<text>\1 ...'</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/default.grub b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/default.grub
deleted file mode 100644
index b93f4745c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/grub/default.grub
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub
-GRUB_DISABLE_RECOVERY=true
-GRUB_DEFAULT=saved
-GRUB_TIMEOUT=2
-!GRUB_TERMINAL=del
-GRUB_GFXMODE="1024x768"
-GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
-GRUB_COLOR_NORMAL="white/black" 
-GRUB_COLOR_HIGHLIGHT="magenta/black"
-!GRUB_VIDEO_BACKEND=del
-#?pkg(sys-boot/grub)>=2.02_beta2#
-GRUB_GFXPAYLOAD_LINUX=keep
-#pkg#
-GRUB_FONT="/usr/share/grub/unicode.pf2"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/plymouth/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/plymouth/.calculate_directory
deleted file mode 100644
index 4cf5ff322..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/plymouth/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=plymouth
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/plymouth/plymouthd.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/plymouth/plymouthd.conf
deleted file mode 100644
index 405f64757..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-boot/plymouth/plymouthd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate
-[Daemon]
-#?pkg(media-gfx/plymouth-themes-calculate)!=#
-Theme=calculate
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)==#
-Theme=spinner
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/gcc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/gcc/.calculate_directory
deleted file mode 100644
index 478efe276..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/gcc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=4 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/gcc/gcc_default_set b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/gcc/gcc_default_set
deleted file mode 100644
index fa9f92ed2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/gcc/gcc_default_set
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate exec=/bin/bash cl_ebuild_phase!=
-
-# autoswitch to new gcc
-echo "The current gcc config will be automatically switch to the newly"
-echo "installed gcc version ${GCC_CONFIG_VER}"
-gcc-config ${CTARGET}-${GCC_CONFIG_VER} &>/dev/null
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/prelink/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/prelink/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/prelink/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
deleted file mode 100644
index 14ebfe5f6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# format=patch
-<reg>\n(\[ -n "\$\(find `ldd /sbin/init .*/sbin/telinit u)</reg>
-<text>\n#\1</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/.calculate_directory
deleted file mode 100644
index 390da254a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=modprobe.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
deleted file mode 100644
index d30136395..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=patch path=/lib/udev/rules.d
-<reg>(# probe filesystem metadata of disks)
-(KERNEL!="sr\*", IMPORT\{builtin\}="blkid")</reg>
-<text>\1
-KERNEL!="sr*", ATTRS{size}=="0", ATTRS{removable}=="1", GOTO="skip_blkid"
-\2
-LABEL="skip_blkid"</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
deleted file mode 100644
index c0ed56eb2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch path=/lib/udev/rules.d
-<reg>(KERNEL!=")(eth\*)</reg>
-<text>\1en*|wl*|sl*|ww*|\2</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
deleted file mode 100644
index 877949483..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/lib/udev/rules.d append=remove cl_ver>=3.3.2.5
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
deleted file mode 100644
index 877949483..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/lib/udev/rules.d append=remove cl_ver>=3.3.2.5
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
deleted file mode 100644
index ea24a0719..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate append=replace comment=#
-
-# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded
-blacklist usblp
-
-# You probably want this to not get the console beep loud on every tab :)
-blacklist pcspkr
-
-# Not using kernel video drivers
-blacklist amdgpu
-blacklist i915
-blacklist nouveau
-blacklist nvidia
-blacklist radeon
-blacklist uvesafb
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/write_net_rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/write_net_rules
deleted file mode 100644
index 54e1539ab..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/eudev/write_net_rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch multiline path=/lib/udev
-<reg>^match="\$match, KERNEL==.*$\n</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/fuse/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/fuse/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/fuse/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/fuse/fuse b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/fuse/fuse
deleted file mode 100644
index 281c7cfeb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/fuse/fuse
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/fuse symbolic path=/etc/runlevels/default os_install_linux_system==desktop&&ini(runlevels.fuse)!=on&&ini(runlevels.fuse,on)==||grep(/var/lib/calculate/-runlevels-fuse,/fuse)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/mtools/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/mtools/.calculate_directory
deleted file mode 100644
index c2c200253..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/mtools/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/mtools/mtools.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/mtools/mtools.conf
deleted file mode 100644
index a8d4b0e10..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/mtools/mtools.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-# Calculate comment=#
-# Example mtools.conf files.  Uncomment the lines which correspond to
-# your architecture and comment out the "SAMPLE FILE" line below
-#SAMPLE FILE
-
-# # Linux floppy drives
-# drive a: file="/dev/fd0" exclusive
-# drive b: file="/dev/fd1" exclusive
-
-# # First SCSI hard disk partition
-# drive c: file="/dev/sda1"
-
-# # First IDE hard disk partition
-# drive c: file="/dev/hda1"
-
-# # dosemu floppy image
-# drive m: file="/var/lib/dosemu/diskimage"
-
-# # dosemu hdimage
-# drive n: file="/var/lib/dosemu/diskimage" offset=3840
-
-# # Atari ramdisk image
-# drive o: file="/tmp/atari_rd" offset=136
-
-# # ZIP disk for Solaris:
-# Drive X is ZIP-100 at target 5
-# drive X: file="/dev/rdsk/c0t5d0s2" partition=4 scsi=1 nodelay
-
-# # ZIP disk for SunOS:
-# # Zip drive is at target 5, which default kernel calls tape st1 !!
-# drive Y: file="/dev/rsd5c" partition=4 scsi=1 nodelay
-
-# # autoselect zip drive/floppy on HP-UX 9/10
-#    drive a: file="/dev/rdsk/c201d5"      exclusive partition=4
-#    drive a: file="/dev/rdsk/c201d5s0"    exclusive partition=4
-#    drive a: file="/dev/rfloppy/c201d0s0" exclusive
-
-#          A/UX target 5 on 1st scsi bus   jaz or zip
-# drive X: file="/dev/rdsk/c105d0s31"      partition=4
-
-
-# Some examples for BeOS.
-# floppy drive. hardcoded in devices.c, so no real need to define it here
-#drive a: file="/dev/floppy_disk" exclusive
-# ZIP drive on SCSI ID 6
-#drive z: file="/dev/scsi_disk_060" offset=16384 fat_bits=16                        
-
-# SCO Unix 3.2v4
-# # Floppy disk drives
-#
-# drive a: file="/dev/install" exclusive
-# drive b: file="/dev/install1" exclusive
-#  
-# # SCSI hard disk partitions
-#  
-# drive c: file="/dev/dsk/0sC"
-# drive d: file="/dev/dsk/0sD"
-# drive e: file="/dev/dsk/0sE"
-# drive f: file="/dev/dsk/0sF"
-# drive g: file="/dev/dsk/0sG"
-# drive h: file="/dev/dsk/0sH"
-
-# # uncomment the following line to display all file names in lower
-# # case by default
-# mtools_lower_case=1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
deleted file mode 100644
index 5be3d72cd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=conf.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
deleted file mode 100644
index 62f149f21..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=openrc name=udev
-
-rc_want="hostname"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
deleted file mode 100644
index bc1c43d8a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/udev symbolic ini(runlevels.udev-init-scripts)!=on&&ini(runlevels.udev-init-scripts,on)==||grep(/var/lib/calculate/-runlevels-udev-init-scripts,/udev)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/.calculate_directory
deleted file mode 100644
index 390da254a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=modprobe.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
deleted file mode 100644
index 580bdf590..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=patch path=/lib/udev/rules.d
-<reg>(ACTION=="add", SUBSYSTEM=="block", SUBSYSTEMS=="usb\|ieee1394", ENV\{ID_CDROM\}=="\?\*", ENV\{GENERATED\}!="\?\*", \\
-  PROGRAM="write_cd_rules by-id", SYMLINK\+="%c", GOTO="persistent_cd_end")
-
-(ACTION=="add", SUBSYSTEM=="block", ENV\{ID_CDROM\}=="\?\*")</reg>
-<text>\1
-ACTION=="add", SUBSYSTEM=="block", ENV{ID_ATA}=="1", ENV{ID_CDROM}=="?*", ENV{GENERATED}!="?*", \
-  PROGRAM="write_cd_rules by-id", SYMLINK+="%c", GOTO="persistent_cd_end"
-\2</text>
-<reg>ID_ATA=="1"</reg>
-<text>ENV{ID_ATA}=="1"</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
deleted file mode 100644
index 749cb3498..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/udev/rules.d link=/lib/udev/rules.d/80-net-name-slot.rules pkg(sys-fs/udev)>=197 force
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
deleted file mode 100644
index 7d5441dd0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/udev/rules.d link=/lib/udev/rules.d/80-net-setup-link.rules pkg(sys-fs/udev)>=209 force
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
deleted file mode 100644
index 434b71e4e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate append=replace comment=# pkg(sys-fs/udev)>=197
-
-# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded
-blacklist usblp
-
-# You probably want this to not get the console beep loud on every tab :)
-blacklist pcspkr
-
-# Not using kernel video drivers
-blacklist amdgpu
-blacklist i915
-blacklist nouveau
-blacklist nvidia
-blacklist radeon
-blacklist uvesafb
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/.calculate_directory
deleted file mode 100644
index b6fba445f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/var/lib/polkit-1/localauthority name=50-local.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
deleted file mode 100644
index ecdb88772..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate comment=// append=replace path=/etc/polkit-1/rules.d
-/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */
-
-// Mount disk by plugdev group rules for polkit
-//
-
-polkit.addRule(function(action, subject) {
-    if ((action.id.indexOf("org.freedesktop.udisks.") == 0 ||
-         action.id.indexOf("org.freedesktop.udisks2.") == 0 ) &&
-        subject.isInGroup("plugdev")) {
-             return polkit.Result.YES;
-   }
-});
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
deleted file mode 100644
index 01c9e3118..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/polkit-1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
deleted file mode 100644
index 96ce0bee3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
+++ /dev/null
@@ -1,221 +0,0 @@
-# Calculate append=replace pkg(sys-fs/udisks:0)!=
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<policyconfig>
-  <vendor>The udisks Project</vendor>
-  <vendor_url>http://udisks.freedesktop.org/</vendor_url>
-  <icon_name>drive-removable-media</icon_name>
-
-  <action id="org.freedesktop.udisks.filesystem-mount">
-    <description>Mount a device</description>
-    <message>Authentication is required to mount the device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.filesystem-mount-system-internal">
-    <description>Mount a system-internal device</description>
-    <message>Authentication is required to mount the device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.filesystem-check">
-    <description>Check file system on a device</description>
-    <message>Authentication is required to check the file system on the device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.filesystem-check-system-internal">
-    <description>Check file system of a system-internal device</description>
-    <message>Authentication is required to check the file system on the device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.filesystem-unmount-others">
-    <description>Unmount a device mounted by another user</description>
-    <message>Authentication is required to unmount devices mounted by another user</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.filesystem-lsof">
-    <description>List open files</description>
-    <message>Authentication is required to list open files on a mounted file system</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.filesystem-lsof-system-internal">
-    <description>List open files on a system-internal device</description>
-    <message>Authentication is required to list open files on a mounted file system</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.drive-eject">
-    <description>Eject media from a device</description>
-    <message>Authentication is required to eject media from the device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.drive-detach">
-    <description>Detach a drive</description>
-    <message>Authentication is required to detach the drive</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.change">
-    <description>Modify a device</description>
-    <message>Authentication is required to modify the device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.change-system-internal">
-    <description>Modify a system-internal device</description>
-    <message>Authentication is required to modify the device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.drive-ata-smart-refresh">
-    <description>Refresh ATA SMART data</description>
-    <message>Authentication is required to refresh ATA SMART data</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.drive-ata-smart-selftest">
-    <description>Run ATA SMART Self Tests</description>
-    <message>Authentication is required to run ATA SMART self tests</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.drive-ata-smart-retrieve-historical-data">
-    <description>Retrieve historical ATA SMART data</description>
-    <message>Authentication is required to retrieve historical ATA SMART data</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.luks-unlock">
-    <description>Unlock an encrypted device</description>
-    <message>Authentication is required to unlock an encrypted device</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.luks-lock-others">
-    <description>Lock an encrypted device unlocked by another user</description>
-    <message>Authentication is required to lock an encrypted device unlocked by another user</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.linux-md">
-    <description>Configure Linux Software RAID</description>
-    <message>Authentication is required to configure Linux Software RAID devices</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.linux-lvm2">
-    <description>Configure Linux LVM2</description>
-    <message>Authentication is required to configure Linux LVM2</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.cancel-job-others">
-    <description>Cancel a job initiated by another user</description>
-    <message>Authentication is required to cancel a job initiated by another user</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.inhibit-polling">
-    <description>Inhibit media detection</description>
-    <message>Authentication is required to inhibit media detection</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.udisks.drive-set-spindown">
-    <description>Set drive spindown timeout</description>
-    <message>Authentication is required to configure drive spindown timeout</message>
-    <defaults>
-      <allow_any>no</allow_any>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
deleted file mode 100644
index c64a5d98b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
+++ /dev/null
@@ -1,4 +0,0 @@
-[Mounting, checking, etc. of external drives]
-Identity=unix-group:plugdev
-Action=org.freedesktop.udisks.filesystem-mount;org.freedesktop.udisks.filesystem-mount-system-internal;org.freedesktop.udisks.filesystem-check;org.freedesktop.udisks.filesystem-check-system-internal;org.freedesktop.udisks.filesystem-unmount-others;org.freedesktop.udisks.filesystem-lsof;org.freedesktop.udisks.filesystem-lsof-system-internal;org.freedesktop.udisks.drive-eject;org.freedesktop.udisks.drive-detach;org.freedesktop.udisks.change;org.freedesktop.udisks.change-system-internal;org.freedesktop.udisks.drive-ata-smart-refresh;org.freedesktop.udisks.drive-ata-smart-selftest;org.freedesktop.udisks.drive-ata-smart-retrieve-historical-data;org.freedesktop.udisks.luks-unlock;org.freedesktop.udisks.luks-lock-others;org.freedesktop.udisks.linux-md;org.freedesktop.udisks.linux-lvm2;org.freedesktop.udisks.cancel-job-others;org.freedesktop.udisks.inhibit-polling;org.freedesktop.udisks.drive-set-spindown
-ResultActive=yes
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
deleted file mode 100644
index bcc593d63..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=local.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
deleted file mode 100644
index da9b2b5c9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate exec=/bin/bash os_install_arch_machine==i686&&ac_install_disk==off
-
-for fn in /usr/src/*/Module.symvers
-do
-    if [[ -f $fn ]]
-    then
-        sed -ri 's/(alternatives_patched.*SYMBOL)_GPL/\1/' $fn
-    fi
-done
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
deleted file mode 100644
index 4642ab21b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=# chmod=755
-#!/bin/bash
-
-F=/sys/kernel/mm/ksm/run
-if [ -f $F ]
-then
-	echo 1 > $F
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
deleted file mode 100644
index 12fabc643..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/lib/dracut name=modules.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
deleted file mode 100644
index 311712d13..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch
-<reg>if \[\[ \$\{hostonly\} \]\] \&amp;\&amp; (! \[\[ \$\{i18n_install_all\})</reg>
-<text>if \1</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/load-video.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/load-video.sh
deleted file mode 100755
index 7a1850514..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/load-video.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-
-load_videodrv() {
-	info "Loading frame buffer video driver"
-	# find all available fb drivers
-	videodrv_count=$(find /lib/modules \
-		-name "nouveau.ko*" -o \
-		-name "uvesafb.ko*" -o \
-		-name "i915.ko*" -o \
-		-name "amdgpu.ko*" -o \
-		-name "radeon.ko*" |
-		grep -c "")
-	# load specified videodrv
-	modules_list=
-	case "${videodrv}" in
-		nouveau)
-			modules_list="nouveau"
-			;;
-		radeon)
-			modules_list="radeon"
-			;;
-		amdgpu)
-			modules_list="amdgpu"
-			;;
-		none)
-			return 0;
-			;;
-		i915|intel)
-			modules_list="i915"
-			;;
-		""|auto)
-			# videoautodetect
-			if [[ -x /usr/sbin/lspci ]]
-			then
-				if lspci | grep -m1 VGA | grep -qi intel
-				then
-					modules_list="i915"
-				elif lspci | grep -m1 VGA | grep -qi nvidia
-				then
-					modules_list="nouveau"
-				elif lspci | grep -m1 VGA | grep -q -e "Ati" -e "ATI"
-				then
-					modules_list="radeon"
-				else
-					modules_list=""
-				fi
-			else
-				modules_list="i915"
-			fi
-			;;
-	esac
-	for x in $modules_list
-	do
-		if [ "`find /lib/modules -name "${x}.ko*" | grep -c ''`" -eq "1" ]
-		then
-			modprobe "${x}" modeset=1 &>/dev/null
-			lsmod | grep -q "^${x}" && \
-				[ "`cat /sys/module/${x}/refcnt`" -gt 0 ] && return 0
-		fi
-	done
-	# else load uvesafb with specified video resolution
-	if [ -n "${videoresolution}" ]
-	then
-		if ! echo $videoresolution | grep -q "\-"
-		then
-			videoresolution="${videoresolution}-32"
-		fi
-	else
-		videoresolution="1024x768-32"
-	fi
-	modprobe uvesafb mode_option=${videoresolution} &>/dev/null
-}
-load_videodrv
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
deleted file mode 100644
index a11a8ff76..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-#
-# Licensed under the GPLv2
-#
-# Copyright 2013 Red Hat, Inc.
-# Peter Jones <pjones@redhat.com>
-
-check() {
-    return 255
-}
-
-depends() {
-    return 0
-}
-
-installkernel() {
-    instmods radeon uvesafb nouveau i915 amdgpu
-}
-
-install() {
-#    inst_dir /lib/modules/keys
-     inst_binary /usr/sbin/lspci
-     inst_binary /usr/bin/sleep
-     inst_binary /bin/grep
-     inst_binary /sbin/lsmod
-     inst_binary /usr/bin/find
-     inst_binary /usr/bin/cut
-     inst_simple /usr/share/misc/pci.ids
-     inst_hook pre-trigger 01 "$moddir/load-video.sh"
-     inst_hook cmdline 50 "$moddir/parse-cmdline.sh"
-     mkdir -p ${initdir}/etc/modprobe.d
-     for videomodule in fglrx nvidia radeon nouveau i915 uvesafb amdgpu
-     do
-        echo "blacklist ${videomodule}" >>${initdir}/etc/modprobe.d/video-blacklist.conf
-     done
-#
-#    inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh"
-#
-#    for x in /lib/modules/keys/* ; do
-#        [[ "${x}" = "/lib/modules/keys/*" ]] && break
-#        inst_simple "${x}"
-#    done
-}
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
deleted file mode 100755
index 0a8953917..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-[ -z "$calculate" ] && calculate=$(getarg calculate=)
-[ -z "$video" ] && video=$(getarg video=)
-[ -z "$bootimage" ] && bootimage=$(getarg BOOT_IMAGE=)
-
-[ -z "$calculate" ] && [ -z "$video" ] && return
-
-if [[ $bootimage != ${bootimage/SafeMode/} ]]
-then
-    echo "rd.plymouth=0" >>/etc/cmdline.d/90-noplymouth.conf
-fi
-
-if [ -n "$video" ]
-then
-    for i in ${video//,/ }
-    do
-        if [ -z "${i//[0-9-x@]}" ]
-        then
-            videoresolution=${i}
-        fi
-    done
-fi
-
-if [[ "${calculate//:/}" != "${calculate}" ]]
-then
-    for i in ${calculate//,/ }
-    do
-        case "${i}" in
-            video:*)
-                videodrv=`echo "${i}" | cut -s -d: -f2-`
-                ;;
-            resolution:*)
-                resolution=`echo "${i}" | cut -s -d: -f2-`
-                if [ -n "${resolution}" -a "${resolution}" != "auto" ]
-                then
-                  videoresolution=${resolution}-32
-                fi
-                ;;
-        esac
-    done
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
deleted file mode 100755
index c9ce55982..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-# live images are specified with
-# root=live:backingdev
-
-isofile=$(getarg iso-scan/filename)
-
-if [ -n "$isofile" -a "$root" = "live" ]; then
-    rootok=1
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
deleted file mode 100755
index 7ae1cd1ff..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-echo "ISOFILE $1"
-isofile=$1
-
-[ -z "$isofile" ] && exit 1
-
-ismounted "/run/initramfs/isoscan" && exit 0
-
-mkdir -p "/run/initramfs/isoscan"
-
-do_iso_scan() {
-    local _name
-    local dev
-    for dev in /dev/disk/by-uuid/*; do
-        _name=$(dev_unit_name "$dev")
-        [ -e /tmp/isoscan-${_name} ] && continue
-        > /tmp/isoscan-${_name}
-        mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-        if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-            if [ "$root" == "live" ]; then
-                /sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root `losetup -f --show "/run/initramfs/isoscan/$isofile"`
-            else
-                losetup -f --show "/run/initramfs/isoscan/$isofile"
-            fi
-            rm -f -- "$job"
-            exit 0
-        else
-            umount "/run/initramfs/isoscan"
-        fi
-    done
-}
-
-do_iso_scan
-
-rmdir "/run/initramfs/isoscan"
-exit 1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
deleted file mode 100755
index 91fd09702..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-[[ $root =~ ^live: ]] && /sbin/live-scan && cancel_wait_for_dev "${root#live:}"
-
-[ -e "$job" ] && rm -f "$job"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
deleted file mode 100755
index 5bb4bd899..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-LIVEPATH=/run/initramfs/livescan
-
-ismounted "$LIVEPATH" && exit 0
-
-mkdir -p "$LIVEPATH"
-
-check_for_live() {
-    [[ -f $LIVEPATH/livecd ]] && cat "$LIVEPATH/livecd" | grep -q calculate &>/dev/null
-}
-
-do_live_scan() {
-    local _name
-    local dev
-    for dev in /dev/disk/by-uuid/*; do
-        _name=$(dev_unit_name "$dev")
-        [ -e /tmp/livescan-${_name} ] && continue
-        > /tmp/livescan-${_name}
-        mount -t auto -o ro "$dev" "$LIVEPATH" || continue
-        if check_for_live; then
-            umount "$LIVEPATH"
-            /sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $dev
-            exit 0
-        else
-            umount "$LIVEPATH"
-        fi
-    done
-}
-
-do_live_scan
-
-rmdir "/run/initramfs/livescan"
-exit 1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
deleted file mode 100755
index f9d4256c0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-check() {
-    return 255
-}
-
-depends() {
-    # if dmsetup is not installed, then we cannot support fedora/red hat
-    # style live images
-    [[ $hostonly ]] || echo rootfs-block dmsquash-live
-    return 0
-}
-
-installkernel() {
-    [[ $hostonly ]] || instmods squashfs loop iso9660
-    instmods =drivers/usb/host =drivers/usb/phy
-}
-
-install() {
-    if ! [[ $hostonly ]]
-    then
-        inst_multiple umount dmsetup blkid dd losetup grep blockdev cat cut sed rmdir pidof
-        inst_hook mount 20 "$moddir/scratch-mount-root.sh"
-        inst_hook cmdline 31 "$moddir/iso-scan-rootok.sh"
-        inst_script "$moddir/scratch-live-root.sh" "/sbin/dmsquash-live-root"
-        inst_script "$moddir/mount-squashfs.sh" "/sbin/mount-squashfs"
-        inst_script "$moddir/iso-scan.sh" "/sbin/iso-scan"
-        inst_script "$moddir/live-scan.sh" "/sbin/live-scan"
-        inst_script "$moddir/nfsroot.sh" "/sbin/nfsroot"
-        inst_hook initqueue/timeout 95 "$moddir/live-fallback.sh"
-    fi
-    echo rd.skipfsck=1 >> "${initdir}/etc/cmdline.d/95-skipfsck.conf"
-}
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
deleted file mode 100755
index 3eaccc5a3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-live_dir=$(getarg rd.live.dir -d live_dir )
-squash_image=$(getarg rd.live.squashimg -d loop)
-[ -z "$squash_image" ] && squash_image="livecd.squashfs"
-
-getargbool 0 rd.live.ram -d -y live_ram -d -y docache && live_ram="yes"
-
-# we might have an embedded fs image on squashfs (compressed live)
-if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
-    SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
-fi
-
-do_cache() {
-    allmemory=0
-    for i in $(cat /proc/meminfo | grep -e ^MemFree -e ^Cached | \
-        cut -d: -f2 | cut -dk -f1 | sed -e "s/^\s*//") ;
-    do
-        allmemory=$((${allmemory} + $i))
-    done
-
-    # getting size tmpfs of default
-    let curtfs=${allmemory}/2
-
-    # getting size of image
-    let imagesize=`ls -la ${SQUASHED} | sed -r -n 's/(\S*\s*){4}(\S*).*/\2/p'`/20000*21
-    let addon=${imagesize}/7
-    if [[ ${curtfs} -gt $(( ${imagesize} + ${addon} )) ]];
-    then
-        newsize=${curtfs}
-    else
-        newsize=$(( ${addon} + ${imagesize} ))
-    fi
-
-    if [[ ${newsize} -lt ${allmemory} ]];
-    then
-        LIVECACHE=/run/initramfs/livecache
-        mkdir -m 0755 -p $LIVECACHE
-        mount -o remount,size=${newsize}k -t tmpfs tmpfs /run
-        echo "Copying live image to RAM..."
-        echo "(this may take a few minutes)"
-        dd if=$SQUASHED of=${LIVECACHE}/livecd.squashfs bs=512 2> /dev/null
-        if [ $? -ne 0 ]
-        then
-            bad_msg "Failed to cache the loop file! Lack of space?"
-            umount ${LIVECACHE}
-        else
-            SQUASHED="${LIVECACHE}/livecd.squashfs"
-            echo "Unmounting media from /var/initramfs/live"
-            umount -n /run/initramfs/live
-        fi
-    else
-        echo "Too low memory for cache the loop file." 1>&2
-    fi
-}
-
-if [ -e "$SQUASHED" ] ; then
-    if [ -n "$live_ram" ] ; then
-        do_cache
-    fi
-
-    SQUASHED_LOOPDEV=$( losetup -f )
-    losetup -r $SQUASHED_LOOPDEV $SQUASHED
-    mkdir -m 0755 -p /run/initramfs/squashfs
-    mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /run/initramfs/squashfs
-fi
-
-ROOTFLAGS="$(getarg rootflags)"
-if [ -n "$ROOTFLAGS" ]; then
-    ROOTFLAGS="-o $ROOTFLAGS"
-else
-    ROOTFLAGS="-o udba=reval,br:/overlay=rw,/run/initramfs/squashfs=ro"
-fi
-
-ln -s ${SQUASHED_LOOPDEV} /dev/mapper/live-rw
-
-need_shutdown
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
deleted file mode 100755
index 7b2e27b95..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-. /lib/nfs-lib.sh
-
-[ "$#" = 3 ] || exit 1
-
-# root is in the form root=nfs[4]:[server:]path[:options], either from
-# cmdline or dhcp root-path
-netif="$1"
-root="$2"
-NEWROOT="$3"
-
-nfs_to_var $root $netif
-[ -z "$server" ] && die "Required parameter 'server' is missing"
-
-mkdir -m 0755 -p /run/initramfs/live
-
-mount_nfs $root /run/initramfs/live $netif && { [ -e /dev/root ] || ln -s null /dev/root ; }
-
-/sbin/mount-squashfs
-echo '[ -e /run/initramfs/squashfs/proc ]' > $hookdir/initqueue/finished/nfsroot.sh
-
-need_shutdown
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
deleted file mode 100755
index ba29b3822..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-if getargbool 0 rd.live.debug -n -y rdlivedebug; then
-    exec > /tmp/liveroot.$$.out
-    exec 2>> /tmp/liveroot.$$.out
-    set -x
-fi
-
-[ -z "$1" ] && exit 1
-livedev="$1"
-
-# parse various live image specific options that make sense to be
-# specified as their own things
-
-ln -s $livedev /run/initramfs/livedev
-
-modprobe squashfs
-CMDLINE=$(getcmdline)
-for arg in $CMDLINE; do case $arg in ro|rw) liverw=$arg ;; esac; done
-# mount the backing of the live image first
-mkdir -m 0755 -p /run/initramfs/live
-mount -n -t $fstype -o ${liverw:-ro} $livedev /run/initramfs/live
-if [ "$?" != "0" ]; then
-	echo "FAILED1!"
-	die "Failed to mount block device of live image"
-	exit 1
-fi
-
-/sbin/mount-squashfs
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
deleted file mode 100755
index e17fdc1bf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-mount_live_root_aufs() {
-    mkdir /run/initramfs/workspace
-    mountoption="-o udba=reval,br:/run/initramfs/workspace=rw:/run/initramfs/squashfs=ro"
-    if getargbool 0 scratch
-    then
-        mkdir /run/initramfs/delta
-        mountoption="-o udba=reval,br:/run/initramfs/workspace=rw:/run/initramfs/delta=ro+wh:/run/initramfs/squashfs=ro"
-    fi
-    mount -t aufs $mountoption none $NEWROOT
-    if getargbool 0 scratch
-    then
-        mkdir /run/builder
-        mountoption="-o udba=reval,br:/run/initramfs/delta=rw:/run/initramfs/squashfs=ro"
-        mount -t aufs $mountoption none /run/builder
-    fi
-}
-
-mount_live_root_overlay() {
-    lowerdir=/run/initramfs/squashfs
-    if getargbool 0 scratch
-    then
-        upperdir=/run/initramfs/delta
-        builderdir=/run/builder
-        mkdir $upperdir
-        mkdir $builderdir
-        mkdir ${upperdir}-workdir
-        mount -t overlay -o lowerdir=${lowerdir},upperdir=${upperdir},workdir=${upperdir}-workdir none $builderdir
-        lowerdir=$builderdir
-    fi
-    upperdir=/run/initramfs/workspace
-    mkdir ${upperdir}
-    mkdir ${upperdir}-workdir
-    mount -t overlay -o lowerdir=${lowerdir},upperdir=${upperdir},workdir=${upperdir}-workdir none $NEWROOT
-}
-
-mount_live_root() {
-    local module_found=
-    for typefs in overlay aufs
-    do
-        if ! mount -t $typefs -o none none /init 2>&1 | grep -q "unknown filesystem"
-        then
-            mount_live_root_$typefs
-            module_found=1
-            break
-        fi
-    done
-    [[ -z $module_found ]] && 
-        die "Cannot mount layered filesystem! Compile the kernel with CONFIG_OVERLAY_FS!"
-}
-
-[ -n "$root" -a -z "${root%%live*}" -o "$root" = "nfs" ] && mount_live_root
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
deleted file mode 100644
index a9d995db4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-install() {
-  # install userui
-  [ -e /sbin/tuxoniceui ] && inst tuxoniceui || true
-  
-  # install splash graphics if exists
-  my_inst_dir() {
-    inst_dir $1
-    for i in $1/*; do
-      if [ -d "$i" ]; then
-        my_inst_dir "$i"
-      else
-        inst "$i"
-      fi
-  done
-  }
-  [ -e /etc/splash/tuxonice ] && my_inst_dir /etc/splash/tuxonice
-  [ -e /etc/splash/suspend2 ] && my_inst_dir /etc/splash/suspend2
-  
-  inst_hook pre-udev 30 "$moddir/tuxonice-prepare.sh"
-  inst_hook pre-mount 30 "$moddir/tuxonice-lvmfix.sh"
-  inst "$moddir"/tuxonice-resumecheck.sh /sbin/tuxonice-resumecheck.sh
-}
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
deleted file mode 100644
index c30015868..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# fixes an asynchronous problem with lvm/dracut while resuming
-# for details see https://bugzilla.redhat.com/show_bug.cgi?id=830447
-
-. /lib/dracut-lib.sh
-info "TuxOnIce lvmfix started"
-
-udevadm settle --timeout=30
-
-info "TuxOnIce udev should be now fully settled"
-
-return 0
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
deleted file mode 100644
index b96c89d77..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-# prepare parameters for ToI
-
-. /lib/dracut-lib.sh
-info "TuxOnIce premodule started"
-
-# first check if ToI support is available
-if [ ! -d /sys/power/tuxonice ]; then
-  info "Kernel has no tuxonice support, aborting"
-  return 0
-else
-  info "Kernel has tuxonice support, continuing"
-fi
-
-if getarg noresume2; then
-  warn "noresume2 was specified, aborting"
-  return 0
-fi
-
-# prepare UserUI
-info "Setting up UserUI"
-UI="/sbin/tuxoniceui"
-UIOPTS=""
-
-if [ -e "/sys/class/graphics/fb0/state" -a -e "/etc/splash/tuxonice/" ]; then
-  UIOPTS="$UIOPTS -f"
-fi
-
-SYSFS_TUI_UI=/sys/power/tuxonice/user_interface
-PROGRAM_PATH=${SYSFS_TUI_UI}/program
-ENABLED_PATH=${SYSFS_TUI_UI}/enabled
-if [ -e "$UI" ] && [ -e "$PROGRAM_PATH" ] && [ -e "$ENABLED_PATH" ]; then
-  info "Using $UI with $UIOPTS"
-  echo "$UI $UIOPTS" >$PROGRAM_PATH
-  echo 1 >$ENABLED_PATH
-else
-  if [ -e "$ENABLED_PATH" ]; then
-    echo 0 >$ENABLED_PATH
-  fi
-fi
-
-# install udev rule for resume parameter
-if resume=$(getarg resume=) && ! getarg noresume2; then
-  resume="${resume#file:}"
-  resume="${resume#swap:}"
-  resume="${resume%:*}"
-else
-  unset resume
-fi
-
-info "Installing udev rule for resume parameter"
-case "$resume" in
-  LABEL=*) \
-    resume="$(echo $resume | sed 's,/,\\x2f,g')"
-    {
-    echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_LABEL}==\"${resume#LABEL=}\", " \
-         " RUN+=\"/sbin/tuxonice-resumecheck.sh '/dev/%k' 'resume'\"";
-    } >> /etc/udev/rules.d/99-tuxonice.rules
-    ;;
-  UUID=*) \
-    {
-    echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_UUID}==\"${resume#UUID=}\", " \
-         " RUN+=\"/sbin/tuxonice-resumecheck.sh '/dev/%k' 'resume'\"";
-    } >> /etc/udev/rules.d/99-tuxonice.rules
-    ;;
-  PARTUUID=*) \
-    {
-    echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_PART_ENTRY_UUID}==\"${resume#PARTUUID=}\", " \
-         " RUN+=\"/sbin/tuxonice-resumecheck.sh '/dev/%k' 'resume'\"";
-    } >> /etc/udev/rules.d/99-tuxonice.rules
-    ;;
-  *) \
-    {
-    echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", SYMLINK==\"${resume#/dev/}\", " \
-         " RUN+=\"/sbin/tuxonice-resumecheck.sh '/dev/%k' 'resume'\"";
-    } >> /etc/udev/rules.d/99-tuxonice.rules
-    {
-    echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", KERNEL==\"${resume#/dev/}\", " \
-         " RUN+=\"/sbin/tuxonice-resumecheck.sh '/dev/%k' 'resume'\"";
-    } >> /etc/udev/rules.d/99-tuxonice.rules
-    ;;
-esac
-
-
-# install udev rule for resuming
-info "Installing udev rule for ToI resume"
-{
-echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\", " \
-     " RUN+=\"/sbin/tuxonice-resumecheck.sh '/dev/%k' 'suspend'\"";
-} >> /etc/udev/rules.d/99-tuxonice.rules
-
-# install udev rule to add swapdevice as hibernation target
-info "Installing udev rule for ToI swap detection"
-{
-echo "SUBSYSTEM==\"block\", ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"swap\", " \
-     " RUN+=\"/sbin/tuxonice-resumecheck.sh '/dev/%k' 'swap'\"";
-} >> /etc/udev/rules.d/99-tuxonice.rules
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
deleted file mode 100644
index 4bad65cd3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "suspend" ]; then
-  echo "<3>Dracut: found ToI/suspend signature in $1, trying to resume" > /dev/kmsg
-  OLDDEV=$(cat /sys/power/tuxonice/resume)
-  echo "swap:$1" >/sys/power/tuxonice/resume
-  echo 1 >/sys/power/tuxonice/do_resume
-  echo "<3>Dracut: no resume operation occured, restoring old value ($OLDDEV)" >/dev/kmsg
-  echo "$OLDDEV" >/sys/power/tuxonice/resume
-elif [ "$2" = "swap" ]; then
-  echo "<3>Dracut: found swap signature in $1, using for ToI" > /dev/kmsg
-  CURDEV=$(cat /sys/power/tuxonice/resume)
-  [ -z "$CURDEV" ] && echo "swap:$1" >/sys/power/tuxonice/resume
-elif [ "$2" = "resume" ]; then
-  echo "<3>Dracut: found resume parameter device in $1, trying to resume" > /dev/kmsg
-  echo 1 >/sys/power/tuxonice/do_resume
-  echo "<3>Dracut: no resume operation occured" >/dev/kmsg
-fi
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
deleted file mode 100644
index faeb8fb31..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate dotall format=patch path=/usr/lib/dracut/modules.d/99base pkg(sys-kernel/dracut)<39
-<reg>(\nwait_for_dev.*?_name.*?str_replace.*)'\\x2f'</reg>
-<text>\1'\\\\x2f'</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
deleted file mode 100644
index fdbda115a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/lib/dracut
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
deleted file mode 100644
index c333d9e02..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/lib/dracut/dracut.conf.d/gentoo.conf exists(/usr/lib/dracut/dracut.conf.d/gentoo.conf)!= mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
deleted file mode 100644
index 1f31e16ed..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-omit_dracutmodules+=" multipath"
-add_dracutmodules+=" video calculate"
-#?pkg(net-nds/rpcbind)!=&&pkg(net-misc/iputils[arping])!=#
-add_dracutmodules+=" nfs"
-#pkg#
-#?pkg(sys-boot/plymouth)!=&&pkg(media-gfx/splashutils)==#
-add_dracutmodules+=" plymouth"
-#pkg#
-#?pkg(media-gfx/splashutils)!=#
-add_dracutmodules+=" gensplash"
-omit_dracutmodules+=" plymouth"
-#pkg#
-
-i18n_default_font="ter-v18n"
-add_drivers+=" sunrpc crc32c_generic "
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/conf.d.nscd b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
deleted file mode 100644
index dabe894de..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=openrc path=/etc/conf.d name=nscd
-
-rc_use="!net logger root"
-rc_before="dbus xdm"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/locale.gen b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/locale.gen
deleted file mode 100644
index b6198e83b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/locale.gen
+++ /dev/null
@@ -1,39 +0,0 @@
-# Calculate comment=#
-be_BY.UTF-8 UTF-8
-bg_BG.UTF-8 UTF-8
-bs_BA.UTF-8 UTF-8
-cs_CZ.UTF-8 UTF-8
-da_DK.UTF-8 UTF-8
-de_DE.UTF-8 UTF-8
-en_AU.UTF-8 UTF-8
-en_GB.UTF-8 UTF-8
-en_US.UTF-8 UTF-8
-es_ES.UTF-8 UTF-8
-es_UY.UTF-8 UTF-8
-es_VE.UTF-8 UTF-8
-et_EE.UTF-8 UTF-8
-fi_FI.UTF-8 UTF-8
-fr_BE.UTF-8 UTF-8
-fr_CA.UTF-8 UTF-8
-fr_FR.UTF-8 UTF-8
-hr_HR.UTF-8 UTF-8
-hu_HU.UTF-8 UTF-8
-is_IS.UTF-8 UTF-8
-it_IT.UTF-8 UTF-8
-kk_KZ.UTF-8 UTF-8
-lt_LT.UTF-8 UTF-8
-lv_LV.UTF-8 UTF-8
-nl_BE.UTF-8 UTF-8
-nl_NL.UTF-8 UTF-8
-nn_NO.UTF-8 UTF-8
-pl_PL.UTF-8 UTF-8
-pt_BR.UTF-8 UTF-8
-pt_PT.UTF-8 UTF-8
-ro_RO.UTF-8 UTF-8
-ru_RU.UTF-8 UTF-8
-sk_SK.UTF-8 UTF-8
-sl_SI.UTF-8 UTF-8
-sq_AL.UTF-8 UTF-8
-sr_RS.UTF-8 UTF-8
-sv_SE.UTF-8 UTF-8
-uk_UA.UTF-8 UTF-8
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
deleted file mode 100644
index 4a771b9bc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=# append=replace
-#
-# /etc/nscd.conf
-
-	enable-cache			passwd		yes
-	positive-time-to-live	passwd		604800
-	negative-time-to-live	passwd		20
-	suggested-size			passwd		211
-	check-files				passwd		yes
-	persistent				passwd		yes
-	shared					passwd		yes
-
-	enable-cache			group		yes
-	positive-time-to-live	group		604800
-	negative-time-to-live	group		40
-	suggested-size			group		211
-	check-files				group		yes
-	persistent				group		yes
-	shared					group		yes
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd-refresh b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd-refresh
deleted file mode 100644
index 9e1f5944b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd-refresh
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate path=/usr/sbin chmod=0755
-#!/bin/sh
-# Updating of domain users nss-cache.
-# The NSS-cache is used for fix resume from suspend mode of domain users.
-#
-#?os_install_locale_language==ru#
-# Обновление к�ша пользователей домена.
-# К�ширование и�пользует�� дл� поддержки �п�щего режима доменных машин.
-# Обновление вызывает�� из cron.hourly, при входе в �еан�, при разблокировке.
-#?os_install_locale_language#
-
-# invalidate passwd and group caches
-nscd -i passwd
-nscd -i group
-# get information about all users
-getent passwd | cut -d: -f1 |
-while read user;do
-    id $user &>/dev/null
-done
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd.conf
deleted file mode 100644
index 1bd5ec5b8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nscd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=# append=replace
-#
-# /etc/nscd.conf
-
-	enable-cache			passwd		yes
-	positive-time-to-live	passwd		0
-	negative-time-to-live	passwd		0
-	suggested-size			passwd		211
-	check-files				passwd		yes
-	persistent				passwd		yes
-	shared					passwd		yes
-
-	enable-cache			group		yes
-	positive-time-to-live	group		0
-	negative-time-to-live	group		0
-	suggested-size			group		211
-	check-files				group		yes
-	persistent				group		yes
-	shared					group		yes
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nsswitch.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
deleted file mode 100644
index f46a224f9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc
-#?pkg(sys-auth/nss_ldap)!=#
-passwd:      files ldap
-shadow:      files ldap
-group:       files ldap
-#pkg#
-#?pkg(sys-auth/nss_ldap)==#
-passwd:      files
-shadow:      files
-group:       files
-#pkg#
-
-hosts:       files dns
-networks:    files dns
-
-#?pkg(sys-auth/nss_ldap)!=#
-services:    files ldap
-protocols:   files ldap
-#pkg#
-#?pkg(sys-auth/nss_ldap)==#
-services:    db files
-protocols:   db files
-#pkg#
-rpc:         db files
-ethers:      db files
-netmasks:    files
-#?pkg(sys-auth/nss_ldap)!=#
-netgroup:    files ldap
-#pkg#
-#?pkg(sys-auth/nss_ldap)==#
-netgroup:    files
-#pkg#
-bootparams:  files
-
-#?pkg(sys-auth/nss_ldap)!=#
-automount:   files ldap
-#pkg#
-#?pkg(sys-auth/nss_ldap)==#
-automount:   files
-#pkg#
-aliases:     files
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/gpm/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/gpm/.calculate_directory
deleted file mode 100644
index 5be3d72cd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/gpm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=conf.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/gpm/gpm b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/gpm/gpm
deleted file mode 100644
index 5d7112a3f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/gpm/gpm
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=#
-MOUSE=imps2
-MOUSEDEV=/dev/psaux
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/pam/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/pam/.calculate_directory
deleted file mode 100644
index 627be76b9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/pam/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&os_install_linux_system==server path=/etc/security name=limits.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf
deleted file mode 100644
index 681f00b8e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=#
-# need for openldap
-* - nofile 10240
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-power/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-power/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-power/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/htop/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/htop/.calculate_directory
deleted file mode 100644
index de7d03c01..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/htop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/htop/htop.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/htop/htop.desktop
deleted file mode 100644
index 98faf71fc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/htop/htop.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron b/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
deleted file mode 100644
index da13a1853..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/vixie-cron symbolic ini(runlevels.vixie-cron)!=on&&ini(runlevels.vixie-cron,on)==||grep(/var/lib/calculate/-runlevels-vixie-cron,vixie-cron)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-client/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/www-client/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-client/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/.calculate_directory
deleted file mode 100644
index d25f5f208..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=22 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/README b/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/README
deleted file mode 100644
index 11f72bf00..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/README
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate append=skip
-
-Символиче�ка� ��ылка �делана дл� того, чтобы плагин также работал в Qupzillaю
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/libpepflashplayer.so b/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/libpepflashplayer.so
deleted file mode 100644
index bf0bc91d8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/www-plugins/adobe-flash/libpepflashplayer.so
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/lib/chromium/PepperFlash link=/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
deleted file mode 100644
index 85d3f31ab..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# format=patch
-<reg>\$\{START_STOP_ARGS\} \|\|</reg>
-<text>${START_STOP_ARGS} &lt;/dev/null ||</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
deleted file mode 100644
index e6e0f44fa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# dotall format=patch
-<reg>^\s*</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/env.d/90xsession b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
deleted file mode 100644
index be3d47943..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=openrc
-
-#?pkg(media-tv/kodi)!=#
-XSESSION="Kodi"
-#pkg#
-#?pkg(x11-wm/openbox)!=#
-XSESSION="openbox"
-#pkg#
-#?pkg(gnome-extra/cinnamon-session)!=#
-XSESSION="cinnamon-session"
-#pkg#
-#?pkg(lxqt-base/lxqt-session)!=#
-XSESSION="lxqt"
-#pkg#
-#?pkg(xfce-base/xfce4-session)!=#
-XSESSION="Xfce4"
-#pkg#
-#?pkg(mate-base/mate-session-manager)!=#
-XSESSION="Mate"
-#pkg#
-#?pkg(kde-base/ksmserver)!=#
-XSESSION="KDE-4"
-#pkg#
-#?pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=#
-XSESSION="Plasma"
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xmessage/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
deleted file mode 100644
index f379df232..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/X11 name=app-defaults
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xmessage/Xmessage b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xmessage/Xmessage
deleted file mode 100644
index f4cae3a43..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-apps/xmessage/Xmessage
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=#
-
-# key esc for close dialog
-*baseTranslations: 		#override :<Key>Return: default-exit()
-# display vertical scroll
-*message.scrollVertical:	Always
-# hide horizontal scroll
-*message.scrollHorizontal:	Never
-# rectange button style
-*Command.shapeStyle:		rectangle
-# thickness highlight
-*Command.highlightThickness:	1
-# font for messages
-#?pkg(media-fonts/droid)==#
-*font: -*-verdana-medium-r-*-*-*-*-*-*-*-*-*-uni
-#pkg#
-#?pkg(media-fonts/droid)!=#
-*font: -*-droid sans-medium-r-*-*-*-*-*-*-*-*-*-uni
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
deleted file mode 100644
index d9b6b87f9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(x11-base/xorg-server)>=1.9.0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
deleted file mode 100644
index 290efc9ef..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate comment=#
-
-# touchpad
-Section "InputClass"
-  Identifier  "Synaptics"
-  Driver  "synaptics"
-  MatchIsTouchpad "1"
-  Option  "Protocol" "event"
-  Option  "TapButton1" "1"
-  Option  "TapButton2" "2"
-  Option  "TapButton3" "3"
-  Option  "CircularScrolling" "1"
-EndSection
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/xdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/xdm
deleted file mode 100644
index 660e00a2f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/xdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/xdm symbolic pkg(x11-misc/sddm)!=||pkg(x11-misc/lightdm)!=||pkg(lxde-base/lxdm)!=||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/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
deleted file mode 100644
index 8f17b1e0c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=xdm pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(lxde-base/lxdm)==&&pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)==&&cl_autologin==||pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(lxde-base/lxdm)==&&pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)==&&os_install_root_type==livecd
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/default/xdm.del b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
deleted file mode 100644
index 6dfc3e014..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=xdm
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/init.d/xdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
deleted file mode 100644
index 6ca2e38fe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=patch
-<reg>		rm /etc/.noxdm
-		return 0</reg>
-<text>		rm /etc/.noxdm
-		chvt 1
-		return 0</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/.calculate_directory
deleted file mode 100644
index 654b35a6b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/ati-remove.start b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/ati-remove.start
deleted file mode 100644
index 1c1c2e5c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/ati-remove.start
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/local.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/ati-remove.stop b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/ati-remove.stop
deleted file mode 100644
index 1c1c2e5c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/ati-drivers/ati-remove.stop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/local.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
deleted file mode 100644
index 654b35a6b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=env.d
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
deleted file mode 100644
index c83ce802e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate comment=#
-# discard /usr/lib64/*nvidia*, because prelink call segfault
-# for some applications (chromium,libreoffice and etc)
-#?os_install_arch_machine==x86_64#
-PRELINK_PATH_MASK="/usr/lib64/*nvidia*
--b /usr/lib32/*nvidia*"
-#os_install_arch_machine#
-#?os_install_arch_machine!=x86_64#
-PRELINK_PATH_MASK=/usr/lib/*nvidia*
-#os_install_arch_machine#
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
deleted file mode 100644
index 1c1c2e5c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/local.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
deleted file mode 100644
index 1c1c2e5c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/local.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/gtk+/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
deleted file mode 100644
index 316c5793d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=gtk-2.0
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/gtk+/gtkrc b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/gtk+/gtkrc
deleted file mode 100644
index 5afeb8f2e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/gtk+/gtkrc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate comment=#
-gtk-fallback-icon-theme = "gnome"
-style "gdmfont"
-{
-#?pkg(media-fonts/droid)!=#
-	font_name = "Droid Sans"
-#pkg#
-#?pkg(media-fonts/droid)==#
-	font_name = "Verdana"
-#pkg#
-}
-widget "*" style "gdmfont"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/.calculate_directory
deleted file mode 100644
index f0ce64fb3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=1.6.3 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/99libX11 b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/99libX11
deleted file mode 100644
index 68b7e30e6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/99libX11
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=# path=/etc/env.d
-# need for correct entry compose sequences
-QT_IM_MODULE="xim"
-GTK_IM_MODULE="xim"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/Compose b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/Compose
deleted file mode 100644
index ba24fe10f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/libX11/Compose
+++ /dev/null
@@ -1,22 +0,0 @@
-# Calculate comment=# path=/usr/share/X11/locale/ru_RU.UTF-8
-<Multi_key> <P> <minus>                 : "₽" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <minus> <P>                 : "₽" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <p> <minus>                 : "₽" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <minus> <p>                 : "₽" U20bd # RUBLE-CURRENCY SIGN
-
-<Multi_key> <Cyrillic_ZE> <minus>       : "₽" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <minus> <Cyrillic_ZE>       : "₽" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <Cyrillic_ze> <minus>       : "₽" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <minus> <Cyrillic_ze>       : "₽" U20bd # RUBLE-CURRENCY SIGN
-
-<Multi_key> <Z> <equal>                 : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <equal> <Z>                 : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <z> <equal>                 : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <equal> <z>                 : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-
-<Multi_key> <Cyrillic_YA> <equal>       : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <equal> <Cyrillic_YA>       : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <Cyrillic_ya> <equal>       : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-<Multi_key> <equal> <Cyrillic_ya>       : "â‚´" U20bd # RUBLE-CURRENCY SIGN
-
-include "/usr/share/X11/locale/en_US.UTF-8/Compose"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/pango/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/pango/.calculate_directory
deleted file mode 100644
index ef8e23132..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/pango/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()>=1.36.8 path=/etc name=pango
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/pango/pango.modules b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/pango/pango.modules
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/pango/pango.modules
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
deleted file mode 100644
index d229c58bf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/qtermwidget5 name=color-schemes
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
deleted file mode 100644
index 0e87f3680..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
+++ /dev/null
@@ -1,73 +0,0 @@
-[Background]
-Color=44,44,44
-
-[BackgroundIntense]
-Bold=true
-Color=44,44,44
-
-[Color0]
-Color=44,44,44
-
-[Color0Intense]
-Bold=true
-Color=112,144,128
-
-[Color1]
-Color=112,80,80
-
-[Color1Intense]
-Bold=true
-Color=220,163,163
-
-[Color2]
-Color=96,180,138
-
-[Color2Intense]
-Bold=true
-Color=114,213,163
-
-[Color3]
-Color=223,175,143
-
-[Color3Intense]
-Bold=true
-Color=240,223,175
-
-[Color4]
-Color=154,184,215
-
-[Color4Intense]
-Bold=true
-Color=148,191,243
-
-[Color5]
-Color=220,140,195
-
-[Color5Intense]
-Bold=true
-Color=236,147,211
-
-[Color6]
-Color=140,208,211
-
-[Color6Intense]
-Bold=true
-Color=147,224,227
-
-[Color7]
-Color=220,220,204
-
-[Color7Intense]
-Bold=true
-Color=255,255,255
-
-[Foreground]
-Color=220,220,204
-
-[ForegroundIntense]
-Bold=true
-Color=220,220,204
-
-[General]
-Description=Calculate
-Opacity=1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
deleted file mode 100644
index eda09d490..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=pam.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm
deleted file mode 100644
index f5c90b14f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate comment=# path=/etc/pam.d name=lightdm
-#%PAM-1.0
-auth       optional		pam_env.so
-auth       include		system-login
-auth       required		pam_nologin.so
-
-account    include		system-login
-
-password   include		system-login
-
-session    include		system-auth
-session    optional		pam_gnome_keyring.so auto_start
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
deleted file mode 100644
index 7b8cde923..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate comment=#
-#%PAM-1.0
-
-# Load environment from /etc/environment and ~/.pam_environment
-auth      required pam_env.so
-
-# Always let the greeter start without authentication
-auth      required pam_permit.so
-
-# No action required for account management
-account   required pam_permit.so
-
-# Can't change password
-password  required pam_deny.so
-
-# Setup session
-session   required pam_unix.so
-#?pkg(sys-apps/systemd)!=#
-session   optional pam_systemd.so
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/.calculate_directory
deleted file mode 100644
index eda09d490..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=pam.d
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/group b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/group
deleted file mode 100644
index 3a9965980..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/group
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate multiline protected path=/etc format=patch
-<reg>^(video:x?:[^:]+:)(.*),sddm(.*)$</reg>
-<text>\1\2\3</text>
-<reg>^(video:x?:[^:]+:)sddm,(.*)$</reg>
-<text>\1\2</text>
-<reg>^(video:x?:[^:]+:)sddm$</reg>
-<text>\1</text>
-<reg>^(video:x?:[^:]+:)(.+)</reg>
-<text>\1\2,sddm</text>
-<reg>^(video:x?:[^:]+:)$</reg>
-<text>\1sddm</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/sddm b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/sddm
deleted file mode 100644
index 406ddd1f7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/sddm/sddm
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate pkg(sys-auth/consolekit)<1.0
-#%PAM-1.0
-
-auth		include		system-login
-account		include		system-login
-password	include		system-login
-session		optional	pam_ck_connector.so
-session		include		system-login
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/slim/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/slim/.calculate_directory
deleted file mode 100644
index 0876ed39e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/slim/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/slim/slim.conf b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/slim/slim.conf
deleted file mode 100644
index d4d165332..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/slim/slim.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=proftpd
-xserver_arguments	-nolisten tcp -br -deferglyphs 16 -dpi 96
-
-lockfile	/var/run/slim.pid
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86 b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
deleted file mode 100644
index 65c3dd8f9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=patch path=/usr/share/X11/xkb/compat
-<reg>\s*interpret\s+XF86_Ungrab\s+{
-\s*action = Private\([^)]+\);
-\s*};</reg>
-<text></text>
-<reg>interpret\s+XF86_ClearGrab\s+{
-\s*action = Private\([^)]+\);
-\s*};</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/qterminal/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
deleted file mode 100644
index 88e6a4a5d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/usr/share/applications
-
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
deleted file mode 100644
index 5880045d3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r7
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
deleted file mode 100644
index dba8ade69..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons name=Adwaita
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
deleted file mode 100644
index b31353fa7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/Adwaita/scalable/apps name=start-calculate.svg link=/usr/share/pixmaps/calculate/start-here-brown.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
deleted file mode 100644
index 28d1b51fd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/Adwaita/scalable/apps link=/usr/share/pixmaps/calculate/start-here-brown.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
deleted file mode 100644
index 5f09ea56d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()>=14-r6 merge=kde-frameworks/plasma,x11-themes/adwaita-icon-theme,x11-themes/elementary-icon-theme,x11-themes/gnome-icon-theme,x11-themes/hicolor-icon-theme,x11-themes/mate-icon-theme,xfce-base/xfce4-panel,kde-frameworks/oxygen-icons
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
deleted file mode 100644
index 0ae3a84d3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
+++ /dev/null
@@ -1,557 +0,0 @@
-# Calculate format=kde path=/usr/share/icons/Calculate name=index.theme
-[Icon Theme]
-Name=Calculate
-Comment=Default Calculate Linux Theme
-Comment[ru]=Стандартна� тема Calculate Linux
-
-#?pkg(kde-plasma/breeze)!=#
-Inherits=breeze,hicolor
-#pkg#
-#?pkg(kde-frameworks/oxygen-icons)!=&&pkg(kde-plasma/breeze)==#
-Inherits=oxygen,hicolor
-#pkg#
-#?pkg(x11-themes/mate-icon-theme)!=&&pkg(kde-frameworks/oxygen-icons)==&&pkg(kde-plasma/breeze)==#
-Inherits=mate,hicolor
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)!=&&pkg(x11-themes/mate-icon-theme)==&&pkg(kde-frameworks/oxygen-icons)==&&pkg(kde-plasma/breeze)==#
-Inherits=elementary,hicolor
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)==&&pkg(x11-themes/mate-icon-theme)==&&pkg(kde-frameworks/oxygen-icons)==&&pkg(kde-plasma/breeze)==#
-Inherits=gnome,hicolor
-#pkg#
-Example=x-directory-normal
-Directories=scalable/devices,scalable/actions,scalable/places,scalable/categories,scalable/status,scalable/emblems,scalable/apps,scalable/mimetypes,8x8/emblems,16x16/devices,16x16/apps,16x16/animations,16x16/status,16x16/intl,16x16/emblems,16x16/categories,16x16/actions,16x16/special,16x16/places,16x16/emotes,16x16/mimetypes,22x22/categories,22x22/animations,22x22/emotes,22x22/devices,22x22/apps,22x22/places,22x22/emblems,22x22/special,22x22/status,22x22/actions,22x22/intl,22x22/mimetypes,24x24/emotes,24x24/emblems,24x24/mimetypes,24x24/actions,24x24/categories,24x24/devices,24x24/apps,24x24/status,24x24/places,32x32/emblems,32x32/status,32x32/mimetypes,32x32/places,32x32/intl,32x32/apps,32x32/devices,32x32/animations,32x32/actions,32x32/categories,32x32/emotes,40x40/apps,48x48/animations,48x48/categories,48x48/emblems,48x48/actions,48x48/mimetypes,48x48/devices,48x48/intl,48x48/places,48x48/status,48x48/apps,48x48/emotes,64x64/mimetypes,64x64/status,64x64/actions,64x64/devices,64x64/apps,64x64/emotes,64x64/intl,64x64/categories,64x64/animations,64x64/emblems,64x64/places,72x72/apps,72x72/emblems,96x96/emblems,96x96/apps,128x128/animations,128x128/actions,128x128/status,128x128/devices,128x128/intl,128x128/categories,128x128/mimetypes,128x128/emotes,128x128/emblems,128x128/places,128x128/apps,256x256/actions,256x256/apps,256x256/mimetypes,256x256/emblems,256x256/categories,256x256/emotes,256x256/devices,256x256/places,256x256/status
-
-[128x128/actions]
-Size=128
-Context=Actions
-Type=Threshold
-
-[128x128/animations]
-Size=128
-Context=Animations
-Type=Threshold
-
-[128x128/apps]
-Size=128
-Context=Applications
-Type=Fixed
-
-[128x128/categories]
-Size=128
-Context=Categories
-Type=Threshold
-
-[128x128/devices]
-Size=128
-Context=Devices
-Type=Threshold
-
-[128x128/emblems]
-Size=128
-Context=Emblems
-Type=Fixed
-
-[128x128/emotes]
-Size=128
-Context=Emotes
-Type=Threshold
-
-[128x128/intl]
-Size=128
-Context=International
-Type=Threshold
-
-[128x128/mimetypes]
-Size=128
-Context=MimeTypes
-Type=Threshold
-
-[128x128/places]
-Size=128
-Context=Places
-Type=Threshold
-
-[128x128/status]
-Size=128
-Context=Status
-Type=Threshold
-
-[16x16/actions]
-Context=Actions
-Size=16
-Type=Fixed
-
-[16x16/animations]
-Context=Animations
-Size=16
-Type=Fixed
-
-[16x16/apps]
-Size=16
-Context=Applications
-Type=Fixed
-
-[16x16/categories]
-Context=Categories
-Size=16
-Type=Fixed
-
-[16x16/devices]
-Context=Devices
-Size=16
-Type=Fixed
-
-[16x16/emblems]
-Size=16
-Context=Emblems
-Type=Fixed
-
-[16x16/emotes]
-Context=Emotes
-Size=16
-Type=Fixed
-
-[16x16/intl]
-Size=16
-Context=International
-Type=Threshold
-
-[16x16/mimetypes]
-Context=MimeTypes
-Size=16
-Type=Fixed
-
-[16x16/places]
-Context=Places
-Size=16
-Type=Fixed
-
-[16x16/special]
-Size=16
-Context=Actions
-Type=Threshold
-
-[16x16/status]
-Context=Status
-Size=16
-Type=Fixed
-
-[22x22/actions]
-Context=Actions
-Size=22
-Type=Fixed
-
-[22x22/animations]
-Context=Animations
-Size=22
-Type=Fixed
-
-[22x22/apps]
-Size=22
-Context=Applications
-Type=Fixed
-
-[22x22/categories]
-Context=Categories
-Size=22
-Type=Fixed
-
-[22x22/devices]
-Context=Devices
-Size=22
-Type=Fixed
-
-[22x22/emblems]
-Size=22
-Context=Emblems
-Type=Fixed
-
-[22x22/emotes]
-Context=Emotes
-Size=22
-Type=Fixed
-
-[22x22/intl]
-Size=22
-Context=International
-Type=Threshold
-
-[22x22/mimetypes]
-Context=MimeTypes
-Size=22
-Type=Fixed
-
-[22x22/places]
-Context=Places
-Size=22
-Type=Fixed
-
-[22x22/special]
-Size=22
-Context=Actions
-Type=Threshold
-
-[22x22/status]
-Context=Status
-Size=22
-Type=Fixed
-
-[24x24/actions]
-Context=Actions
-Size=24
-Type=Fixed
-
-[24x24/apps]
-Size=24
-Context=Applications
-Type=Fixed
-
-[24x24/categories]
-Context=Categories
-Size=24
-Type=Fixed
-
-[24x24/devices]
-Context=Devices
-Size=24
-Type=Fixed
-
-[24x24/emblems]
-Size=24
-Context=Emblems
-Type=Fixed
-
-[24x24/emotes]
-Context=Emotes
-Size=24
-Type=Fixed
-
-[24x24/mimetypes]
-Context=MimeTypes
-Size=24
-Type=Fixed
-
-[24x24/places]
-Context=Places
-Size=24
-Type=Fixed
-
-[24x24/status]
-Context=Status
-Size=24
-Type=Fixed
-
-[256x256/actions]
-Context=Actions
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/apps]
-Context=Applications
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/categories]
-Context=Categories
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/devices]
-Context=Devices
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/emblems]
-Context=Emblems
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/emotes]
-Context=Emotes
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/mimetypes]
-Context=MimeTypes
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/places]
-Context=Places
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[256x256/status]
-Context=Status
-Size=256
-MinSize=56
-MaxSize=512
-Type=Scalable
-
-[32x32/actions]
-Context=Actions
-Size=32
-Type=Fixed
-
-[32x32/animations]
-Context=Animations
-Size=32
-Type=Fixed
-
-[32x32/apps]
-Size=32
-Context=Applications
-Type=Fixed
-
-[32x32/categories]
-Context=Categories
-Size=32
-Type=Fixed
-
-[32x32/devices]
-Context=Devices
-Size=32
-Type=Fixed
-
-[32x32/emblems]
-Size=32
-Context=Emblems
-Type=Fixed
-
-[32x32/emotes]
-Context=Emotes
-Size=32
-Type=Fixed
-
-[32x32/intl]
-Size=32
-Context=International
-Type=Threshold
-
-[32x32/mimetypes]
-Context=MimeTypes
-Size=32
-Type=Fixed
-
-[32x32/places]
-Context=Places
-Size=32
-Type=Fixed
-
-[32x32/status]
-Context=Status
-Size=32
-Type=Fixed
-
-[40x40/apps]
-Size=40
-Context=Applications
-Type=Threshold
-
-[48x48/actions]
-Context=Actions
-Size=48
-Type=Fixed
-
-[48x48/animations]
-Context=Animations
-Size=48
-Type=Fixed
-
-[48x48/apps]
-Size=48
-Context=Applications
-Type=Fixed
-
-[48x48/categories]
-Context=Categories
-Size=48
-Type=Fixed
-
-[48x48/devices]
-Context=Devices
-Size=48
-Type=Fixed
-
-[48x48/emblems]
-Size=48
-Context=Emblems
-Type=Fixed
-
-[48x48/emotes]
-Context=Emotes
-Size=48
-Type=Fixed
-
-[48x48/intl]
-Size=48
-Context=International
-Type=Threshold
-
-[48x48/mimetypes]
-Context=MimeTypes
-Size=48
-Type=Fixed
-
-[48x48/places]
-Context=Places
-Size=48
-Type=Fixed
-
-[48x48/status]
-Context=Status
-Size=48
-Type=Fixed
-
-[64x64/actions]
-Size=64
-Context=Actions
-Type=Threshold
-
-[64x64/animations]
-Size=64
-Context=Animations
-Type=Threshold
-
-[64x64/apps]
-Size=64
-Context=Applications
-Type=Fixed
-
-[64x64/categories]
-Size=64
-Context=Categories
-Type=Threshold
-
-[64x64/devices]
-Size=64
-Context=Devices
-Type=Threshold
-
-[64x64/emblems]
-Size=64
-Context=Emblems
-Type=Fixed
-
-[64x64/emotes]
-Size=64
-Context=Emotes
-Type=Threshold
-
-[64x64/intl]
-Size=64
-Context=International
-Type=Threshold
-
-[64x64/mimetypes]
-Size=64
-Context=MimeTypes
-Type=Threshold
-
-[64x64/places]
-Size=64
-Context=Places
-Type=Threshold
-
-[64x64/status]
-Size=64
-Context=Status
-Type=Threshold
-
-[72x72/apps]
-Size=72
-Context=Applications
-Type=Fixed
-
-[72x72/emblems]
-Size=72
-Context=Emblems
-Type=Fixed
-
-[8x8/emblems]
-Context=Emblems
-Size=8
-Type=Fixed
-
-[96x96/apps]
-Size=96
-Context=Applications
-Type=Fixed
-
-[96x96/emblems]
-Size=96
-Context=Emblems
-Type=Fixed
-
-[scalable/actions]
-Context=Actions
-Size=16
-MinSize=8
-MaxSize=512
-Type=Scalable
-
-[scalable/apps]
-Context=Applications
-Size=16
-MinSize=8
-MaxSize=512
-Type=Scalable
-
-[scalable/categories]
-Context=Categories
-Size=16
-MinSize=8
-MaxSize=512
-Type=Scalable
-
-[scalable/devices]
-Context=Devices
-Size=16
-MinSize=8
-MaxSize=512
-Type=Scalable
-
-[scalable/emblems]
-Context=Emblems
-Size=16
-MinSize=8
-MaxSize=512
-Type=Scalable
-
-[scalable/mimetypes]
-Context=MimeTypes
-Size=16
-MinSize=8
-MaxSize=512
-Type=Scalable
-
-[scalable/places]
-Size=48
-Context=Places
-Type=Scalable
-MinSize=16
-MaxSize=256
-
-[scalable/status]
-Context=Status
-Size=16
-MinSize=8
-MaxSize=512
-Type=Scalable
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
deleted file mode 100644
index 5c109a3d8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off
-
-echo "Updating icon cache"
-for i in /usr/share/icons/*;do  gtk-update-icon-cache -ft $i &>/dev/null; done
-true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
deleted file mode 100644
index 3856efb2b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/pixmaps name=faces link=/usr/share/pixmaps/calculate/breeze symbolic pkg(kde-plasma/breeze)!=&&pkg(x11-themes/calculate-icon-theme)>=15-r2
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
deleted file mode 100644
index 135376cfc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/pixmaps name=faces link=/usr/share/pixmaps/calculate/oxygen symbolic pkg(kde-frameworks/oxygen-icons)!=&&pkg(kde-plasma/breeze)==&&pkg(x11-themes/calculate-icon-theme)>=15-r2
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
deleted file mode 100644
index 97bc4d504..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/pixmaps name=faces link=/usr/share/pixmaps/calculate/gnome symbolic pkg(kde-frameworks/oxygen-icons)==&&pkg(kde-plasma/breeze)==&&pkg(x11-themes/calculate-icon-theme)>=15-r2
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
deleted file mode 100644
index e1230cce9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/Calculate/48x48/status link=/usr/share/pixmaps/calculate/avatar-default.png mirror symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
deleted file mode 100644
index 761369a31..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
deleted file mode 100644
index b3aa7d598..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/elementary name=panel
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
deleted file mode 100644
index 354bbb30f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/elementary/scalable/apps name=start-calculate.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
deleted file mode 100644
index 15d4319c0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/elementary/scalable/apps link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
deleted file mode 100644
index 36b77c313..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/elementary/actions/symbolic link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
deleted file mode 100644
index 5880045d3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r7
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
deleted file mode 100644
index 2d6a81337..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons name=gnome
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
deleted file mode 100644
index 2a0be871a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/gnome/scalable/apps name=start-calculate.svg link=/usr/share/pixmaps/calculate/start-here-brown.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
deleted file mode 100644
index 1a8afa1b2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/gnome/scalable/apps link=/usr/share/pixmaps/calculate/start-here-brown.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
deleted file mode 100644
index de4f78fbc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/themes/Adwaita name=metacity-1
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
deleted file mode 100644
index 9193caf50..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge(x11-themes/gnome-themes-standard)!=&&pkg(x11-themes/gnome-themes-standard)!= path=/usr/share/themes name=Calculate
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png
deleted file mode 100644
index 0c804fa53..000000000
Binary files a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png
deleted file mode 100644
index 935f9188d..000000000
Binary files a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png
deleted file mode 100644
index 9cdc1f0ef..000000000
Binary files a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
deleted file mode 100644
index 4c6895777..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,275 +0,0 @@
-include '/usr/share/themes/Adwaita/gtk-2.0/gtkrc'
-
-gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5"
-
-style "scrollbar" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "clearlooks" {
-		hint = "scrollbar"
-		colorize_scrollbar = TRUE
-		style = GUMMY
-	}
-}
-
-style "hscrollbar" {
-
-	engine "clearlooks" {
-		hint = "hscrollbar"
-		colorize_scrollbar = TRUE
-		style = GUMMY
-	}
-}
-
-style "vscrollbar" {
-
-	engine "clearlooks" {
-		hint = "vscrollbar"
-		colorize_scrollbar = TRUE
-		style = GUMMY
-	}
-}
-
-
-style "default" {
-	GtkScrollbar::trough-border = 0
-	GtkRange::trough-border     = 2
-	GtkRange::slider-width      = 15
-	GtkRange::stepper-size      = 15
-
-	GtkScrollbar::activate-slider               = 1
-	GtkScrollbar::has-backward-stepper          = 1
-	GtkScrollbar::has-forward-stepper           = 1
-	GtkScrollbar::min-slider-length             = 30
-	GtkScrolledWindow::scrollbar-spacing        = 3
-	GtkScrolledWindow::scrollbars-within-bevel  = 0
-	GtkButton::inner-border                     = {2, 2, 2, 2}
-	####################
-	# Color Definitions
-	####################
-	bg[NORMAL]        = @bg_color
-	bg[PRELIGHT]      = shade (1.02, @bg_color)
-	bg[SELECTED]      = @selected_bg_color
-	bg[INSENSITIVE]   = @bg_color
-	bg[ACTIVE]        = shade (0.9, @bg_color)
-
-	fg[NORMAL]        = @fg_color
-	fg[PRELIGHT]      = @fg_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-	fg[ACTIVE]        = @fg_color
-
-	text[NORMAL]      = @text_color
-	text[PRELIGHT]    = @text_color
-	text[SELECTED]    = @selected_fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-	text[ACTIVE]      = @selected_fg_color
-
-	base[NORMAL]      = @base_color
-	base[PRELIGHT]    = shade (0.95, @bg_color)
-	base[SELECTED]    = @selected_bg_color
-	base[INSENSITIVE] = @bg_color
-	base[ACTIVE]      = shade (0.9, @selected_bg_color)
-}
-
-class "GtkWidget" style "default"
-class "GtkScrollbar" style "scrollbar"
-class "GtkHScrollbar" style "hscrollbar"
-class "GtkVScrollbar" style "vscrollbar"
-
-style "panel"
-{
-    engine "clearlooks" {
-    }
-    #active text color
-    fg[ACTIVE]        = "#dddddd"
-    #text color
-    fg[NORMAL]        = "#cccccc"
-    #color of the text when you hover
-    fg[PRELIGHT]      = "#cccccc"
-    #window boarders switch desktops
-    fg[SELECTED]      = "#cccccc"
-
-    #background of the active element
-    bg[ACTIVE]        = "#333333"
-    #background and stroke
-    bg[NORMAL]        = "#000000"
-    #background under the mouse
-    bg[PRELIGHT]      = "#333333"
-    #light window switch desktops
-    bg[SELECTED]      = "#aaaaaa"
-
-}
-
-style "calculate-clock"
-{
-    font_name = "Droid Sans 20"
-}
-
-style "workspace-switcher" = "panel"
-{
-    #background of the active element
-    bg[ACTIVE]        = "#333333"
-    #background and stroke
-    bg[NORMAL]        = "#444444"
-    #background under the mouse
-    bg[PRELIGHT]      = "#333333"
-    #light window switch desktops
-    bg[SELECTED]      = "#aaaaaa"
-}
-
-widget "*PanelWidget*"          style "panel"
-widget "*PanelApplet*"          style "panel"
-widget "*fast-user-switch*"     style "panel"
-widget "*gdm-user-switch*"      style "panel"
-widget "*CPUFreq*Applet*"       style "panel"
-widget "*indicator-applet*"     style "panel"
-class "PanelApp*"               style "panel"
-class "PanelToplevel*"          style "panel"
-widget_class "*PanelToplevel*"  style "panel"
-widget_class "*notif*"          style "panel"
-widget_class "*Notif*"          style "panel"
-widget_class "*Tray*"           style "panel"
-widget_class "*tray*"           style "panel"
-widget_class "*computertemp*"   style "panel"
-widget_class "*Applet*Tomboy*"  style "panel"
-widget_class "*Applet*Netstatus*"       style "panel"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"           style "panel"
-class "*Xfce*Panel*"            style "panel"
-widget "*WnckPager*"        style "workspace-switcher"
-
-style "xfdesktop-icon-view" {
-    XfdesktopIconView::label-alpha = 0
-    XfdesktopIconView::selected-label-alpha = 100
-    XfdesktopIconView::ellipsize-icon-labels = 0
-
-    XfdesktopIconView::shadow-x-offset = 1
-    XfdesktopIconView::shadow-y-offset = 1
-    XfdesktopIconView::shadow-color = "#000000"
-    XfdesktopIconView::selected-shadow-x-offset = 0
-    XfdesktopIconView::selected-shadow-y-offset = 0
-    XfdesktopIconView::selected-shadow-color = "#000000"
-
-    XfdesktopIconView::cell-spacing = 0
-    XfdesktopIconView::cell-padding = 0
-    XfdesktopIconView::cell-text-width-proportion = 2.3
-
-    base[NORMAL] = "#91d7fd"
-    base[SELECTED] = "#91d7fd"
-    base[ACTIVE] = "#FFFFFF"
-
-    fg[NORMAL] = "#FFFFFF"
-    fg[SELECTED] = "#FFFFFF"
-    fg[ACTIVE] = "#FFFFFF"
-
-}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-style "xfce-panel-window-style"
-{
-    # Time in miliseconds before the panel will unhide on an enter event
-    XfcePanelWindow::popup-delay = 100
-
-    # Time in miliseconds before the panel will hide on a leave event
-    XfcePanelWindow::popdown-delay = 250
-
-    # Size of autohide window in pixels
-    XfcePanelWindow::autohide-size = 1
-}
-class "XfcePanelWindow" style "xfce-panel-window-style"
-
-style "tooltips"
-{
-    xthickness = 7
-    ythickness = 4
-
-    GtkWidget::new-tooltip-style = 1
-
-    bg[NORMAL]  = "#2c2c2c"
-    bg[SELECTED]    = "#2c2c2c"
-    fg[NORMAL]  = "#ffffff"
-
-}
-
-widget "*tooltip*" style:highest "tooltips"
-
-style "xfce-notifies-window"
-{
-    bg[NORMAL] = "#000000"
-    XfceNotifyWindow::border-color = "#444444"
-    XfceNotifyWindow::border-width = 1.0
-    XfceNotifyWindow::border-color-hover = "#444444"
-    XfceNotifyWindow::border-width-hover = 1.0
-}
-class "XfceNotifyWindow" style "xfce-notifies-window"
-widget "*clock*"          style "calculate-clock"
-
-style "entry_calculate"
-{
-	xthickness	= 3
-	ythickness   	= 4
-
-        base[NORMAL] = @base_color
-        base[INSENSITIVE] = @insensitive_bg_color
-
-	engine "pixmap"
-	{
-	image
-	{
-		function		= SHADOW
-		detail			= "entry"
-                state                   = NORMAL
-		shadow			= IN
-		file			= "Others/entry-border-bg-solid.png"
-		border			= { 4, 4, 4, 4 }
-		stretch			= TRUE
-	}
-	image
-	{
-	        function                = FLAT_BOX
-	        detail                  = "entry_bg"
-	        state                   = NORMAL
-		file			= "Others/white_bg.png"
-		border			= { 0, 0, 0, 0 }
-		stretch			= TRUE
-	}
-	image
-	{
-	        function                = FLAT_BOX
-	        detail                  = "entry_bg"
-	        state                   = ACTIVE
-		file			= "Others/white_bg.png"
-		border			= { 0, 0, 0, 0 }
-		stretch			= TRUE
-	}
-    }
-}
-
-style "combobox_calculate"
-{
-	xthickness	= 2
-	ythickness   	= 4
-
-	engine "pixmap"
-	{
-        # LTR version
-	image
-	{
-		function		= SHADOW
-		detail			= "entry"
-                state                   = NORMAL
-		shadow			= IN
-		#file			= "Entry/combo-entry-border-bg.png"
-		file			= "Others/combo-entry-border-bg-solid.png"
-		border			= { 4, 4, 4, 4 }
-		stretch			= TRUE
-                direction               = LTR
-	}
-    }
-}
-
-class "GtkEntry"           		style "entry_calculate"
-widget_class "*<GtkComboBoxEntry>*<GtkEntry>"   style "combobox_calculate"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0 b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
deleted file mode 100644
index 1d82144cd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge(x11-themes/gnome-themes-standard)!=&&pkg(x11-themes/gnome-themes-standard)<3.12.0&&exists(/usr/share/themes/Calculate/gtk-3.0)== path=/usr/share/themes/Calculate name=gtk-3.0 link=/usr/share/themes/Adwaita/gtk-3.0 symbolic 
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
deleted file mode 100644
index 5181bb574..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/themes/Adwaita name=gtk-3.0
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
deleted file mode 100644
index 83fa7117d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
+++ /dev/null
@@ -1,75 +0,0 @@
-#?pkg(x11-misc/lightdm-gtk-greeter)>=1.6#
-#panel_window,
-#menubar {
-    background-color: @lightdm_bg_color;
-    background-image: none;
-    color: @lightdm_fg_color;
-    /*border-bottom-color: alpha(@light_shadow,0.2);*/
-    text-shadow: 0px 1px alpha(@dark_shadow, 0.8);
-    border-style: solid;
-    border-width: 0px 0px 0px 0px;
-    padding: 0;
-}
-
-#menubar * {
-    text-shadow: none;
-}
-
-#menubar *:hover {
-    text-shadow: 0px 1px alpha(@dark_shadow, 0.8);
-}
-
-#panel_window.menubar.menuitem:hover,
-#panel_window.menubar .menuitem:hover,
-#panel_window .menubar.menuitem:hover {
-    background-color: shade(@selected_bg_color, 0.9);
-    border-color: shade(@theme_selected_bg_color, 1.1);
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                     from (shade(@theme_selected_bg_color, 1.2)),
-                                     to (shade(@theme_selected_bg_color, 1.0)));
-}
-
-#logo {
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 4px;
-    border-color: alpha(@dark_shadow,0.9);
-    padding: 3px;
-    box-shadow: inset 1px 0px alpha(@light_shadow, 0.2),
-                inset -1px 0px alpha(@light_shadow, 0.2),
-                inset 0px 1px alpha(@light_shadow, 0.3),
-                inset 0px -1px alpha(@light_shadow, 0.1);
-}
-
-#greeter_infobar {
-    color: @lightdm_fg_color;
-    background-color: shade(@selected_bg_color, 0.9);
-    color: #cc0000;
-    text-shadow: 1px 1px alpha(@dark_shadow, 1);
-}
-
-#user_image {
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 4px;
-    border-color: #999999;
-    padding: 3px;
-}
-#pkg#
-#?pkg(x11-misc/lightdm-gtk-greeter)<1.6#
-#panel_window #menubar {
-    background-color: @lightdm_bg_color;
-    background-image: none;
-    color: @lightdm_fg_color;
-}
-
-#panel_window .menubar.menuitem:focus,
-#panel_window .menubar .menuitem:focus {
-    border-color: alpha(@theme_selected_bg_color, 0.4);
-
-    box-shadow: inset 1px 0 alpha(@theme_selected_bg_color, 0.4),
-                inset 0 1px alpha(@theme_selected_bg_color, 0.4),
-                inset -1px 0 alpha(@theme_selected_bg_color, 0.4),
-                inset 0 -1px alpha(@theme_selected_bg_color, 0.4);
-}
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
deleted file mode 100644
index 6f42da05e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate pkg(x11-themes/gnome-themes-standard)>=3.8
-
-/* lightdm greeter color scheme */
-@define-color lightdm_bg_color #000000;
-@define-color lightdm_fg_color #ffffff;
-
-@import url("resource:///org/gnome/adwaita/gtk-main.css");
-@import url("apps/lightdm-gtk-greeter.css");
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
deleted file mode 100644
index 4f908cb54..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate
-
-/* lightdm greeter color scheme */
-@define-color lightdm_bg_color #000000;
-@define-color lightdm_fg_color #ffffff;
-
-@import url("resource:///org/gnome/adwaita/gtk-main.css");
-@import url("apps/lightdm-gtk-greeter.css");
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
deleted file mode 100644
index 03fe456c9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/icons/HighContrast name=index.theme
-
-[Icon Theme]
-Hidden=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
deleted file mode 100644
index b453f61c5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch
-<reg>x="\(0[^\n]+</reg>
-<text>x="3"</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/.calculate_directory
deleted file mode 100644
index 1e52eeb0d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/themes/Greybird name=gtk-3.0 merge=x11-misc/lightdm-gtk-greeter
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
deleted file mode 100644
index 1038d69e1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
+++ /dev/null
@@ -1,35 +0,0 @@
-# Calculate format=patch dotall
-<reg>#message_label \{.*?\}</reg>
-<text>#login_window * GtkAlignment GtkLabel {
-    color: #ff401a;
-}</text>
-<reg>#user_image \{.*?\}</reg>
-<text>#user_image {
-    padding: 3px;
-}</text>
-<reg>#restart_button {.*?background-color:.*?;</reg>
-<text>#restart_button {
-    background-color: transparent;</text>
-<reg>#panel_window &gt; #menubar \{.*?background-image:.*?;</reg>
-<text>#panel_window &gt; #menubar {
-    background-color: @lightdm_bg_color;
-    background-image: linear-gradient(to bottom,
-                                      shade(@lightdm_bg_color, 0.5),
-                                      shade(@lightdm_bg_color, 0.5));</text>
-<reg>#panel_window .menubar.menuitem:hover \{.*?\}</reg>
-<text>#panel_window .menubar.menuitem:hover {
-    background-color: shade(@selected_bg_color, 0.9);
-    border: none;
-    background-image: linear-gradient(to bottom,
-                                      shade(@dark_shadow, 1.2),
-                                      shade(@dark_shadow, 1.0));
-}</text>
-<reg>#login_notebook \{
-    background-color:</reg>
-<text>#login_notebook {
-    background-image: linear-gradient(to bottom,
-                                      shade(@lightdm_bg_color, 2.0),
-                                      shade(@lightdm_bg_color, 0.5));
-    background-color:</text>
-<reg>(#panel_window &gt; #menubar &gt; .menuitem:active,[^}]+background-image).*?;</reg>
-<text>\1: none;</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/gtk.css b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/gtk.css
deleted file mode 100644
index 3f11770f7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/greybird/gtk.css
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=patch multiline
-<reg>define-color selected_bg_color .*;</reg>
-<text>define-color selected_bg_color #74cce7;</text>
-<reg>define-color error_bg_color .*;</reg>
-<text>define-color error_bg_color transparent;</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
deleted file mode 100644
index 6d0579e82..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=||merge(x11-themes/gnome-icon-theme)!=&&pkg(x11-themes/gnome-icon-theme)!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
deleted file mode 100644
index 5c109a3d8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off
-
-echo "Updating icon cache"
-for i in /usr/share/icons/*;do  gtk-update-icon-cache -ft $i &>/dev/null; done
-true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
deleted file mode 100644
index 5880045d3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r7
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
deleted file mode 100644
index 9045a25a2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/icons/ContrastHigh name=index.theme
-
-[Icon Theme]
-Hidden=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
deleted file mode 100644
index 1e6d20934..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons name=mate
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
deleted file mode 100644
index 103a8559b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
deleted file mode 100644
index cf3db3695..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/mate/scalable/apps name=start-calculate.svg link=/usr/share/pixmaps/calculate/start-here-light-green.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
deleted file mode 100644
index 1d2f7a09d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/Fog/scalable/apps name=start-here.svg link=/usr/share/pixmaps/calculate/start-here-blue.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
deleted file mode 100644
index ae96b501b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/menta/scalable/apps name=start-here.svg link=/usr/share/pixmaps/calculate/start-here-light-green.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
deleted file mode 100644
index 91f51cdc2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/mate/scalable/apps link=/usr/share/pixmaps/calculate/start-here-light-green.svg symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
deleted file mode 100644
index 579a1cfc3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/usr/share
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
deleted file mode 100644
index 38a0a0836..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-
-# Hide icon
-[Desktop Entry]
-OnlyShowIn=X-NeverShowThis;
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
deleted file mode 100644
index 38a0a0836..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-
-# Hide icon
-[Desktop Entry]
-OnlyShowIn=X-NeverShowThis;
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-preferred-applications.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-preferred-applications.desktop
deleted file mode 100644
index 38a0a0836..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-preferred-applications.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-
-# Hide icon
-[Desktop Entry]
-OnlyShowIn=X-NeverShowThis;
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
deleted file mode 100644
index 38a0a0836..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-
-# Hide icon
-[Desktop Entry]
-OnlyShowIn=X-NeverShowThis;
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
deleted file mode 100644
index 38a0a0836..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-
-# Hide icon
-[Desktop Entry]
-OnlyShowIn=X-NeverShowThis;
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
deleted file mode 100644
index 492f95f9e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/usr/share/xfce4
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
deleted file mode 100644
index 6fb604a94..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Chromium
-Comment=Open-source version of Google Chrome web browser
-Exec=chromium %U
-TryExec=chromium
-Icon=chromium-browser
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
-Categories=Network;WebBrowser;
-X-XFCE-Category=WebBrowser
-X-XFCE-Commands=chromium
-X-XFCE-CommandsWithParameter=chromium "%s"
-Type=X-XFCE-Helper
-X-XFCE-Category=WebBrowser
-X-XFCE-Commands=chromium
-X-XFCE-CommandsWithParameter=chromium "%s"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/thunar/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/thunar/.calculate_directory
deleted file mode 100644
index 35fa86335..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/thunar/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/xdg name=Thunar
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/thunar/uca.xml b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/thunar/uca.xml
deleted file mode 100644
index b23c87674..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/thunar/uca.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=patch
-<reg>&lt;/action&gt;
-(  &lt;action&gt;
-    &lt;icon&gt;edit-find&lt;/icon&gt;
-    &lt;patterns&gt;*&lt;/patterns&gt;
-    &lt;name&gt;Search&lt;/name&gt;
-    &lt;name xml:lang="ru"&gt;Пои�к&lt;/name&gt;
-    &lt;command&gt;catfish --fileman=thunar --path=%f&lt;/command&gt;
-    &lt;description&gt;find files or filders&lt;/description&gt;
-    &lt;description xml:lang="ru"&gt;найти файлы и папки&lt;/description&gt;
-    &lt;directories/&gt;
-  &lt;/action&gt;)?
-</reg>
-<text>&lt;/action&gt;
-#?pkg(dev-util/catfish)!=#  &lt;action&gt;
-    &lt;icon&gt;edit-find&lt;/icon&gt;
-    &lt;patterns&gt;*&lt;/patterns&gt;
-    &lt;name&gt;Search&lt;/name&gt;
-    &lt;name xml:lang="ru"&gt;Пои�к&lt;/name&gt;
-    &lt;command&gt;catfish %f&lt;/command&gt;
-    &lt;description&gt;find files or filders&lt;/description&gt;
-    &lt;description xml:lang="ru"&gt;найти файлы и папки&lt;/description&gt;
-    &lt;directories/&gt;
-  &lt;/action&gt;
-#pkg#</text>
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
deleted file mode 100644
index 3b92b56db..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share name=applications
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
deleted file mode 100644
index 98faf71fc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
deleted file mode 100644
index 5b855a52b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6 append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
deleted file mode 100644
index ca5cc5009..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons name=hicolor
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
deleted file mode 100644
index 81515d68c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/icons/hicolor/symbolic/apps link=/usr/share/pixmaps/calculate/start-here-blue.svg mirror symbolic
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
deleted file mode 100644
index f2f963792..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/usr/share/xsessions
-
-[Desktop Entry]
-Name[ru]=Сеан� Xfce
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/xflock4 b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/xflock4
deleted file mode 100755
index 9845a01b2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfce4-session/xflock4
+++ /dev/null
@@ -1,66 +0,0 @@
-# Calculate chmod=0755 chown=root:root path=/usr/bin
-#!/bin/sh
-#
-#  xfce4
-#
-#  Copyright (C) 1999, 2003 Olivier Fourdan (fourdan@xfce.org)
-#  Copyright (C) 2011       Guido Berhoerster (guido+xfce.org@berhoerster.name)
-#  Copyright (C) 2011       Jarno Suni (8@iki.fi)
-#  Copyright (C) 2013       Mir Calculate (support@calculate-linux.ru)
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-PATH=/bin:/usr/bin
-export PATH
-
-# spawn xflock4 before suspend contains DISPLAY without dot symbol
-# wait several seconds before the dm-tool running if it's the suspend
-SLEEPCMD=:
-[ "${DISPLAY}" == "${DISPLAY/./}" ] && SLEEPCMD="sleep 2"
-# lock screen by gnome-screensaver and activate lightdm user switch
-if type dm-tool &>/dev/null; then
-    if type gnome-screensaver-command &>/dev/null; then
-        gnome-screensaver-command --lock &>/dev/null &&
-            $SLEEPCMD && dm-tool lock &>/dev/null && exit
-    else
-        dm-tool lock &>/dev/null && exit
-    fi
-fi
-
-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-for lock_cmd in \
-    "xscreensaver-command -lock" \
-    "gnome-screensaver-command --lock"
-do
-    $lock_cmd >/dev/null 2>&1 && exit
-done
-
-# else run another access locking utility, if installed
-for lock_cmd in \
-  "xlock -mode blank" \
-  "slock"
-  do
-    set -- $lock_cmd
-    if command -v -- $1 >/dev/null 2>&1; then
-        $lock_cmd >/dev/null 2>&1 &
-	# turn off display backlight:
-	xset dpms force off
-        exit
-    fi
-done
-
-# else access locking failed
-exit 1
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/kioskrc b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
deleted file mode 100644
index aed65cca4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/xdg/xfce4/kiosk
-
-[xfce4-session]
-!Shutdown=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
deleted file mode 100644
index f8ee42ae6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/usr/share/backgrounds/xfce
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-extra/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-extra/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-extra/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
deleted file mode 100644
index 1e510bed8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip pkg(x11-themes/calculate-icon-theme)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/.calculate_directory
deleted file mode 100644
index 66f1ab5b9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share name=applications
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/.calculate_directory
deleted file mode 100644
index a01a00af7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(www-client/qupzilla)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/.calculate_directory
deleted file mode 100644
index 23bed9f73..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(www-client/qupzilla)!=&&ini(desktop.browser)==||pkg(www-client/qupzilla)!=&&ini(desktop.browser)==qupzilla
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/mimeapps.list
deleted file mode 100644
index 115ca088d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/mimeapps.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.browser, qupzilla)-#
-
-[Added Associations]
-application/rss+xml=qupzilla.desktop;
-application/vnd.mozilla.xul+xml=qupzilla.desktop;
-application/x-font-ttx=qupzilla.desktop;
-application/xhtml+xml=qupzilla.desktop;
-application/xml=qupzilla.desktop;
-application/xml-external-parsed-entity=qupzilla.desktop;
-application/xsd=qupzilla.desktop;
-application/xslt+xml=qupzilla.desktop;
-application/x-ufraw=qupzilla.desktop;
-text/html=qupzilla.desktop;
-x-scheme-handler/http=qupzilla.desktop;
-x-scheme-handler/https=qupzilla.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/qupzilla.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/qupzilla.desktop
deleted file mode 100644
index bcf7ac4f8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/install/qupzilla.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/qupzilla.desktop name=calculate-browser.desktop mirror pkg(www-client/qupzilla)>=1.8
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/uninstall
deleted file mode 100644
index 904cf538b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/10-qupzilla/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(www-client/qupzilla)==&&ini(desktop.browser)==qupzilla
-
-[desktop]
-!browser=
-browser-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
deleted file mode 100644
index 0c0b1cba5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(www-client/chromium)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
deleted file mode 100644
index 8555464d1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(www-client/chromium)!=&&ini(desktop.browser)==||pkg(www-client/chromium)!=&&ini(desktop.browser)==chromium
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
deleted file mode 100644
index 4c36e7af4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/chromium-browser-chromium.desktop name=calculate-browser.desktop mirror pkg(www-client/chromium)>=11.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
deleted file mode 100644
index 5005e1f70..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.browser, chromium)-#
-
-[Added Associations]
-application/rss+xml=chromium-browser-chromium.desktop;
-application/vnd.mozilla.xul+xml=chromium-browser-chromium.desktop;
-application/x-font-ttx=chromium-browser-chromium.desktop;
-application/xhtml+xml=chromium-browser-chromium.desktop;
-application/xml=chromium-browser-chromium.desktop;
-application/xml-external-parsed-entity=chromium-browser-chromium.desktop;
-application/xsd=chromium-browser-chromium.desktop;
-application/xslt+xml=chromium-browser-chromium.desktop;
-application/x-ufraw=chromium-browser-chromium.desktop;
-text/html=chromium-browser-chromium.desktop;
-x-scheme-handler/http=chromium-browser-chromium.desktop;
-x-scheme-handler/https=chromium-browser-chromium.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
deleted file mode 100644
index 3df3cfbb5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(www-client/chromium)==&&ini(desktop.browser)==chromium
-
-[desktop]
-!browser=
-browser-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/.calculate_directory
deleted file mode 100644
index c843d6f6a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(www-client/firefox)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/.calculate_directory
deleted file mode 100644
index 5da7a390a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(www-client/firefox)!=&&ini(desktop.browser)==||pkg(www-client/firefox)!=&&ini(desktop.browser)==firefox
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/firefox-10.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/firefox-10.desktop
deleted file mode 100644
index 604ee48db..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/firefox-10.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/firefox.desktop name=calculate-browser.desktop mirror pkg(www-client/firefox)>=10.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/mimeapps.list
deleted file mode 100644
index 034caa406..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/install/mimeapps.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.browser, firefox)-#
-
-[Added Associations]
-application/rss+xml=firefox.desktop;
-application/vnd.mozilla.xul+xml=firefox.desktop;
-application/x-font-ttx=firefox.desktop;
-application/xhtml+xml=firefox.desktop;
-application/xml=firefox.desktop;
-application/xml-external-parsed-entity=firefox.desktop;
-application/xsd=firefox.desktop;
-application/xslt+xml=firefox.desktop;
-application/x-ufraw=firefox.desktop;
-text/html=firefox.desktop;
-x-scheme-handler/http=firefox.desktop;
-x-scheme-handler/https=firefox.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/uninstall
deleted file mode 100644
index c11a83c7e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/30-firefox/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(www-client/firefox)==&&ini(desktop.browser)==firefox
-
-[desktop]
-!browser=
-browser-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/.calculate_directory
deleted file mode 100644
index 92be53bda..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(www-client/firefox-bin)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/.calculate_directory
deleted file mode 100644
index 972a667ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(www-client/firefox-bin)!=&&ini(desktop.browser)==||pkg(www-client/firefox-bin)!=&&ini(desktop.browser)==firefox-bin
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/firefox-bin-10.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/firefox-bin-10.desktop
deleted file mode 100644
index 14026436f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/firefox-bin-10.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/firefox-bin.desktop name=calculate-browser.desktop mirror pkg(www-client/firefox-bin)>=10.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/mimeapps.list
deleted file mode 100644
index c2be8d2b5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/install/mimeapps.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.browser, firefox-bin)-#
-
-[Added Associations]
-application/rss+xml=firefox-bin.desktop;
-application/vnd.mozilla.xul+xml=firefox-bin.desktop;
-application/x-font-ttx=firefox-bin.desktop;
-application/xhtml+xml=firefox-bin.desktop;
-application/xml=firefox-bin.desktop;
-application/xml-external-parsed-entity=firefox-bin.desktop;
-application/xsd=firefox-bin.desktop;
-application/xslt+xml=firefox-bin.desktop;
-application/x-ufraw=firefox-bin.desktop;
-text/html=firefox-bin.desktop;
-x-scheme-handler/http=firefox-bin.desktop;
-x-scheme-handler/https=firefox-bin.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/uninstall
deleted file mode 100644
index 6213f1527..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/40-firefox-bin/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(www-client/firefox-bin)==&&ini(desktop.browser)==firefox-bin
-
-[desktop]
-!browser=
-browser-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
deleted file mode 100644
index 7690b2951..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(www-client/epiphany)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
deleted file mode 100644
index 312618287..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(www-client/epiphany)!=&&ini(desktop.browser)==||pkg(www-client/epiphany)!=&&ini(desktop.browser)==epiphany
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
deleted file mode 100644
index 58d3d4150..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/epiphany.desktop name=calculate-browser.desktop mirror pkg(www-client/epiphany)>=3.18
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
deleted file mode 100644
index 15be035bc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.browser, epiphany)-#
-
-[Added Associations]
-application/rss+xml=epiphany.desktop;
-application/vnd.mozilla.xul+xml=epiphany.desktop;
-application/x-font-ttx=epiphany.desktop;
-application/xhtml+xml=epiphany.desktop;
-application/xml=epiphany.desktop;
-application/xml-external-parsed-entity=epiphany.desktop;
-application/xsd=epiphany.desktop;
-application/xslt+xml=epiphany.desktop;
-application/x-ufraw=epiphany.desktop;
-text/html=epiphany.desktop;
-x-scheme-handler/http=epiphany.desktop;
-x-scheme-handler/https=epiphany.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
deleted file mode 100644
index 53374c40a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(www-client/epiphany)==&&ini(desktop.browser)==epiphany
-
-[desktop]
-!browser=
-browser-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/.calculate_directory
deleted file mode 100644
index b21f40acf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(www-client/opera)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/.calculate_directory
deleted file mode 100644
index 95b1d7f02..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(www-client/opera)!=&&ini(desktop.browser)==||pkg(www-client/opera)!=&&ini(desktop.browser)==opera
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/mimeapps.list
deleted file mode 100644
index 1239cd60b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/mimeapps.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.browser, opera)-#
-
-[Added Associations]
-application/rss+xml=opera.desktop;
-application/vnd.mozilla.xul+xml=opera.desktop;
-application/x-font-ttx=opera.desktop;
-application/xhtml+xml=opera.desktop;
-application/xml=opera.desktop;
-application/xml-external-parsed-entity=opera.desktop;
-application/xsd=opera.desktop;
-application/xslt+xml=opera.desktop;
-application/x-ufraw=opera.desktop;
-text/html=opera.desktop;
-x-scheme-handler/http=opera.desktop;
-x-scheme-handler/https=opera.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/opera-12.11.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/opera-12.11.desktop
deleted file mode 100644
index 155c53f9b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/install/opera-12.11.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/opera-browser.desktop name=calculate-browser.desktop mirror pkg(www-client/opera)>=12.11
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/uninstall
deleted file mode 100644
index 5d47cd695..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/60-opera/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(www-client/opera)==&&ini(desktop.browser)==opera
-
-[desktop]
-!browser=
-browser-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
deleted file mode 100644
index e901a0165..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=compiz protected ini(desktop.browser-removing)==on merge=www-client/qupzilla,www-client/chromium,www-client/firefox,www-client/firefox-bin,www-client/epiphany,www-client/opera
-
-#-ini(desktop.browser-removing,)-#
-
-[Added Associations]
-!application/rss+xml=
-!application/vnd.mozilla.xul+xml=
-!application/x-font-ttx=
-!application/xhtml+xml=
-!application/xml=
-!application/xml-external-parsed-entity=
-!application/xsd=
-!application/xslt+xml=
-!application/x-ufraw=
-!text/html=
-!x-scheme-handler/http=
-!x-scheme-handler/https=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
deleted file mode 100644
index 9f730db7a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(kde-apps/kmail)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
deleted file mode 100644
index efab385b2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(kde-apps/kmail)!=&&ini(desktop.mail)==||pkg(kde-apps/kmail)!=&&ini(desktop.mail)==kmail
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop
deleted file mode 100644
index 7131793e3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/KMail2.desktop name=calculate-mail.desktop mirror pkg(kde-apps/kmail)>=4.9
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/64x64/apps/kmail.png)-#
-Icon=/usr/share/icons/hicolor/64x64/apps/kmail.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
deleted file mode 100644
index 3d8b9fcfa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.mail, kmail)-#
-
-[Added Associations]
-x-scheme-handler/mailto=KMail2.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
deleted file mode 100644
index 0eeba7170..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-apps/kmail)==&&ini(desktop.mail)==kmail
-
-[desktop]
-!mail=
-mail-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
deleted file mode 100644
index 8dd70be17..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(mail-client/evolution)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
deleted file mode 100644
index c4dc405ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(mail-client/evolution)!=&&ini(desktop.mail)==||pkg(mail-client/evolution)!=&&ini(desktop.mail)==evolution
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
deleted file mode 100644
index a4ce2084d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/evolution.desktop name=calculate-mail.desktop mirror pkg(mail-client/evolution)>=2.32
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
deleted file mode 100644
index 7fa218412..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.mail, evolution)-#
-
-[Added Associations]
-x-scheme-handler/mailto=evolution.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
deleted file mode 100644
index 0d8ef6bc5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(mail-client/evolution)==&&ini(desktop.mail)==evolution
-
-[desktop]
-!mail=
-mail-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
deleted file mode 100644
index e7f5fce91..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(mail-client/claws-mail)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
deleted file mode 100644
index dc204dfb7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(mail-client/claws-mail)!=&&ini(desktop.mail)==||pkg(mail-client/claws-mail)!=&&ini(desktop.mail)==claws-mail
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
deleted file mode 100644
index c5fe839e6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/claws-mail.desktop name=calculate-mail.desktop mirror pkg(mail-client/claws-mail)>=3.7
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
deleted file mode 100644
index 722e650c7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.mail, claws-mail)-#
-
-[Added Associations]
-x-scheme-handler/mailto=claws-mail.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
deleted file mode 100644
index 887302e0d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(mail-client/claws-mail)==&&ini(desktop.mail)==claws-mail
-
-[desktop]
-!mail=
-mail-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
deleted file mode 100644
index 91c98296a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(mail-client/trojita)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
deleted file mode 100644
index a3e0290b3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(mail-client/trojita)!=&&ini(desktop.mail)==||pkg(mail-client/trojita)!=&&ini(desktop.mail)==trojita
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
deleted file mode 100644
index 421ddae83..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.mail, trojita)-#
-
-[Added Associations]
-x-scheme-handler/mailto=trojita.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
deleted file mode 100644
index 4e73bb749..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/trojita.desktop name=calculate-mail.desktop mirror pkg(mail-client/trojita)>=0.7
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
deleted file mode 100644
index 887302e0d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(mail-client/claws-mail)==&&ini(desktop.mail)==claws-mail
-
-[desktop]
-!mail=
-mail-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
deleted file mode 100644
index 7165788e2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=compiz protected ini(desktop.mail-removing)==on merge=kde-apps/kmail,mail-client/evolution,mail-client/claws-mail,mail-client/trojita
-
-#-ini(desktop.mail-removing,)-#
-
-[Added Associations]
-!x-scheme-handler/mailto=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
deleted file mode 100644
index 6b2889997..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(net-irc/konversation)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
deleted file mode 100644
index 107e9d8ca..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(net-irc/konversation)!=&&ini(desktop.chat)==||pkg(net-irc/konversation)!=&&ini(desktop.chat)==konversation
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
deleted file mode 100644
index 3e6b07b0c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/konversation.desktop name=calculate-chat.desktop mirror pkg(net-irc/konversation)>=1.4&&pkg(net-irc/konversation)<1.6
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
deleted file mode 100644
index 55a38c5f1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.kde.konversation.desktop name=calculate-chat.desktop mirror pkg(net-irc/konversation)>=1.6
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/64x64/apps/konversation.png)-#
-Icon=/usr/share/icons/hicolor/64x64/apps/konversation.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
deleted file mode 100644
index ee00b1f7b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.chat, konversation)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
deleted file mode 100644
index 4d8c97d2b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(net-irc/konversation)==&&ini(desktop.chat)==konversation
-
-[desktop]
-!chat=
-chat-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
deleted file mode 100644
index 89da7801b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(net-irc/hexchat)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
deleted file mode 100644
index 2d24ad246..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(net-irc/hexchat)!=&&ini(desktop.chat)==||pkg(net-irc/hexchat)!=&&ini(desktop.chat)==hexchat
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
deleted file mode 100644
index 27f657e89..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/hexchat.desktop name=calculate-chat.desktop mirror pkg(net-irc/hexchat)>=2.9
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-
-Name=Calculate Linux Community
-Name[bg]=Calculate Linux Общно�т
-Name[ru]=Сообще�тво Calculate Linux
-Name[uk]=Cпівтовари�тво Calculate Linux
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
deleted file mode 100644
index 7a62d04e3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.chat, hexchat)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
deleted file mode 100644
index 756f029a6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(net-irc/hexchat)==&&ini(desktop.chat)==hexchat
-
-[desktop]
-!chat=
-chat-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
deleted file mode 100644
index 50db38f2d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(net-irc/kvirc)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
deleted file mode 100644
index 40a83310c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(net-irc/kvirc)!=&&ini(desktop.chat)==||pkg(net-irc/kvirc)!=&&ini(desktop.chat)==kvirc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
deleted file mode 100644
index 0f1f33652..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kvirc.desktop name=calculate-chat.desktop mirror pkg(net-irc/kvirc)>=4.99
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-
-Name=Calculate Linux Community
-Name[bg]=Calculate Linux Общно�т
-Name[ru]=Сообще�тво Calculate Linux
-Name[uk]=Cпівтовари�тво Calculate Linux
-Exec=kvirc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
deleted file mode 100644
index d813ce4c8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.chat, kvirc)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
deleted file mode 100644
index f696ade75..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(net-irc/kvirc)==&&ini(desktop.chat)==kvirc
-
-[desktop]
-!chat=
-chat-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
deleted file mode 100644
index 5ff18888c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(net-irc/polari)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
deleted file mode 100644
index 26079c96e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(net-irc/polari)!=&&ini(desktop.chat)==||pkg(net-irc/polari)!=&&ini(desktop.chat)==polari
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
deleted file mode 100644
index 6f8d89d30..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.chat, polari)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
deleted file mode 100644
index 3ecc97eed..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.gnome.Polari.desktop name=calculate-chat.desktop mirror pkg(net-irc/polari)>=3.18
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-
-Name=Calculate Linux Community
-Name[bg]=Calculate Linux Общно�т
-Name[ru]=Сообще�тво Calculate Linux
-Name[uk]=Cпівтовари�тво Calculate Linux
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
deleted file mode 100644
index 9b6775c90..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(net-irc/polari)==&&ini(desktop.chat)==polari
-
-[desktop]
-!chat=
-chat-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
deleted file mode 100644
index 4c7c37b65..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=compiz protected ini(desktop.chat-removing)==on merge=net-irc/konversation,net-irc/hexchat,net-irc/kvirc,net-irc/polari
-
-#-ini(desktop.chat-removing,)-#
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
deleted file mode 100644
index c6b03f55c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(kde-apps/kopete)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
deleted file mode 100644
index af0a50f48..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(kde-apps/kopete)!=&&ini(desktop.im)==||pkg(kde-apps/kopete)!=&&ini(desktop.im)==kopete
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
deleted file mode 100644
index 509d1fbc0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop name=calculate-im.desktop mirror pkg(kde-apps/kopete)>=4.9
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/64x64/apps/kopete.png)-#
-Icon=/usr/share/icons/hicolor/64x64/apps/kopete.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
deleted file mode 100644
index 26b5596fd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.im, kopete)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
deleted file mode 100644
index bdea79174..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-apps/kopete)==&&ini(desktop.im)==kopete
-
-[desktop]
-!im=
-im-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
deleted file mode 100644
index 1d185f81f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(net-im/pidgin)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
deleted file mode 100644
index ed1bcde2e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(net-im/pidgin)!=&&ini(desktop.im)==||pkg(net-im/pidgin)!=&&ini(desktop.im)==pidgin
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
deleted file mode 100644
index 58f8fa329..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.im, pidgin)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
deleted file mode 100644
index 41ad8b44c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/pidgin.desktop name=calculate-im.desktop mirror pkg(net-im/pidgin)>=2.10
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
deleted file mode 100644
index 1595d80c9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(net-im/pidgin)==&&ini(desktop.im)==pidgin
-
-[desktop]
-!im=
-im-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
deleted file mode 100644
index 34e16858c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(net-im/qutim)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
deleted file mode 100644
index eb410c686..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(net-im/qutim)!=&&ini(desktop.im)==||pkg(net-im/qutim)!=&&ini(desktop.im)==qutim
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
deleted file mode 100644
index 134e6973e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.im, qutim)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
deleted file mode 100644
index 7b54a29b5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/qutim.desktop name=calculate-im.desktop mirror pkg(net-im/qutim)>=0.3
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
deleted file mode 100644
index 79e60b8c9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(net-im/qutim)==&&ini(desktop.im)==qutim
-
-[desktop]
-!im=
-im-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
deleted file mode 100644
index 7722d2811..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(net-im/gajim)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
deleted file mode 100644
index 4cfc01326..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(net-im/gajim)!=&&ini(desktop.im)==||pkg(net-im/gajim)!=&&ini(desktop.im)==gajim
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
deleted file mode 100644
index 469f6321d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gajim.desktop name=calculate-im.desktop mirror pkg(net-im/gajim)>=0.16
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
deleted file mode 100644
index 6a0b5d114..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.im, gajim)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
deleted file mode 100644
index 13da351a8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(net-im/gajim)==&&ini(desktop.im)==gajim
-
-[desktop]
-!im=
-im-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
deleted file mode 100644
index 7b85dfe9e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=compiz protected ini(desktop.im-removing)==on merge=kde-apps/kopete,net-im/pidgine,net-im/qutim,net-im/gajim
-
-#-ini(desktop.im-removing,)-#
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
deleted file mode 100644
index c92fad27f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(app-office/libreoffice)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
deleted file mode 100644
index ce0d761a5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-office/libreoffice)!=&&ini(desktop.writer)==||pkg(app-office/libreoffice)!=&&ini(desktop.writer)==libreoffice
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
deleted file mode 100644
index 1cad4d9b3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.writer, libreoffice)-#
-
-[Added Associations]
-application/rtf=libreoffice-writer.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
deleted file mode 100644
index 7003a8ded..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/writer.desktop name=calculate-writer.desktop mirror pkg(app-office/libreoffice)>=3.6.3&&os_install_arch_machine==i686
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/48x48/apps/libreoffice-writer.png)-#
-Icon=/usr/share/icons/hicolor/48x48/apps/libreoffice-writer.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
deleted file mode 100644
index beaee9d27..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/lib64/libreoffice/share/xdg/writer.desktop name=calculate-writer.desktop mirror pkg(app-office/libreoffice)>=3.6.3&&os_install_arch_machine==x86_64
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/48x48/apps/libreoffice-writer.png)-#
-Icon=/usr/share/icons/hicolor/48x48/apps/libreoffice-writer.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
deleted file mode 100644
index 9f464d16c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-office/libreoffice)==&&ini(desktop.writer)==libreoffice
-
-[desktop]
-!writer=
-writer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
deleted file mode 100644
index b6c7dcefa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(app-office/libreoffice-bin)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
deleted file mode 100644
index 94e4ed25d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-office/libreoffice-bin)!=&&ini(desktop.writer)==||pkg(app-office/libreoffice-bin)!=&&ini(desktop.writer)==libreoffice-bin
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
deleted file mode 100644
index 868ed2418..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.writer, libreoffice-bin)-#
-
-[Added Associations]
-application/rtf=libreoffice-writer.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
deleted file mode 100644
index 8eb1aa4a0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/writer.desktop name=calculate-writer.desktop mirror pkg(app-office/libreoffice-bin)>=3.6.3&&os_install_arch_machine==i686
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
deleted file mode 100644
index c5851c723..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/lib64/libreoffice/share/xdg/writer.desktop name=calculate-writer.desktop mirror pkg(app-office/libreoffice-bin)>=3.6.3&&os_install_arch_machine==x86_64
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
deleted file mode 100644
index 61ecffb0e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-office/libreoffice-bin)==&&ini(desktop.writer)==libreoffice-bin
-
-[desktop]
-!writer=
-writer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
deleted file mode 100644
index cb004ea0a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=compiz protected ini(desktop.writer-removing)==on merge=app-office/libreoffice,app-office/libreoffice-bin
-
-#-ini(desktop.writer-removing,)-#
-
-[Added Associations]
-!application/rtf=
-!application/vnd.oasis.opendocument.text=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
deleted file mode 100644
index c92fad27f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(app-office/libreoffice)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
deleted file mode 100644
index 6b7a61702..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-office/libreoffice)!=&&ini(desktop.calc)==||pkg(app-office/libreoffice)!=&&ini(desktop.calc)==libreoffice
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
deleted file mode 100644
index 191e17a4d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/calc.desktop name=calculate-calc.desktop mirror pkg(app-office/libreoffice)>=3.6.3&&os_install_arch_machine==i686
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/48x48/apps/libreoffice-calc.png)-#
-Icon=/usr/share/icons/hicolor/48x48/apps/libreoffice-calc.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
deleted file mode 100644
index e6a12c081..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/lib64/libreoffice/share/xdg/calc.desktop name=calculate-calc.desktop mirror pkg(app-office/libreoffice)>=3.6.3&&os_install_arch_machine==x86_64
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/48x48/apps/libreoffice-calc.png)-#
-Icon=/usr/share/icons/hicolor/48x48/apps/libreoffice-calc.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
deleted file mode 100644
index 9b59993ff..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.calc, libreoffice)-#
-
-[Added Associations]
-application/vnd.oasis.opendocument.text=libreoffice-calc.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
deleted file mode 100644
index 13d8779a0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-office/libreoffice)==&&ini(desktop.calc)==libreoffice
-
-[desktop]
-!calc=
-calc-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
deleted file mode 100644
index b6c7dcefa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(app-office/libreoffice-bin)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
deleted file mode 100644
index 7b44204c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-office/libreoffice-bin)!=&&ini(desktop.calc)==||pkg(app-office/libreoffice-bin)!=&&ini(desktop.calc)==libreoffice-bin
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
deleted file mode 100644
index eca8dd7cf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/lib/libreoffice/share/xdg/calc.desktop name=calculate-calc.desktop mirror pkg(app-office/libreoffice-bin)>=3.6.3&&os_install_arch_machine==i686
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
deleted file mode 100644
index 254806840..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/lib64/libreoffice/share/xdg/calc.desktop name=calculate-calc.desktop mirror pkg(app-office/libreoffice-bin)>=3.6.3&&os_install_arch_machine==x86_64
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
deleted file mode 100644
index 6350de4d3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.calc, libreoffice-bin)-#
-
-[Added Associations]
-application/vnd.oasis.opendocument.text=libreoffice-calc.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
deleted file mode 100644
index 3fda37ae2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-office/libreoffice-bin)==&&ini(desktop.calc)==libreoffice-bin
-
-[desktop]
-!calc=
-calc-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
deleted file mode 100644
index 11cbc9727..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=compiz protected ini(desktop.calc-removing)==on merge=app-office/libreoffice,app-office/libreoffice-bin
-
-#-ini(desktop.calc-removing,)-#
-
-[Added Associations]
-!application/vnd.oasis.opendocument.spreadsheet=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
deleted file mode 100644
index 285226a5e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(kde-apps/kcalc)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
deleted file mode 100644
index 4ba9e865a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(kde-apps/kcalc)!=&&ini(desktop.calculator)==||pkg(kde-apps/kcalc)!=&&ini(desktop.calculator)==kcalc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
deleted file mode 100644
index 20b93b0b1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/kcalc.desktop name=calculate-calculator.desktop mirror pkg(kde-apps/kcalc)>=4.9&&pkg(kde-apps/kcalc)<15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
deleted file mode 100644
index b7c63de30..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.calculator, kcalc)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
deleted file mode 100644
index 04cfe78cf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.kde.kcalc.desktop name=calculate-calculator.desktop mirror pkg(kde-apps/kcalc)>=15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
deleted file mode 100644
index 6f99a1dbe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-apps/kcalc)==&&ini(desktop.calculator)==kcalc
-
-[desktop]
-!calculator=
-calculator-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
deleted file mode 100644
index 438c51f96..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(mate-extra/mate-calc)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
deleted file mode 100644
index 7efb7dbd5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(mate-extra/mate-calc)!=&&ini(desktop.calculator)==||pkg(mate-extra/mate-calc)!=&&ini(desktop.calculator)==mate-calc
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
deleted file mode 100644
index 5043264e5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/mate-calc.desktop name=calculate-calculator.desktop mirror pkg(mate-extra/mate-calc)>=1.8
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
deleted file mode 100644
index 5008c9666..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.calculator, mate-calc)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
deleted file mode 100644
index 697797764..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(mate-extra/mate-calc)==&&ini(desktop.calculator)==mate-calc
-
-[desktop]
-!calculator=
-calculator-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
deleted file mode 100644
index 01fb1e40b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(sci-calculators/galculator)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
deleted file mode 100644
index ac06374ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sci-calculators/galculator)!=&&ini(desktop.calculator)==||pkg(sci-calculators/galculator)!=&&ini(desktop.calculator)==galculator
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
deleted file mode 100644
index af40c119d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/galculator.desktop name=calculate-calculator.desktop mirror pkg(sci-calculators/galculator)>=1.3
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
deleted file mode 100644
index 1641cde61..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.calculator, galculator)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
deleted file mode 100644
index 33e8dcf3b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(sci-calculators/galculator)==&&ini(desktop.calculator)==galculator
-
-[desktop]
-!calculator=
-calculator-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
deleted file mode 100644
index 481c6cc26..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(sci-calculators/speedcrunch)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
deleted file mode 100644
index 9dbe4efbf..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sci-calculators/speedcrunch)!=&&ini(desktop.calculator)==||pkg(sci-calculators/speedcrunch)!=&&ini(desktop.calculator)==speedcrunch
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
deleted file mode 100644
index 2097baf20..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.calculator, speedcrunch)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
deleted file mode 100644
index f598e4210..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/speedcrunch.desktop name=calculate-calculator.desktop mirror pkg(sci-calculators/speedcrunch)>=0.10
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
deleted file mode 100644
index 1895cfc31..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(sci-calculators/speedcrunch)==&&ini(desktop.calculator)==speedcrunch
-
-[desktop]
-!calculator=
-calculator-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
deleted file mode 100644
index d39cd4ff0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(gnome-extra/gnome-calculator)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
deleted file mode 100644
index 709a1bd90..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(gnome-extra/gnome-calculator)!=&&ini(desktop.calculator)==||pkg(gnome-extra/gnome-calculator)!=&&ini(desktop.calculator)==gnome-calculator
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
deleted file mode 100644
index 37a764794..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gnome-calculator.desktop name=calculate-calculator.desktop mirror pkg(gnome-extra/gnome-calculator)>=3.18
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
deleted file mode 100644
index abfb7e8d1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.calculator, gnome-calculator)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
deleted file mode 100644
index 73d797797..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(gnome-extra/gnome-calculator)==&&ini(desktop.calculator)==gnome-calculator
-
-[desktop]
-!calculator=
-calculator-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
deleted file mode 100644
index e6892db99..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=compiz protected ini(desktop.calculator-removing)==on merge=kde-apps/kcalc,mate-extra/mate-calc,sci-calculators/galculator,sci-calculators/speedcrunch,gnome-extra/gnome-calculator
-
-#-ini(desktop.calculator-removing,)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
deleted file mode 100644
index a79748ec3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(media-gfx/gimp)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
deleted file mode 100644
index 3b4c6f5c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/gimp)!=&&ini(desktop.imageedit)==||pkg(media-gfx/gimp)!=&&ini(desktop.imageedit)==gimp
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
deleted file mode 100644
index 732e662f5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/zzz-gimp.desktop name=calculate-imageedit.desktop mirror pkg(media-gfx/gimp)>=2.6.11
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/48x48/apps/gimp.png)-#
-Icon=/usr/share/icons/hicolor/48x48/apps/gimp.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
deleted file mode 100644
index 9389aa1ce..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageedit, gimp)-#
-
-[Added Associations]
-application/illustrator=zzz-gimp.desktop
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
deleted file mode 100644
index df9b579d4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/gimp)==&&ini(desktop.imageedit)==gimp
-
-[desktop]
-!imageedit=
-imageedit-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
deleted file mode 100644
index 40ff123ba..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(media-gfx/krita)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
deleted file mode 100644
index 73b90bcf9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/krita)!=&&ini(desktop.imageedit)==||pkg(media-gfx/krita)!=&&ini(desktop.imageedit)==krita
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
deleted file mode 100644
index e75e26a64..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/krita.desktop name=calculate-imageedit.desktop mirror pkg(media-gfx/krita)>=3.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
deleted file mode 100644
index 3248fdd75..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageedit, krita)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
deleted file mode 100644
index ec2a07724..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/krita)==&&ini(desktop.imageedit)==krita
-
-[desktop]
-!imageedit=
-imageedit-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
deleted file mode 100644
index 913258114..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=compiz protected ini(desktop.imageedit-removing)==on merge=media-gfx/gimp,media-gfx/krita
-
-#-ini(desktop.imageedit-removing,)-#
-
-[Added Associations]
-!application/illustrator=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
deleted file mode 100644
index 5b377823c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/digikam)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
deleted file mode 100644
index 6f6b92829..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/digikam)!=&&ini(desktop.photomanager)==||pkg(media-gfx/digikam)!=&&ini(desktop.photomanager)==digikam
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
deleted file mode 100644
index dbfa88220..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/digikam.desktop name=calculate-photomanager.desktop mirror pkg(media-gfx/digikam)>=2.9
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
deleted file mode 100644
index b31331a7e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.photomanager, digikam)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
deleted file mode 100644
index 3a3b2e8df..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/digikam)==&&ini(desktop.photomanager)==digikam
-
-[desktop]
-!photomanager=
-photomanager-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
deleted file mode 100644
index d4b747e4a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/shotwell)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
deleted file mode 100644
index 25d415cdb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/shotwell)!=&&ini(desktop.photomanager)==||pkg(media-gfx/shotwell)!=&&ini(desktop.photomanager)==shotwell
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
deleted file mode 100644
index e396fe591..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.photomanager, shotwell)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
deleted file mode 100644
index bfef51f44..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/shotwell.desktop name=calculate-photomanager.desktop mirror pkg(media-gfx/shotwell)>=0.13
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
deleted file mode 100644
index df4d35aff..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/shotwell)==&&ini(desktop.photomanager)==shotwell
-
-[desktop]
-!photomanager=
-photomanager-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
deleted file mode 100644
index 0a9b309fb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=compiz protected ini(desktop.photomanager-removing)==on merge=media-gfx/digikam,media-gfx/shotwell
-
-#-ini(desktop.photomanager-removing,)-#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
deleted file mode 100644
index 1e1d02c12..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-apps/gwenview)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
deleted file mode 100644
index 3f718401d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(kde-apps/gwenview)!=&&ini(desktop.imageview)==||pkg(kde-apps/gwenview)!=&&ini(desktop.imageview)==gwenview
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
deleted file mode 100644
index af7a24cdb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/gwenview.desktop name=calculate-imageview.desktop mirror pkg(kde-apps/gwenview)>=4.9&&pkg(kde-apps/gwenview)<15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
deleted file mode 100644
index 2d0c45f80..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageview, gwenview)-#
-
-[Added Associations]
-image/bmp=gwenview.desktop;
-image/gif=gwenview.desktop;
-image/jpeg=gwenview.desktop;
-image/jpg=gwenview.desktop;
-image/png=gwenview.desktop;
-image/svg+xml=gwenview.desktop;
-image/svg+xml-compressed=gwenview.desktop;
-image/tiff=gwenview.desktop;
-image/vnd.microsoft.icon=gwenview.desktop;
-image/vnd.wap.wbmp=gwenview.desktop;
-image/x-gray=gwenview.desktop;
-image/x-pcx=gwenview.desktop;
-image/x-png=gwenview.desktop;
-image/x-portable-anymap=gwenview.desktop;
-image/x-portable-bitmap=gwenview.desktop;
-image/x-portable-graymap=gwenview.desktop;
-image/x-portable-pixmap=gwenview.desktop;
-image/x-tga=gwenview.desktop;
-image/x-xbitmap=gwenview.desktop;
-image/x-xpixmap=gwenview.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
deleted file mode 100644
index a1f6dc726..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.kde.gwenview.desktop name=calculate-imageview.desktop mirror pkg(kde-apps/gwenview)>=15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/64x64/apps/gwenview.png)-#
-Icon=/usr/share/icons/hicolor/64x64/apps/gwenview.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
deleted file mode 100644
index baa20e745..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-apps/gwenview)==&&ini(desktop.imageview)==gwenview
-
-[desktop]
-!imageview=
-imageview-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
deleted file mode 100644
index 37ef42c83..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/eom)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
deleted file mode 100644
index 8c6af4c23..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/eom)!=&&ini(desktop.imageview)==||pkg(media-gfx/eom)!=&&ini(desktop.imageview)==eom
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
deleted file mode 100644
index 573d2c093..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/eom.desktop name=calculate-imageview.desktop mirror pkg(media-gfx/eom)>=1.8
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
deleted file mode 100644
index 95bcc6402..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageview, eom)-#
-
-[Added Associations]
-image/bmp=eom.desktop;
-image/gif=eom.desktop;
-image/jpeg=eom.desktop;
-image/jpg=eom.desktop;
-image/png=eom.desktop;
-image/svg+xml=eom.desktop;
-image/svg+xml-compressed=eom.desktop;
-image/tiff=eom.desktop;
-image/vnd.microsoft.icon=eom.desktop;
-image/vnd.wap.wbmp=eom.desktop;
-image/x-gray=eom.desktop;
-image/x-pcx=eom.desktop;
-image/x-png=eom.desktop;
-image/x-portable-anymap=eom.desktop;
-image/x-portable-bitmap=eom.desktop;
-image/x-portable-graymap=eom.desktop;
-image/x-portable-pixmap=eom.desktop;
-image/x-tga=eom.desktop;
-image/x-xbitmap=eom.desktop;
-image/x-xpixmap=eom.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
deleted file mode 100644
index e1b8da9dc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/eom)==&&ini(desktop.imageview)==eom
-
-[desktop]
-!imageview=
-imageview-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
deleted file mode 100644
index acb7a8624..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/eog)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
deleted file mode 100644
index 91c4c77fa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/eog)!=&&ini(desktop.imageview)==||pkg(media-gfx/eog)!=&&ini(desktop.imageview)==eog
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
deleted file mode 100644
index 8ff36e89d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/eog.desktop name=calculate-imageview.desktop mirror pkg(media-gfx/eog)>=2.30
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
deleted file mode 100644
index 86b91d721..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageview, eog)-#
-
-[Added Associations]
-image/bmp=eog.desktop;
-image/gif=eog.desktop;
-image/jpeg=eog.desktop;
-image/jpg=eog.desktop;
-image/png=eog.desktop;
-image/svg+xml=eog.desktop;
-image/svg+xml-compressed=eog.desktop;
-image/tiff=eog.desktop;
-image/vnd.microsoft.icon=eog.desktop;
-image/vnd.wap.wbmp=eog.desktop;
-image/x-gray=eog.desktop;
-image/x-pcx=eog.desktop;
-image/x-png=eog.desktop;
-image/x-portable-anymap=eog.desktop;
-image/x-portable-bitmap=eog.desktop;
-image/x-portable-graymap=eog.desktop;
-image/x-portable-pixmap=eog.desktop;
-image/x-tga=eog.desktop;
-image/x-xbitmap=eog.desktop;
-image/x-xpixmap=eog.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
deleted file mode 100644
index 382e2207b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/eog)==&&ini(desktop.imageview)==eog
-
-[desktop]
-!imageview=
-imageview-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
deleted file mode 100644
index c75bc7043..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/nomacs)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
deleted file mode 100644
index 62c027e7b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/nomacs)!=&&ini(desktop.imageview)==||pkg(media-gfx/nomacs)!=&&ini(desktop.imageview)==nomacs
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
deleted file mode 100644
index caad01296..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageview, nomacs)-#
-
-[Added Associations]
-image/bmp=nomacs.desktop;
-image/gif=nomacs.desktop;
-image/jpeg=nomacs.desktop;
-image/jpg=nomacs.desktop;
-image/png=nomacs.desktop;
-image/svg+xml=nomacs.desktop;
-image/svg+xml-compressed=nomacs.desktop;
-image/tiff=nomacs.desktop;
-image/vnd.microsoft.icon=nomacs.desktop;
-image/vnd.wap.wbmp=nomacs.desktop;
-image/x-gray=nomacs.desktop;
-image/x-pcx=nomacs.desktop;
-image/x-png=nomacs.desktop;
-image/x-portable-anymap=nomacs.desktop;
-image/x-portable-bitmap=nomacs.desktop;
-image/x-portable-graymap=nomacs.desktop;
-image/x-portable-pixmap=nomacs.desktop;
-image/x-tga=nomacs.desktop;
-image/x-xbitmap=nomacs.desktop;
-image/x-xpixmap=nomacs.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
deleted file mode 100644
index a106c6f41..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/nomacs.desktop name=calculate-imageview.desktop mirror pkg(media-gfx/nomacs)>=1.6
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
deleted file mode 100644
index e535a1a8e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/nomacs)==&&ini(desktop.imageview)==nomacs
-
-[desktop]
-!imageview=
-imageview-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
deleted file mode 100644
index 51eaaaa95..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/geeqie)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
deleted file mode 100644
index bf3dedd82..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/geeqie)!=&&ini(desktop.imageview)==||pkg(media-gfx/geeqie)!=&&ini(desktop.imageview)==geeqie
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
deleted file mode 100644
index c88f88642..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/geeqie.desktop name=calculate-imageview.desktop mirror pkg(media-gfx/geeqie)>=1.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
deleted file mode 100644
index 0f9ad3f2e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageview, geeqie)-#
-
-[Added Associations]
-image/bmp=geeqie.desktop;
-image/gif=geeqie.desktop;
-image/jpeg=geeqie.desktop;
-image/jpg=geeqie.desktop;
-image/png=geeqie.desktop;
-image/svg+xml=geeqie.desktop;
-image/svg+xml-compressed=geeqie.desktop;
-image/tiff=geeqie.desktop;
-image/vnd.microsoft.icon=geeqie.desktop;
-image/vnd.wap.wbmp=geeqie.desktop;
-image/x-gray=geeqie.desktop;
-image/x-pcx=geeqie.desktop;
-image/x-png=geeqie.desktop;
-image/x-portable-anymap=geeqie.desktop;
-image/x-portable-bitmap=geeqie.desktop;
-image/x-portable-graymap=geeqie.desktop;
-image/x-portable-pixmap=geeqie.desktop;
-image/x-tga=geeqie.desktop;
-image/x-xbitmap=geeqie.desktop;
-image/x-xpixmap=geeqie.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
deleted file mode 100644
index b2dacbc09..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/geeqie)==&&ini(desktop.imageview)==geeqie
-
-[desktop]
-!imageview=
-imageview-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
deleted file mode 100644
index 767ca5978..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/lximage-qt)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
deleted file mode 100644
index 7faf7abbd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/lximage-qt)!=&&ini(desktop.imageview)==||pkg(media-gfx/lximage-qt)!=&&ini(desktop.imageview)==lximage-qt
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
deleted file mode 100644
index d53f06974..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/lximage-qt.desktop name=calculate-imageview.desktop mirror pkg(media-gfx/lximage-qt)>=0.4
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
deleted file mode 100644
index a4034d05d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageview, lximage-qt)-#
-
-[Added Associations]
-image/bmp=lximage-qt.desktop;
-image/gif=lximage-qt.desktop;
-image/jpeg=lximage-qt.desktop;
-image/jpg=lximage-qt.desktop;
-image/png=lximage-qt.desktop;
-image/svg+xml=lximage-qt.desktop;
-image/svg+xml-compressed=lximage-qt.desktop;
-image/tiff=lximage-qt.desktop;
-image/vnd.microsoft.icon=lximage-qt.desktop;
-image/vnd.wap.wbmp=lximage-qt.desktop;
-image/x-gray=lximage-qt.desktop;
-image/x-pcx=lximage-qt.desktop;
-image/x-png=lximage-qt.desktop;
-image/x-portable-anymap=lximage-qt.desktop;
-image/x-portable-bitmap=lximage-qt.desktop;
-image/x-portable-graymap=lximage-qt.desktop;
-image/x-portable-pixmap=lximage-qt.desktop;
-image/x-tga=lximage-qt.desktop;
-image/x-xbitmap=lximage-qt.desktop;
-image/x-xpixmap=lximage-qt.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
deleted file mode 100644
index 9425f3114..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/lximage-qt)==&&ini(desktop.imageview)==lximage-qt
-
-[desktop]
-!imageview=
-imageview-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
deleted file mode 100644
index 79d353681..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/mirage)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
deleted file mode 100644
index 0cedceb32..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-gfx/mirage)!=&&ini(desktop.imageview)==||pkg(media-gfx/mirage)!=&&ini(desktop.imageview)==mirage
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
deleted file mode 100644
index edf830273..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageview, mirage)-#
-
-[Added Associations]
-image/bmp=mirage.desktop;
-image/gif=mirage.desktop;
-image/jpeg=mirage.desktop;
-image/jpg=mirage.desktop;
-image/png=mirage.desktop;
-image/svg+xml=mirage.desktop;
-image/svg+xml-compressed=mirage.desktop;
-image/tiff=mirage.desktop;
-image/vnd.microsoft.icon=mirage.desktop;
-image/vnd.wap.wbmp=mirage.desktop;
-image/x-gray=mirage.desktop;
-image/x-pcx=mirage.desktop;
-image/x-png=mirage.desktop;
-image/x-portable-anymap=mirage.desktop;
-image/x-portable-bitmap=mirage.desktop;
-image/x-portable-graymap=mirage.desktop;
-image/x-portable-pixmap=mirage.desktop;
-image/x-tga=mirage.desktop;
-image/x-xbitmap=mirage.desktop;
-image/x-xpixmap=mirage.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
deleted file mode 100644
index cce009d89..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/mirage.desktop name=calculate-imageview.desktop mirror pkg(media-gfx/mirage)>=0.9
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
deleted file mode 100644
index 7a1c0022b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-gfx/mirage)==&&ini(desktop.imageview)==mirage
-
-[desktop]
-!imageview=
-imageview-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
deleted file mode 100644
index d83690f84..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=compiz protected ini(desktop.imageview-removing)==on merge=kde-apps/gwenview,media-gfx/eom,media-gfx/eog,media-gfx/nomacs,media-gfx/geeqie,media-gfx/lximage-qt,media-gfx/mirage
-
-#-ini(desktop.imageview-removing,)-#
-
-[Added Associations]
-!image/bmp=
-!image/gif=
-!image/jpeg=
-!image/jpg=
-!image/png=
-!image/svg+xml=
-!image/svg+xml-compressed=
-!image/tiff=
-!image/vnd.microsoft.icon=
-!image/vnd.wap.wbmp=
-!image/x-gray=
-!image/x-pcx=
-!image/x-png=
-!image/x-portable-anymap=
-!image/x-portable-bitmap=
-!image/x-portable-graymap=
-!image/x-portable-pixmap=
-!image/x-tga=
-!image/x-xbitmap=
-!image/x-xpixmap=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
deleted file mode 100644
index 6c557eb13..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-sound/amarok)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
deleted file mode 100644
index 65814363b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-sound/amarok)!=&&ini(desktop.audioplayer)==||pkg(media-sound/amarok)!=&&ini(desktop.audioplayer)==amarok
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
deleted file mode 100644
index dbadf0fc0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/amarok.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/amarok)>=2.5
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/64x64/apps/amarok.png)-#
-Icon=/usr/share/icons/hicolor/64x64/apps/amarok.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
deleted file mode 100644
index 143755f16..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.audioplayer, amarok)-#
-
-[Added Associations]
-audio/mp4=amarok.desktop;
-audio/mpeg=amarok.desktop;
-audio/x-flac=amarok.desktop;
-audio/x-ms-wma=amarok.desktop;
-audio/x-wav=amarok.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
deleted file mode 100644
index 7d893850f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-sound/amarok)==&&ini(desktop.audioplayer)==amarok
-
-[desktop]
-!audioplayer=
-audioplayer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
deleted file mode 100644
index 0c53af713..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-sound/clementine)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
deleted file mode 100644
index 3d9acac63..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-sound/clementine)!=&&ini(desktop.audioplayer)==||pkg(media-sound/clementine)!=&&ini(desktop.audioplayer)==clementine
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
deleted file mode 100644
index 3f46551bb..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/clementine.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/clementine)>=1.2
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
deleted file mode 100644
index 4fc487eb0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.audioplayer, clementine)-#
-
-[Added Associations]
-audio/mp4=clementine.desktop;
-audio/mpeg=clementine.desktop;
-audio/x-flac=clementine.desktop;
-audio/x-ms-wma=clementine.desktop;
-audio/x-wav=clementine.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
deleted file mode 100644
index ed9f3c7dd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-sound/clementine)==&&ini(desktop.audioplayer)==clementine
-
-[desktop]
-!audioplayer=
-audioplayer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
deleted file mode 100644
index f1007786e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-sound/audacious)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
deleted file mode 100644
index 4c8aa8a7e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-sound/audacious)!=&&ini(desktop.audioplayer)==||pkg(media-sound/audacious)!=&&ini(desktop.audioplayer)==audacious
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
deleted file mode 100644
index 1b6942c09..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/audacious.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.5
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
deleted file mode 100644
index 0d8211e3e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.audioplayer, audacious)-#
-
-[Added Associations]
-audio/mp4=audacious.desktop;
-audio/mpeg=audacious.desktop;
-audio/x-flac=audacious.desktop;
-audio/x-ms-wma=audacious.desktop;
-audio/x-wav=audacious.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
deleted file mode 100644
index 75a0050ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-sound/audacious)==&&ini(desktop.audioplayer)==audacious
-
-[desktop]
-!audioplayer=
-audioplayer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
deleted file mode 100644
index 98c3b5792..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-sound/rhythmbox)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
deleted file mode 100644
index 44fc28b15..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-sound/rhythmbox)!=&&ini(desktop.audioplayer)==||pkg(media-sound/rhythmbox)!=&&ini(desktop.audioplayer)==rhythmbox
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
deleted file mode 100644
index 6d75fbba7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.audioplayer, rhythmbox)-#
-
-[Added Associations]
-audio/mp4=rhythmbox.desktop;
-audio/mpeg=rhythmbox.desktop;
-audio/x-flac=rhythmbox.desktop;
-audio/x-ms-wma=rhythmbox.desktop;
-audio/x-wav=rhythmbox.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
deleted file mode 100644
index 089d53100..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/rhythmbox.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/rhythmbox)>=0.12
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
deleted file mode 100644
index 9fefdc7f5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-sound/rhythmbox)==&&ini(desktop.audioplayer)==rhythmbox
-
-[desktop]
-!audioplayer=
-audioplayer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
deleted file mode 100644
index 8ff5af1b0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=compiz protected ini(desktop.audioplayer-removing)==on merge=media-sound/amarok,media-sound/rhythmbox,media-sound/audacious,media-sound/clementine
-
-#-ini(desktop.audioplayer-removing,)-#
-
-[Added Associations]
-!audio/mp4=
-!audio/mpeg=
-!audio/x-flac=
-!audio/x-ms-wma=
-!audio/x-wav=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
deleted file mode 100644
index d8e107572..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-video/totem)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
deleted file mode 100644
index 55080acba..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-video/totem)!=&&ini(desktop.videoplayer)==||pkg(media-video/totem)!=&&ini(desktop.videoplayer)==totem
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
deleted file mode 100644
index 6815b53ea..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.videoplayer, totem)-#
-
-[Added Associations]
-video/mp4=totem.desktop;
-video/mpeg=totem.desktop;
-video/ogg=totem.desktop;
-video/quicktime=totem.desktop;
-video/quicktime=totem.desktop;
-video/vnd.mpegurl=totem.desktop;
-video/x-m4v=totem.desktop;
-video/x-msvideo=totem.desktop;
-video/x-sgi-movie=totem.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
deleted file mode 100644
index 088da38ec..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.gnome.Totem.desktop name=calculate-videoplayer.desktop mirror pkg(media-video/totem)>=3.18
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
deleted file mode 100644
index 6101befa5..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/totem.desktop name=calculate-videoplayer.desktop mirror pkg(media-video/totem)>=2.3&&pkg(media-video/totem)<3.18
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
deleted file mode 100644
index 4a1f31e0c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-video/totem)==&&ini(desktop.videoplayer)==totem
-
-[desktop]
-!videoplayer=
-videoplayer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
deleted file mode 100644
index 706b83ebe..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-video/smplayer)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
deleted file mode 100644
index 785f197d8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-video/smplayer)!=&&ini(desktop.videoplayer)==||pkg(media-video/smplayer)!=&&ini(desktop.videoplayer)==smplayer
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
deleted file mode 100644
index 070f3a45c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.videoplayer, smplayer)-#
-
-[Added Associations]
-video/mp4=smplayer.desktop;
-video/mpeg=smplayer.desktop;
-video/ogg=smplayer.desktop;
-video/quicktime=smplayer.desktop;
-video/quicktime=smplayer.desktop;
-video/vnd.mpegurl=smplayer.desktop;
-video/x-m4v=smplayer.desktop;
-video/x-msvideo=smplayer.desktop;
-video/x-sgi-movie=smplayer.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
deleted file mode 100644
index 647c2a319..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
+++ /dev/null
@@ -1,43 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/smplayer.desktop name=calculate-videoplayer.desktop mirror pkg(media-video/smplayer)>=0.6
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/64x64/apps/smplayer.png)-#
-Icon=/usr/share/icons/hicolor/64x64/apps/smplayer.png
-!Icon[bg]=
-!Icon[cs]=
-!Icon[da]=
-!Icon[de]=
-!Icon[el]=
-!Icon[en_GB]=
-!Icon[es]=
-!Icon[eu]=
-!Icon[fa]=
-!Icon[fr]=
-!Icon[gl]=
-!Icon[hr]=
-!Icon[id]=
-!Icon[it]=
-!Icon[ja]=
-!Icon[km]=
-!Icon[ko]=
-!Icon[lt]=
-!Icon[ms_MY]=
-!Icon[nl]=
-!Icon[nn_NO]=
-!Icon[pl]=
-!Icon[pt_BR]=
-!Icon[pt]=
-!Icon[ru]=
-!Icon[sk]=
-!Icon[sq_AL]=
-!Icon[sr]=
-!Icon[sv]=
-!Icon[th]=
-!Icon[tr]=
-!Icon[uk]=
-!Icon[zh_CN]=
-!Icon[zh_TW]=
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
deleted file mode 100644
index 55c1383fa..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-video/smplayer)==&&ini(desktop.videoplayer)==smplayer
-
-[desktop]
-!videoplayer=
-videoplayer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
deleted file mode 100644
index 3ffc7d773..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-video/gnome-mplayer)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
deleted file mode 100644
index a93694c03..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(media-video/gnome-mplayer)!=&&ini(desktop.videoplayer)==||pkg(media-video/gnome-mplayer)!=&&ini(desktop.videoplayer)==gnome-mplayer
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
deleted file mode 100644
index 3d596fc1f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gnome-mplayer.desktop name=calculate-videoplayer.desktop mirror pkg(media-video/gnome-mplayer)>=1.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
deleted file mode 100644
index 60baf531d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.videoplayer, gnome-mplayer)-#
-
-[Added Associations]
-video/mp4=gnome-mplayer.desktop;
-video/mpeg=gnome-mplayer.desktop;
-video/ogg=gnome-mplayer.desktop;
-video/quicktime=gnome-mplayer.desktop;
-video/quicktime=gnome-mplayer.desktop;
-video/vnd.mpegurl=gnome-mplayer.desktop;
-video/x-m4v=gnome-mplayer.desktop;
-video/x-msvideo=gnome-mplayer.desktop;
-video/x-sgi-movie=gnome-mplayer.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
deleted file mode 100644
index 31a7d7053..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(media-video/gnome-mplayer)==&&ini(desktop.videoplayer)==gnome-mplayer
-
-[desktop]
-!videoplayer=
-videoplayer-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
deleted file mode 100644
index 1bf870a7c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=compiz protected ini(desktop.videoplayer-removing)==on merge=media-video/totem,media-video/smplayer,media-video/gnome-mplayer
-
-#-ini(desktop.videoplayer-removing,)-#
-
-[Added Associations]
-!video/mp4=
-!video/mpeg=
-!video/ogg=
-!video/quicktime=
-!video/quicktime=
-!video/vnd.mpegurl=
-!video/x-m4v=
-!video/x-msvideo=
-!video/x-sgi-movie=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
deleted file mode 100644
index ecf7a3b61..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-cdr/k3b)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
deleted file mode 100644
index 29f702847..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-cdr/k3b)!=&&ini(desktop.imageburn)==||pkg(app-cdr/k3b)!=&&ini(desktop.imageburn)==k3b
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
deleted file mode 100644
index 10db6c822..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/k3b.desktop name=calculate-imageburn.desktop mirror pkg(app-cdr/k3b)>=2.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
deleted file mode 100644
index 56b055a82..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageburn, k3b)-#
-
-[Added Associations]
-application/x-iso9660-image=k3b.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
deleted file mode 100644
index ec5ea0b06..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-cdr/k3b)==&&ini(desktop.imageburn)==k3b
-
-[desktop]
-!imageburn=
-imageburn-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
deleted file mode 100644
index d81d983ad..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-cdr/brasero)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
deleted file mode 100644
index a93d3d4f0..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-cdr/brasero)!=&&ini(desktop.imageburn)==||pkg(app-cdr/brasero)!=&&ini(desktop.imageburn)==brasero
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
deleted file mode 100644
index 1b5021905..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/brasero.desktop name=calculate-imageburn.desktop mirror pkg(app-cdr/brasero)>=2.0
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
deleted file mode 100644
index 31a3efc19..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageburn, brasero)-#
-
-[Added Associations]
-application/x-iso9660-image=brasero.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
deleted file mode 100644
index 45a66c148..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-cdr/brasero)==&&ini(desktop.imageburn)==brasero
-
-[desktop]
-!imageburn=
-imageburn-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
deleted file mode 100644
index 28585f23b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-cdr/xfburn)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
deleted file mode 100644
index 1ce20bb77..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-cdr/xfburn)!=&&ini(desktop.imageburn)==||pkg(app-cdr/xfburn)!=&&ini(desktop.imageburn)==xfburn
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
deleted file mode 100644
index dd4619a61..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.imageburn, xfburn)-#
-
-[Added Associations]
-application/x-iso9660-image=xfburn.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
deleted file mode 100644
index ba2673bb7..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/xfburn.desktop name=calculate-imageburn.desktop mirror pkg(app-cdr/xfburn)>=0.4
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
deleted file mode 100644
index d2ac6e0c3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-cdr/xfburn)==&&ini(desktop.imageburn)==xfburn
-
-[desktop]
-!imageburn=
-imageburn-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
deleted file mode 100644
index dd3ece5ba..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=compiz protected ini(desktop.imageburn-removing)==on merge=app-cdr/k3b,app-cdr/brasero,app-cdr/xfburn
-
-#-ini(desktop.imageburn-removing,)-#
-
-[Added Associations]
-!application/x-iso9660-image=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
deleted file mode 100644
index faf0e4459..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-apps/kwrite)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
deleted file mode 100644
index d99ce3754..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(kde-apps/kwrite)!=&&ini(desktop.textedit)==||pkg(kde-apps/kwrite)!=&&ini(desktop.textedit)==kwrite
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
deleted file mode 100644
index 3ad5e71ab..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.kde.kwrite.desktop name=calculate-textedit.desktop mirror pkg(kde-apps/kwrite)>=15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-#-exists(/usr/share/icons/hicolor/64x64/apps/kwrite.png)-#
-Icon=/usr/share/icons/hicolor/64x64/apps/kwrite.png
-#exists#
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
deleted file mode 100644
index 483a87f04..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/kwrite.desktop name=calculate-textedit.desktop mirror pkg(kde-apps/kwrite)>=4.9&&pkg(kde-apps/kwrite)<15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
deleted file mode 100644
index 3d71f8411..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.textedit, kwrite)-#
-
-[Added Associations]
-text/plain=kwrite.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
deleted file mode 100644
index e827c17ea..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-apps/kwrite)==&&ini(desktop.textedit)==kwrite
-
-[desktop]
-!textedit=
-textedit-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
deleted file mode 100644
index 308e4c917..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-editors/gedit)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
deleted file mode 100644
index f430f8f04..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-editors/gedit)!=&&ini(desktop.textedit)==||pkg(app-editors/gedit)!=&&ini(desktop.textedit)==gedit
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
deleted file mode 100644
index ae6384a81..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gedit.desktop name=calculate-textedit.desktop mirror pkg(app-editors/gedit)>=2.30
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
deleted file mode 100644
index 71f8447d4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.gnome.gedit.desktop name=calculate-textedit.desktop mirror pkg(app-editors/gedit)>=3.18
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
deleted file mode 100644
index 0e97c6599..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.textedit, gedit)-#
-
-[Added Associations]
-text/plain=gedit.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
deleted file mode 100644
index e255e9c9d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-editors/gedit)==&&ini(desktop.textedit)==gedit
-
-[desktop]
-!textedit=
-textedit-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
deleted file mode 100644
index 297d50c28..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-editors/pluma)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
deleted file mode 100644
index 2a64f03be..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-editors/pluma)!=&&ini(desktop.textedit)==||pkg(app-editors/pluma)!=&&ini(desktop.textedit)==pluma
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
deleted file mode 100644
index ae173c7f8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.textedit, pluma)-#
-
-[Added Associations]
-text/plain=pluma.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
deleted file mode 100644
index 0d18eec65..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/pluma.desktop name=calculate-textedit.desktop mirror pkg(app-editors/pluma)>=1.8
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
deleted file mode 100644
index 7226a55c1..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-editors/pluma)==&&ini(desktop.textedit)==pluma
-
-[desktop]
-!textedit=
-textedit-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
deleted file mode 100644
index 310ea103c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-editors/leafpad)!=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
deleted file mode 100644
index e5d1b6fb9..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(app-editors/leafpad)!=&&ini(desktop.textedit)==||pkg(app-editors/leafpad)!=&&ini(desktop.textedit)==leafpad
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
deleted file mode 100644
index 151bfeb7c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/leafpad.desktop name=calculate-textedit.desktop mirror pkg(app-editors/leafpad)>=0.8
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
deleted file mode 100644
index 94a55dd3b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.textedit, leafpad)-#
-
-[Added Associations]
-text/plain=leafpad.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
deleted file mode 100644
index 326107e6e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-editors/leafpad)==&&ini(desktop.textedit)==leafpad
-
-[desktop]
-!textedit=
-textedit-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
deleted file mode 100644
index 8cb2dfef6..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=compiz protected ini(desktop.textedit-removing)==on merge=kde-apps/kwrite,app-editors/gedit,app-editors/pluma,app-editors/leafpad
-
-#-ini(desktop.textedit-removing,)-#
-
-[Added Associations]
-!text/plain=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
deleted file mode 100644
index c27d31d6c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(kde-apps/konsole)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
deleted file mode 100644
index da1c13f7c..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(kde-apps/konsole)!=&&ini(desktop.terminal)==||pkg(kde-apps/konsole)!=&&ini(desktop.terminal)==konsole
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
deleted file mode 100644
index ea88efd74..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.kde.konsole.desktop name=calculate-terminal.desktop mirror pkg(kde-apps/konsole)>=15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
deleted file mode 100644
index 9637124db..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/konsole.desktop name=calculate-terminal.desktop mirror pkg(kde-apps/konsole)>=4.9&&pkg(kde-apps/konsole)<15
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
deleted file mode 100644
index 960ee46d8..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.terminal, konsole)-#
-
-[Added Associations]
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
deleted file mode 100644
index c132eb9dc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-apps/konsole)==&&ini(desktop.terminal)==konsole
-
-[desktop]
-!terminal=
-terminal-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
deleted file mode 100644
index 4b9f7344f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(x11-terms/gnome-terminal)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
deleted file mode 100644
index 2555e1383..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(x11-terms/gnome-terminal)!=&&ini(desktop.terminal)==||pkg(x11-terms/gnome-terminal)!=&&ini(desktop.terminal)==gnome-terminal
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
deleted file mode 100644
index d54ef30cc..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gnome-terminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/gnome-terminal)>=2.30&&pkg(x11-terms/gnome-terminal)<3.20
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
deleted file mode 100644
index ce1b92d69..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.gnome.Terminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/gnome-terminal)>=3.20
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
deleted file mode 100644
index ba4c6498d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.terminal, gnome-terminal)-#
-
-[Added Associations]
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
deleted file mode 100644
index 0f9ea3040..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(x11-terms/gnome-terminal)==&&ini(desktop.terminal)==gnome-terminal
-
-[desktop]
-!terminal=
-terminal-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
deleted file mode 100644
index 77ed886a3..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(x11-terms/mate-terminal)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
deleted file mode 100644
index 14245b4da..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(x11-terms/mate-terminal)!=&&ini(desktop.terminal)==||pkg(x11-terms/mate-terminal)!=&&ini(desktop.terminal)==mate-terminal
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
deleted file mode 100644
index a23efc404..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/mate-terminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/mate-terminal)>=1.8
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
deleted file mode 100644
index 001cfe735..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.terminal, mate-terminal)-#
-
-[Added Associations]
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
deleted file mode 100644
index b3eeb0b4b..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(x11-terms/mate-terminal)==&&ini(desktop.terminal)==mate-terminal
-
-[desktop]
-!terminal=
-terminal-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
deleted file mode 100644
index 4539f4487..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(x11-terms/xfce4-terminal)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
deleted file mode 100644
index 87e59b62f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(x11-terms/xfce4-terminal)!=&&ini(desktop.terminal)==||pkg(x11-terms/xfce4-terminal)!=&&ini(desktop.terminal)==terminal
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
deleted file mode 100644
index c73248676..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.terminal, terminal)-#
-
-[Added Associations]
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
deleted file mode 100644
index 3a37bcd6e..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/Terminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/xfce4-terminal)>=0.4&&pkg(x11-terms/xfce4-terminal)<0.6
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
deleted file mode 100644
index fd5bebc4f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/xfce4-terminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/xfce4-terminal)>=0.6
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
deleted file mode 100644
index 525145984..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(x11-terms/xfce4-terminal)==&&ini(desktop.terminal)==terminal
-
-[desktop]
-!terminal=
-terminal-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
deleted file mode 100644
index 29bf3b70a..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(x11-terms/qterminal)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
deleted file mode 100644
index e39b06fcd..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(x11-terms/qterminal)!=&&ini(desktop.terminal)==||pkg(x11-terms/qterminal)!=&&ini(desktop.terminal)==qterminal
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
deleted file mode 100644
index b736d3009..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=compiz protected
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.terminal, qterminal)-#
-
-[Added Associations]
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
deleted file mode 100644
index 4041e49ac..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/qterminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/qterminal)>=0.6
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
deleted file mode 100644
index 07ed5cd2d..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(x11-terms/qterminal)==&&ini(desktop.terminal)==qterminal
-
-[desktop]
-!terminal=
-terminal-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
deleted file mode 100644
index 6674e7488..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz protected ini(desktop.terminal-removing)==on merge=kde-apps/konsole,x11-terms/gnome-terminal,x11-terms/mate-terminal,x11-terms/xfce4-terminal,x11-terms/qterminal
-
-#-ini(desktop.terminal-removing,)-#
-
-[Added Associations]
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
deleted file mode 100644
index bd76c0b4f..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(app-text/qpdfview)!=
-
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
deleted file mode 100644
index 3f7b6a772..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=compiz protected name=mimeapps.list pkg(app-text/qpdfview)!=&&ini(desktop.pdfreader)==||pkg(app-text/qpdfview)!=&&ini(desktop.pdfreader)==qpdfview
-
-# Update info
-#-ini(desktop.updating, on)-#
-#-ini(desktop.pdfreader, qpdfview)-#
-
-[Added Associations]
-application/pdf=qpdfview.desktop;
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
deleted file mode 100644
index cecc685be..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(app-text/qpdfview)==&&ini(desktop.pdfreader)==qpdfview
-
-[desktop]
-!pdfreader=
-pdfreader-removing=on
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
deleted file mode 100644
index f0d7703b2..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=compiz protected ini(desktop.pdfreader-removing)==on merge=app-text/qpdfview
-
-#-ini(desktop.pdfreader-removing,)-#
-
-[Added Associations]
-!application/pdf=qpdfview.desktop=
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
deleted file mode 100644
index c2c19f670..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ini(desktop.updating)==on 
diff --git a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update b/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
deleted file mode 100644
index 1e50d66d4..000000000
--- a/profiles/templates/deprecated/3.4/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off
-
-/usr/bin/update-desktop-database /usr/share/applications/ 2>/dev/null
-#-ini(desktop.updating, )-#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/.calculate_directory
deleted file mode 100644
index 7223aa3b5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install ac_install_live==on
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
deleted file mode 100644
index 9f5c74c14..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=sudoers.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/sudo/livecd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/sudo/livecd
deleted file mode 100644
index 613f9db6f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-admin/sudo/livecd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate comment=# chmod=0440 os_install_root_type==livecd
-
-Defaults	env_keep += "HOME"
-Defaults	env_keep += "QT_PLUGIN_PATH"
-
-%wheel	ALL=(ALL) NOPASSWD: ALL
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-editors/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-editors/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-editors/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-emulation/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-emulation/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/app-emulation/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gdm/.calculate_directory
deleted file mode 100644
index 16c6b2f56..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/X11
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gdm/99-dconf-update b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gdm/99-dconf-update
deleted file mode 100644
index 7f3326407..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gdm/99-dconf-update
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off pkg(gnome-base/gdm)>3.0
-
-rm /etc/dconf/db/gdm &>/dev/null
-dconf update &>/dev/null
-true
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
deleted file mode 100644
index 0c3f1b652..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate exec=/bin/bash os_install_root_type!=livecd&&ac_install_disk==off
-
-/bin/chmod 0711 /usr/bin/gnome-keyring-daemon &>/dev/null
-/bin/chown root:root /usr/bin/gnome-keyring-daemon &>/dev/null
-/sbin/setcap cap_ipc_lock+ep /usr/bin/gnome-keyring-daemon &>/dev/null
-
-true
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
deleted file mode 100644
index bbee818db..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde path=/etc/xdg/autostart
-[Desktop Entry]
-Exec=/bin/bash -c "sleep 2;nm-applet"
-#?os_install_net_conf==networkmanager#
-X-GNOME-Autostart-enabled=true
-NotShowIn=KDE;
-#os_install_net_conf#
-#?os_install_net_conf!=networkmanager#
-X-GNOME-Autostart-enabled=false
-X-MATE-Autostart-enabled=false
-NotShowIn=KDE;XFCE;LXQt;
-#os_install_net_conf#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
deleted file mode 100644
index 18265f1f2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-[Desktop Entry]
-#?os_install_net_conf!=networkmanager#
-NoDisplay=true
-#os_install_net_conf#
-#?os_install_net_conf==networkmanager#
-!NoDisplay=
-#os_install_net_conf#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
deleted file mode 100644
index 881ab12ba..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()>=15 path=/usr/libexec name=calculate
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
deleted file mode 100644
index 8a128abbc..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
+++ /dev/null
@@ -1,32 +0,0 @@
-# Calculate chmod=0755
-#!/bin/bash
-
-SELECT_CARD="#-list(os_audio_name,#-os_audio_default-#)-#"
-DBUS_KMIX="/usr/bin/qdbus org.kde.kmix"
-if ! [[ -f ~/.config/kmixctrlrc ]]
-then
-	for waittime in 1 2 4 8
-	do
-		if $DBUS_KMIX &>/dev/null
-		then
-			for cards in $($DBUS_KMIX /Mixers mixers)
-			do
-				if [[ "$($DBUS_KMIX $cards readableName)" == "$SELECT_CARD" ]]
-				then
-					CARD_ID="$($DBUS_KMIX $cards id)"
-					$DBUS_KMIX /Mixers setCurrentMaster "$CARD_ID" ""
-					$DBUS_KMIX /Mixers setPreferredMaster "$CARD_ID" ""
-					CONTROL_ID=$($DBUS_KMIX $cards masterControl)
-					$DBUS_KMIX $CONTROL_ID toggleMute
-					$DBUS_KMIX $CONTROL_ID toggleMute
-					exit 0
-				fi
-			done
-			exit 1
-		else
-			sleep $waittime
-		fi
-	done
-	exit 1
-fi
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
deleted file mode 100644
index 257ee8bec..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate path=/etc/xdg/autostart os_audio==alsa
-
-[Desktop Entry]
-Exec=/usr/libexec/calculate/kmix_default
-OnlyShowIn=KDE;
-Type=Application
-MimeType=
-Terminal=false
-X-KDE-autostart-after=kmix_autostart
-X-KDE-StartupNotify=false
-Icon=kmix
-GenericName=KMix default channel
-Name=KMix default
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
deleted file mode 100644
index 1876b369b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/xdg/autostart name=kmix_default.desktop append=remove os_audio!=alsa
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
deleted file mode 100644
index 87d3d4ed1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr name=bin
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
deleted file mode 100644
index 1c118e644..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=patch os_install_root_type==livecd
-<reg>(test -n "\$KDEWM" &amp;&amp; KDEWM="--windowmanager \$KDEWM")
-(kwrapper4 ksmserver \$KDEWM\s*)
-(if test \$\? -eq 255; then
-  # [^\n]*
-  echo 'startkde: Could not start ksmserver. Check your installation.'  1&gt;&amp;2
-)</reg>
-<text>\1
-ksmserver $KDEWM
-\3</text>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/.calculate_directory
deleted file mode 100644
index 2e8fed6a4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/config
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/.default.face.icon b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/.default.face.icon
deleted file mode 100644
index ae01c89f9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/.default.face.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/apps/kdm/pics/users/default1.png path=/var/calculate/remote/share/faces/kdm mirror exists(/var/calculate/remote/share/faces/kdm/.default.face.icon)==&&exists(/usr/share/apps/kdm/pics/users/default1.png)!=&&env(client.os_remote_auth)==
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/backgroundrc b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/backgroundrc
deleted file mode 100644
index dce0131ad..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/backgroundrc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=kde
-
-[Desktop0]
-BackgroundMode=Flat
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=0,0,0
-Color2=192,192,192
-CurrentWallpaperName=
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=fish
-Program=
-ReverseBlending=false
-UseSHM=false
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution!=||pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_root_type!=livecd#
-Wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution==&&os_install_root_type==livecd#
-Wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
-Wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
-#pkg#
-WallpaperList=Custom
-WallpaperMode=Scaled
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/kdmrc b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/kdmrc
deleted file mode 100644
index a5a2d5fe4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/kdm/kdmrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-
-[X-:*-Core]
-#?os_install_x11_video_drv==fglrx#
-# System freezes after logout with GDM or KDM ATI
-# http://ru.gentoo-wiki.com/wiki/Fglrx
-TerminateServer=true
-#os_install_x11_video_drv#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
deleted file mode 100644
index 6884e119e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/apps
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
deleted file mode 100644
index d35c340be..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
+++ /dev/null
@@ -1,149 +0,0 @@
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=This group contains actions that are set up for media keyboards.
-DataCount=5
-Enabled=true
-Name=Media Keys
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-AllowMerge=True
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=Calculator
-Enabled=true
-Name=Calculator
-Type=SIMPLE_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-CommandURL=kioclient exec /usr/share/applications/calculate-calculator.desktop
-Type=COMMAND_URL
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Launch (1)
-Type=SHORTCUT
-Uuid={633b352d-aa01-459e-bae9-7a49edb03621}
-
-[Data_1_2]
-Comment=Mail Client
-Enabled=true
-Name=Mail
-Type=SIMPLE_ACTION_DATA
-
-[Data_1_2Actions]
-ActionsCount=1
-
-[Data_1_2Actions0]
-CommandURL=kioclient exec /usr/share/applications/calculate-mail.desktop
-Type=COMMAND_URL
-
-[Data_1_2Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_2Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_2Triggers0]
-Key=Launch Mail
-Type=SHORTCUT
-Uuid={259e3dee-0956-475a-8cea-01df3f2a25bf}
-
-[Data_1_3]
-Comment=Search Files
-Enabled=true
-Name=Search
-Type=SIMPLE_ACTION_DATA
-
-[Data_1_3Actions]
-ActionsCount=1
-
-[Data_1_3Actions0]
-CommandURL=kfind
-Type=COMMAND_URL
-
-[Data_1_3Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_3Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_3Triggers0]
-Key=Search
-Type=SHORTCUT
-Uuid={5af6f317-bd75-4e8d-939c-e42133a709da}
-
-[Data_1_4]
-Comment=Music Player
-Enabled=true
-Name=Music
-Type=SIMPLE_ACTION_DATA
-
-[Data_1_4Actions]
-ActionsCount=1
-
-[Data_1_4Actions0]
-CommandURL=amarok
-Type=COMMAND_URL
-
-[Data_1_4Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_4Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_4Triggers0]
-Key=Tools
-Type=SHORTCUT
-Uuid={aaeac7fb-c134-4ca8-ba4d-69fe9ba968b4}
-
-[Data_1_5]
-Comment=First Screen
-Enabled=true
-Name=Home
-Type=SIMPLE_ACTION_DATA
-
-[Data_1_5Actions]
-ActionsCount=1
-
-[Data_1_5Actions0]
-CommandURL=qdbus org.kde.kwin /KWin org.kde.KWin.setCurrentDesktop 1
-Type=COMMAND_URL
-
-[Data_1_5Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_5Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_5Triggers0]
-Key=Home Page
-Type=SHORTCUT
-Uuid={0c58dbf6-ff60-4963-80e9-8cf929ee7d0a}
-
-[Main]
-Version=2
-ImportId=mediakeys
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-frameworks/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-frameworks/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-frameworks/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-frameworks/plasma/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-frameworks/plasma/.calculate_directory
deleted file mode 100644
index 70df0f5f8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-frameworks/plasma/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share name=applications merge()!=&&pkg()!=&&os_install_root_type==livecd
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
deleted file mode 100644
index c2c200253..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
deleted file mode 100644
index 530083cec..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate path=/usr/share/kde4/services format=kde
-
-[Desktop Entry]
-#?os_install_net_conf==networkmanager#
-X-KDE-Library=plasma_applet_networkmanagement
-#os_install_net_conf#
-#?os_install_net_conf!=networkmanager#
-X-KDE-Library=
-#os_install_net_conf#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
deleted file mode 100644
index c2c200253..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
deleted file mode 100644
index 00b2e5f01..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate path=/usr/share/kde4/services format=kde
-
-[Desktop Entry]
-#?os_install_net_conf==networkmanager#
-X-Plasma-API=declarativeappletscript
-#os_install_net_conf#
-#?os_install_net_conf!=networkmanager#
-X-Plasma-API=
-#os_install_net_conf#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
deleted file mode 100644
index 9dca2842d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/plasma/plasmoids name=org.kde.plasma.volume
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
deleted file mode 100644
index d9ad4be4d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-#?pkg(kde-apps/kmix)!=#
-!X-Plasma-API=
-!X-Plasma-MainScript=
-!X-Plasma-NotificationArea=
-!X-Plasma-ConfigPlugins=
-!X-KDE-PluginInfo-Name=
-!X-KDE-PluginInfo-EnabledByDefault=
-#pkg#
-#?pkg(kde-apps/kmix)==#
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-X-Plasma-NotificationArea=true
-X-Plasma-ConfigPlugins=kcm_pulseaudio
-X-KDE-PluginInfo-Name=org.kde.plasma.volume
-X-KDE-PluginInfo-EnabledByDefault=true
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
deleted file mode 100644
index 234e881cc..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=kde path=/etc/lxdm
-
-[display]
-## background of the greeter
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution!=||pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_root_type!=livecd#
-bg=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution==&&os_install_root_type==livecd#
-bg=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
-bg=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
deleted file mode 100644
index 9c29b8cdd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&pkg(lxqt-base/lxqt-common)>=0.10&&pkg(lxqt-base/lxqt-common)<0.11 append=skip
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
deleted file mode 100644
index 7df9b1a63..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/lxqt/themes
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
deleted file mode 100644
index 5ca40fdf4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/arrow-right.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
deleted file mode 100644
index 79fe80d92..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/calendar-popup/left-arrow.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
deleted file mode 100644
index 40fa5870e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/calendar-popup/right-arrow.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
deleted file mode 100644
index 7ff343e8d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/lxqt-notificationd.qss
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
deleted file mode 100644
index 300463eb5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/lxqt-notificationd/cancel.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
deleted file mode 100644
index c43c265a2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/lxqt-panel.qss
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
deleted file mode 100644
index dbd1cfa86..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/lxqt-runner.qss
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
deleted file mode 100644
index 9086f4796..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/lxqt-runner/close.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
deleted file mode 100644
index 37de435ed..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/lxqt-runner/down-arrow.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
deleted file mode 100644
index dda31e49f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate symbolic link=/usr/share/pixmaps/calculate/start-here-blue.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
deleted file mode 100644
index 1f27c9cf0..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate symbolic link=/usr/share/pixmaps/calculate/avatar-default.png
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
deleted file mode 100644
index 1cc3ae61c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/spacer-plugin/spacer-dots.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
deleted file mode 100644
index 7f94b631c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/lxqt/themes/dark/spacer-plugin/spacer-line.svg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
deleted file mode 100644
index a19157a2b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-wallpapers/size=1
-wallpapers/1/file=wallpaper.jpg
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
deleted file mode 100644
index eec052da1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate symbolic link=/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-install.os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
deleted file mode 100644
index 2523a9fd4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.clr b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.crt b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.key b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.key
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.key
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.pem b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/.calculate_directory
deleted file mode 100644
index 78052934a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=&&os_install_x11_resolution!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/glib-compile-schemas b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/glib-compile-schemas
deleted file mode 100644
index 343872627..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/glib-compile-schemas
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null
-true
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/org.mate.background.gschema.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/org.mate.background.gschema.xml
deleted file mode 100644
index 3318e7c28..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/mate-base/mate-desktop/org.mate.background.gschema.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=patch path=/usr/share/glib-2.0/schemas pkg(media-gfx/dm-themes-calculate)!=
-<reg>(name="picture-filename"[^&gt;]*&gt;
-\s*&lt;default&gt;)[^&lt;]+&lt;</reg>
-#?os_install_x11_resolution!=||os_install_root_type!=livecd#
-<text>\1'/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#'&lt;</text>
-#os_install_x11_resolution#
-#?os_install_x11_resolution==&&os_install_root_type==livecd#
-<text>\1'/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#'&lt;</text>
-#os_install_x11_resolution#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/.calculate_directory
deleted file mode 100644
index 3d7f556c7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/backgrounds name=calculate os_install_x11_resolution==&&os_install_root_type==livecd&&pkg(mate-base/mate-session-manager)!=||os_install_x11_resolution==&&os_install_root_type==livecd&&pkg(gnome-extra/cinnamon-session)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux
deleted file mode 100644
index 46312e8b8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 11 Blue
deleted file mode 100644
index 5093441ab..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 11 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 11 Brown
deleted file mode 100644
index b21902ce5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 11 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 12 Blue
deleted file mode 100644
index 6dcdaaa5f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 12 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 12 Brown
deleted file mode 100644
index 712f46c3b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 12 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Blue
deleted file mode 100644
index 62694bf78..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Brown
deleted file mode 100644
index 8873daf9b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Green b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Green
deleted file mode 100644
index b0c7de15e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Green	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Magenta
deleted file mode 100644
index ce3f1e127..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 13 Magenta	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 14 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 14
deleted file mode 100644
index 6194d6484..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.livecd/Calculate Linux 14	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_14/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_14/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
deleted file mode 100644
index 362a91635..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate pkg(x11-themes/gnome-backgrounds)!= path=/usr/share/gnome-background-properties
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-	<wallpaper deleted="false">
-		<name>Calculate</name>
-#?os_install_x11_resolution!=||os_install_root_type!=livecd#
-		<filename>/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-#</filename>
-#os_install_x11_resolution#
-#?os_install_x11_resolution==&&os_install_root_type==livecd#
-		<filename>/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-#</filename>
-#os_install_x11_resolution#
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#66ba00</pcolor>
-	</wallpaper>
-</wallpapers>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/.calculate_directory
deleted file mode 100644
index 2a3b84811..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/backgrounds os_install_x11_resolution!=&&pkg(mate-base/mate-session-manager)!=||os_install_root_type!=livecd&&pkg(mate-base/mate-session-manager)!=||os_install_x11_resolution!=&&pkg(gnome-extra/cinnamon-session)!=||os_install_root_type!=livecd&&pkg(gnome-extra/cinnamon-session)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux
deleted file mode 100644
index 20a52fcab..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 11 Blue
deleted file mode 100644
index 3ed0d33cf..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 11 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 11 Brown
deleted file mode 100644
index b6e7c349a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 11 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 12 Blue
deleted file mode 100644
index f38fe8a2c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 12 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 12 Brown
deleted file mode 100644
index d4a84a28e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 12 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Blue
deleted file mode 100644
index e9540f83b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Brown
deleted file mode 100644
index c57b7719f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Green b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Green
deleted file mode 100644
index 66e74c523..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Green	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Magenta
deleted file mode 100644
index 9f671f63f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 13 Magenta	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 14 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 14
deleted file mode 100644
index ad8bdbfe5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate Linux 14	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_14/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_14/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
deleted file mode 100644
index 5845b2949..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Calculate path=/usr/share/mate-background-properties name=calculate.xml os_install_x11_resolution!=&&pkg(mate-base/mate-session-manager)!=||os_root_type==livecd&&pkg(mate-base/mate-session-manager)!=
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "mate-wp-list.dtd">
-<wallpapers>
-        <wallpaper deleted="false">
-                <name>Calculate Linux</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 13 Blue</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 13 Blue</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 13 Brown</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 13 Brown</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 13 Green</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 13 Green</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 13 Magenta</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 13 Magenta</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 12 Blue</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 12 Blue</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 12 Brown</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 12 Brown</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 11 Blue</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 11 Blue</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-        <wallpaper deleted="false">
-                <name>Calculate Linux 11 Brown</name>
-                <filename>/usr/share/backgrounds/calculate/Calculate Linux 11 Brown</filename>
-		<options>zoom</options>
-		<shade_type>solid</shade_type>
-		<pcolor>#000000</pcolor>
-		<scolor>#000000</scolor>
-		<artist>Calculate Ltd. http://www.calculate-linux.org</artist>
-        </wallpaper>
-</wallpapers>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
deleted file mode 100644
index 1a7de09a9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/backgrounds os_install_x11_resolution==&&os_install_root_type==livecd&&pkg(xfce-base/xfdesktop)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux
deleted file mode 100644
index 58b577fbc..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue
deleted file mode 100644
index 5021a8a23..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown
deleted file mode 100644
index 058b098d1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue
deleted file mode 100644
index bad0ee502..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown
deleted file mode 100644
index 7c38eaa98..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue
deleted file mode 100644
index 6a3697453..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown
deleted file mode 100644
index 4180c27bb..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green
deleted file mode 100644
index b1f6580b8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta
deleted file mode 100644
index 6207251d3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14
deleted file mode 100644
index 8d39d53cb..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_14/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate_Linux_14/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
deleted file mode 100644
index 7f4f36246..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/backgrounds os_install_x11_resolution!=&&pkg(xfce-base/xfdesktop)!=||os_install_root_type!=livecd&&pkg(xfce-base/xfdesktop)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux
deleted file mode 100644
index bde350dd3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue
deleted file mode 100644
index 5f75b76f4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown
deleted file mode 100644
index bc3df0595..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue
deleted file mode 100644
index 467c66298..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown
deleted file mode 100644
index 5bf1c8ec9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue
deleted file mode 100644
index 3a4548dc8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown
deleted file mode 100644
index 3d379e3a6..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green
deleted file mode 100644
index 5b3e4ff32..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta
deleted file mode 100644
index 473c68319..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14
deleted file mode 100644
index b9be16429..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate_Linux_14/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_14/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/.calculate_directory
deleted file mode 100644
index f16132d19..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()>=15 path=/usr/share name=wallpapers
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png
deleted file mode 100644
index 5eb33ab3c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate-splash/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-splash/contents/images)-# path=/usr/share/wallpapers mirror os_install_x11_resolution!=||os_install_root_type!=livecd
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png.livecd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png.livecd
deleted file mode 100644
index f799e7d25..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png.livecd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=dm-background.png link=/usr/share/wallpapers/Calculate-splash/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-splash/contents/images)-# path=/usr/share/wallpapers mirror os_install_x11_resolution==&&os_install_root_type==livecd
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/.calculate_directory
deleted file mode 100644
index bac6bc32e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()>=14 path=/usr/share/apps/kdm/themes name=calculate
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/background.jpg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/background.jpg
deleted file mode 100644
index 6f6326379..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/background.jpg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge(media-gfx/kdm-themes-calculate)!=&&pkg(media-gfx/kdm-themes-calculate)>=15&&os_install_x11_resolution!=||merge(media-gfx/kdm-themes-calculate)!=&&pkg(media-gfx/kdm-themes-calculate)>=15&&os_install_root_type!=livecd path=/usr/share/apps/ksplash/Themes/CalculateSplash/#-os_x11_standart-# link=/usr/share/wallpapers/Calculate-splash/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-splash/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/background.jpg.livecd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/background.jpg.livecd
deleted file mode 100644
index 87ff160a2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/background.jpg.livecd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=background.jpg merge(media-gfx/kdm-themes-calculate)!=&&pkg(media-gfx/kdm-themes-calculate)>=15&&os_install_x11_resolution==&&os_install_root_type==livecd path=/usr/share/apps/ksplash/Themes/CalculateSplash/#-os_x11_standart-# link=/usr/share/wallpapers/Calculate-splash/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-splash/contents/images)-# symbolic mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg
deleted file mode 100644
index c97c6c154..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1
deleted file mode 100644
index 672cfacfa..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=bg.jpg pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution!=||pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_root_type!=livecd link=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1.livecd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1.livecd
deleted file mode 100644
index 80c12b756..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/kdm-themes-calculate/bg.jpg.14-r1.livecd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=bg.jpg pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution==&&os_install_root_type==livecd link=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
deleted file mode 100644
index 9b6068048..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/plasma/look-and-feel/org.kde.calculate/contents/components name=artwork
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
deleted file mode 100644
index f3a4c1bf9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/wallpapers/Calculate-splash/contents/images/#-wallpaper(#-install.os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-splash/contents/images)-# mirror os_install_x11_resolution!=||os_install_root_type!=livecd
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.livecd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.livecd
deleted file mode 100644
index f066c51b5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.livecd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=background.jpg os_install_x11_resolution==&&os_install_root_type==livecd link=/usr/share/wallpapers/Calculate-splash/contents/images/#-wallpaper(#-install.os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-splash/contents/images)-# mirror
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/.calculate_directory
deleted file mode 100644
index 4dc81e7df..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/plymouth/themes name=calculate
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/calculate.script b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/calculate.script
deleted file mode 100644
index 202469eb6..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/plymouth-themes-calculate/calculate.script
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=patch multiline
-<reg>^shutdown_text = .*$</reg>
-#?os_install_locale_lang==ru_RU#
-<text>shutdown_text = "Завершение работы";</text>
-#os_install_locale_lang#
-#?os_install_locale_lang!=ru_RU#
-<text>shutdown_text = "Shutting down";</text>
-#os_install_locale_lang#
-#?pkg(media-gfx/plymouth-themes-calculate)>=14-r2&&pkg(media-gfx/plymouth-themes-calculate)<15#
-<reg>^shutdown_background_image_filename = .*$</reg>
-<text>shutdown_background_image_filename = "#-wallpaper(#-install.os_install_fb_resolution-#,/usr/share/plymouth/themes/calculate)-#";</text>
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
deleted file mode 100644
index 40d89541e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=openrc  pkg(media-gfx/splash-themes-calculate)>=14
-#?os_install_locale_lang==ru_RU&&pkg(media-gfx/splash-themes-calculate)<15#
-SPLASH_REBOOT_MESSAGE="Завершение работы..."
-SPLASH_SHUTDOWN_MESSAGE="Завершение работы..."
-#os_install_locale_lang#
-#?os_install_locale_lang!=ru_RU&&pkg(media-gfx/splash-themes-calculate)<15#
-SPLASH_REBOOT_MESSAGE="Shutting down..."
-SPLASH_SHUTDOWN_MESSAGE="Shutting down..."
-#os_install_locale_lang#
-#?os_install_locale_lang==ru_RU&&pkg(media-gfx/splash-themes-calculate)>=15#
-SPLASH_REBOOT_MESSAGE="З  а  в  е  р  ш  е  н  и  е    р  а  б  о  т  ы"
-SPLASH_SHUTDOWN_MESSAGE="З  а  в  е  р  ш  е  н  и  е    р  а  б  о  т  ы"
-#os_install_locale_lang#
-#?os_install_locale_lang!=ru_RU&&pkg(media-gfx/splash-themes-calculate)>=15#
-SPLASH_REBOOT_MESSAGE="S  h  u  t  t  i  n  g    d  o  w  n"
-SPLASH_SHUTDOWN_MESSAGE="S  h  u  t  t  i  n  g    d  o  w  n"
-#os_install_locale_lang#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
deleted file mode 100644
index 273f8de2d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc 
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
deleted file mode 100644
index 688fad0c8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=# protected cl_ver>=3.4.7
-#?os_audio==alsa#
-defaults.ctl.card #-os_audio_default-#
-defaults.pcm.card #-os_audio_default-#
-#os_audio#
-#?os_audio==pulseaudio#
-pcm.pulse {
-    type pulse
-}
-ctl.pulse {
-    type pulse
-}
-pcm.!default {
-    type pulse
-}
-ctl.!default {
-    type pulse
-}
-#os_audio#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old
deleted file mode 100644
index 949249cd2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=# name=asound.conf protected os_audio_default_set==on&&cl_ver<3.4.7||pkg(media-sound/pulseaudio)!=&&cl_ver<3.4.7
-#?pkg(media-sound/pulseaudio)!=#
-pcm.pulse {
-    type pulse
-}
-ctl.pulse {
-    type pulse
-}
-pcm.!default {
-    type pulse
-}
-ctl.!default {
-    type pulse
-}
-#pkg#
-#?pkg(media-sound/pulseaudio)==#
-defaults.ctl.card #-os_audio_default-#
-defaults.pcm.card #-os_audio_default-#
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
deleted file mode 100644
index 9c01ddd71..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate format=samba cl_ver>=3.4.7&&os_audio==alsa
-
-[install]
-os_audio = alsa
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
deleted file mode 100644
index 873409feb..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&cl_ver>=3.4.7 append=skip
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
deleted file mode 100644
index fabf440c1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-#?os_audio!=pulseaudio#
-NoDisplay=true
-#os_audio#
-#?os_audio==pulseaudio#
-!NoDisplay=
-#os_audio#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
deleted file mode 100644
index 9870f6a27..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&cl_ver>=3.4.7 path=/etc name=pulse
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
deleted file mode 100644
index aa1a367b2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate format=samba os_audio==pulseaudio
-
-[install]
-os_audio = pulseaudio
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
deleted file mode 100644
index aa6d95269..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate merge(media-sound/pulseaudio)!= format=postfix
-
-#?os_audio==pulseaudio#
-autospawn = yes
-#os_audio#
-#?os_audio!=pulseaudio#
-autospawn = no
-#os_audio#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
deleted file mode 100644
index 873409feb..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&cl_ver>=3.4.7 append=skip
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
deleted file mode 100644
index fda128e73..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-#?os_audio!=alsa#
-NoDisplay=true
-#os_audio#
-#?os_audio==alsa#
-!NoDisplay=
-#os_audio#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
deleted file mode 100644
index fda128e73..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-#?os_audio!=alsa#
-NoDisplay=true
-#os_audio#
-#?os_audio==alsa#
-!NoDisplay=
-#os_audio#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
deleted file mode 100644
index fda128e73..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde path=/usr/share/applications
-
-[Desktop Entry]
-#?os_audio!=alsa#
-NoDisplay=true
-#os_audio#
-#?os_audio==alsa#
-!NoDisplay=
-#os_audio#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
deleted file mode 100644
index ebc4d8a5d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=kde path=/etc/xdg/autostart cl_ver>=3.4.7
-
-[Desktop Entry]
-Name=VolumeIcon
-Comment=A lightweight volume control that sits in your systray
-#?os_audio==pulseaudio#
-Exec=/bin/bash -c "sleep 7;volumeicon"
-#os_audio#
-#?os_audio!=pulseaudio#
-Exec=volumeicon
-#os_audio#
-Terminal=false
-Type=Application
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop.old b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop.old
deleted file mode 100644
index 22d789a9c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop.old
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde path=/etc/xdg/autostart cl_ver<3.4.7
-
-[Desktop Entry]
-Name=VolumeIcon
-Comment=A lightweight volume control that sits in your systray
-Exec=/bin/bash -c "sleep 7;volumeicon"
-Terminal=false
-Type=Application
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
deleted file mode 100644
index 08c00dfd9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.clr b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.crt b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.key b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.key
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.key
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.pem b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
deleted file mode 100644
index 5e0caa52e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
deleted file mode 100644
index 222fc696c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde path=/usr/share/applications name=calculate-chat.desktop ini(desktop.chat)==hexchat
-
-[Desktop Entry]
-#?os_locale_language==fr#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-fr"
-#os_locale_language#
-#?os_locale_language==ru#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
-#os_locale_language#
-#?in(os_locale_language,fr,ru)==#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
-#in#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
deleted file mode 100644
index 08c00dfd9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.clr b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.crt b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.key b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.key
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.key
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.pem b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
deleted file mode 100644
index 2ce2e4e2a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/calculate name=DLNA os_linux_system==desktop
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
deleted file mode 100644
index 1de3cf507..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=procmail path=/etc
-
-friendly_name=#-os_install_net_hostname-#
-#?os_linux_system==server#
-media_dir=/var/calculate/server-data/samba/share
-#os_linux_system#
-#?os_linux_system==desktop#
-media_dir=/var/calculate/DLNA
-#os_linux_system#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
deleted file mode 100644
index 7811adec5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/calculate/server-data/samba name=share os_linux_system==server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
deleted file mode 100644
index 5e0caa52e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules
deleted file mode 100644
index 7197a607c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate append=replace path=/usr/share/polkit-1/rules.d pkg(kde-base/kdelibs)==4.11.1
-/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */
-
-// Let users in plugdev group modify NetworkManager
-polkit.addRule(function(action, subject) {
-    if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 &&
-        subject.isInGroup("plugdev")) {
-        return polkit.Result.YES;
-    }
-});
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
deleted file mode 100644
index 1896fb482..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/NetworkManager
-
-[main]
-# у�ловие выключени� интерфей�ов
-no-auto-default=#?list(os_install_net_interfaces,0)==||os_install_net_conf!=networkmanager||list(os_install_net_status,0)==off&&cl_merge_pkg!=||list(os_install_net_status,0)==off&&ac_install_disk==on||list(os_install_net_status,0)==off&&cl_setup==network##-list(os_install_net_mac,0)-#,#list##?list(os_install_net_interfaces,1)==||os_install_net_conf!=networkmanager||list(os_install_net_status,1)==off&&cl_merge_pkg!=||list(os_install_net_status,1)==off&&ac_install_disk==on||list(os_install_net_status,1)==off&&cl_setup==network##-list(os_install_net_mac,1)-#,#list##?list(os_install_net_interfaces,2)==||os_install_net_conf!=networkmanager||list(os_install_net_status,2)==off&&cl_merge_pkg!=||list(os_install_net_status,2)==off&&ac_install_disk==on||list(os_install_net_status,2)==off&&cl_setup==network##-list(os_install_net_mac,2)-#,#list##?list(os_install_net_interfaces,3)==||os_install_net_conf!=networkmanager||list(os_install_net_status,3)==off&&cl_merge_pkg!=||list(os_install_net_status,3)==off&&ac_install_disk==on||list(os_install_net_status,3)==off&&cl_setup==network##-list(os_install_net_mac,3)-#,#list#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
deleted file mode 100644
index 207652680..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/NetworkManager symbolic os_install_net_conf==networkmanager protected
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
deleted file mode 100644
index 7b6a28c9d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=NetworkManager append=remove os_install_net_conf!=networkmanager&&exists(/etc/runlevels/default/NetworkManager)!= protected
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/.calculate_directory
deleted file mode 100644
index 9d17fa7b5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/NetworkManager
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
deleted file mode 100644
index 8f7cba5e7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate chmod=0755
-#!/bin/bash
-
-DEV_NAME="$1"
-NM_ACTION="$2"
-
-if [[ ${NM_ACTION} == "down" ]]
-then
-	:
-fi
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
deleted file mode 100644
index 3536bfc40..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate chmod=0755
-#!/bin/bash
-
-DEV_NAME="$1"
-NM_ACTION="$2"
-
-if [[ ${NM_ACTION} == "up" ]]
-then
-	:
-fi
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
deleted file mode 100644
index bae29b0b0..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate  exec=/bin/bash cl_setup==network&&env(client.os_remote_auth)==
-
-#?list(os_install_net_interfaces,0)!=&&os_install_net_conf==networkmanager#
-(/etc/init.d/net.#-list(os_install_net_interfaces,0)-# status && /etc/init.d/net.#-list(os_install_net_interfaces,0)-# stop) &>/dev/null
-#list#
-#?list(os_install_net_interfaces,1)!=&&os_install_net_conf==networkmanager#
-(/etc/init.d/net.#-list(os_install_net_interfaces,1)-# status && /etc/init.d/net.#-list(os_install_net_interfaces,1)-# stop) &>/dev/null
-#list#
-#?list(os_install_net_interfaces,2)!=&&os_install_net_conf==networkmanager#
-(/etc/init.d/net.#-list(os_install_net_interfaces,2)-# status && /etc/init.d/net.#-list(os_install_net_interfaces,2)-# stop) &>/dev/null
-#list#
-#?list(os_install_net_interfaces,3)!=&&os_install_net_conf==networkmanager#
-(/etc/init.d/net.#-list(os_install_net_interfaces,3)-# status && /etc/init.d/net.#-list(os_install_net_interfaces,3)-# stop) &>/dev/null
-#list#
-
-#?os_install_net_conf==networkmanager#
-/etc/init.d/NetworkManager restart &>/dev/null
-#os_install_net_conf#
-#?os_install_net_conf!=networkmanager#
-(/etc/init.d/NetworkManager status && /etc/init.d/NetworkManager stop ) &>/dev/null
-#os_install_net_conf#
-
-true
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
deleted file mode 100644
index d44fdd83f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/NetworkManager name=system-connections os_install_net_conf==networkmanager&&ac_install_disk==on||os_install_net_conf==networkmanager&&cl_setup==network||os_install_net_conf==networkmanager&&os_install_root_type==livecd||os_install_net_conf==networkmanager&&cl_merge_pkg!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
deleted file mode 100644
index 7b08d18b5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=kde name=#-list(os_install_net_interfaces,0)-# list(os_install_net_interfaces,0)!=&&os_install_net_conf==networkmanager chmod=0600
-
-[802-3-ethernet]
-duplex=full
-mac-address=#-list(os_install_net_mac,0)-#
-
-[connection]
-id=#-list(os_install_net_interfaces,0)-#
-uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
-type=802-3-ethernet
-
-[ipv6]
-method=ignore
-
-[ipv4]
-#?os_install_net_dns!=#
-dns=#-replace(' ',';',os_install_net_dns)-#;
-#os_install_net_dns#
-#?os_install_net_dns_search!=#
-dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
-#os_install_net_dns_search#
-#?list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
-method=manual
-addresses1=#-list(os_install_net_ip,0)-#;#-list(os_install_net_cidr,0)-#;#-list(os_install_net_nmroute,0)-#
-#list#
-#?list(os_install_net_dhcp_set,0)==on#
-method=auto
-!addresses1=del
-#list#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
deleted file mode 100644
index 49928a88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=kde name=#-list(os_install_net_interfaces,1)-# list(os_install_net_interfaces,1)!=&&os_install_net_conf==networkmanager chmod=0600
-
-[802-3-ethernet]
-duplex=full
-mac-address=#-list(os_install_net_mac,1)-#
-
-[connection]
-id=#-list(os_install_net_interfaces,1)-#
-uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
-type=802-3-ethernet
-
-[ipv6]
-method=ignore
-
-[ipv4]
-#?os_install_net_dns!=#
-dns=#-replace(' ',';',os_install_net_dns)-#;
-#os_install_net_dns#
-#?os_install_net_dns_search!=#
-dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
-#os_install_net_dns_search#
-#?list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
-method=manual
-addresses1=#-list(os_install_net_ip,1)-#;#-list(os_install_net_cidr,1)-#;#-list(os_install_net_nmroute,1)-#
-#list#
-#?list(os_install_net_dhcp_set,1)==on#
-method=auto
-!addresses1=del
-#list#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
deleted file mode 100644
index fb1e9225d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=kde name=#-list(os_install_net_interfaces,2)-# list(os_install_net_interfaces,2)!=&&os_install_net_conf==networkmanager chmod=0600
-
-[802-3-ethernet]
-duplex=full
-mac-address=#-list(os_install_net_mac,2)-#
-
-[connection]
-id=#-list(os_install_net_interfaces,2)-#
-uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
-type=802-3-ethernet
-
-[ipv6]
-method=ignore
-
-[ipv4]
-#?os_install_net_dns!=#
-dns=#-replace(' ',';',os_install_net_dns)-#;
-#os_install_net_dns#
-#?os_install_net_dns_search!=#
-dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
-#os_install_net_dns_search#
-#?list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
-method=manual
-addresses1=#-list(os_install_net_ip,2)-#;#-list(os_install_net_cidr,2)-#;#-list(os_install_net_nmroute,2)-#
-#list#
-#?list(os_install_net_dhcp_set,2)==on#
-method=auto
-!addresses1=del
-#list#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
deleted file mode 100644
index fe1bac310..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=kde name=#-list(os_install_net_interfaces,3)-# list(os_install_net_interfaces,3)!=&&os_install_net_conf==networkmanager chmod=0600
-
-[802-3-ethernet]
-duplex=full
-mac-address=#-list(os_install_net_mac,3)-#
-
-[connection]
-id=#-list(os_install_net_interfaces,3)-#
-uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
-type=802-3-ethernet
-
-[ipv6]
-method=ignore
-
-[ipv4]
-#?os_install_net_dns!=#
-dns=#-replace(' ',';',os_install_net_dns)-#;
-#os_install_net_dns#
-#?os_install_net_dns_search!=#
-dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
-#os_install_net_dns_search#
-#?list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
-method=manual
-addresses1=#-list(os_install_net_ip,3)-#;#-list(os_install_net_cidr,3)-#;#-list(os_install_net_nmroute,3)-#
-#list#
-#?list(os_install_net_dhcp_set,3)==on#
-method=auto
-!addresses1=del
-#list#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
deleted file mode 100644
index 46c523bb8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=cron.hourly
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync
deleted file mode 100644
index 9e4f2b13a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=# os_install_ntp!= chmod=0755
-#!/bin/sh
-
-/usr/sbin/ntpdate -u #-os_install_ntp-# &>/dev/null
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
deleted file mode 100644
index 982ed7714..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate os_install_root_type!=livecd path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/default/sshd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
deleted file mode 100644
index 6ba87fddd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/sshd symbolic ini(runlevels.openssh)!=on&&ini(runlevels.openssh,on)==||grep(/var/lib/calculate/-runlevels-openssh,/sshd)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
deleted file mode 100644
index 800324e4a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate comment=# format=patch os_install_root_type==livecd
-<reg>(&lt;!passwd || return 1\n\tfi\n\t)(gen_keys \|\| return 1)</reg>
-<text>if grep "root:\$1\$JMvNh5xg\$VnV1DyJdTcwuZ0hp5YiJG0:14349:0:::::" /etc/shadow >/dev/null;
-	then
-		passwd || return 1
-	fi
-
-	\2</text>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/wget/wgetrc b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/wget/wgetrc
deleted file mode 100644
index cf3a8d6cd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-misc/wget/wgetrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=dovecot
-
-passive_ftp = on
-waitretry = 10
-http_proxy = #-os_install_proxy-#
-ftp_proxy = #-os_install_proxy-#
-#?os_install_proxy!=#
-use_proxy = on
-#os_install_proxy#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
deleted file mode 100644
index 39eda8e0f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/bluetooth symbolic path=/etc/runlevels/default ini(runlevels.bluez)!=on&&ini(runlevels.bluez,on)==||grep(/var/lib/calculate/-runlevels-bluez,/bluetooth)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/main.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
deleted file mode 100644
index 795ce9d37..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/bluetooth
-
-[General]
-Name = #-os_install_net_hostname-#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/hosts b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
deleted file mode 100644
index 9addcd293..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate comment=#
-127.0.0.1	#-os_install_net_hostname-#.#-os_install_net_domain-# #-os_install_net_hostname-# localhost
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/localtime b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
deleted file mode 100644
index b4e1f78bf..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/zoneinfo/#-os_install_clock_timezone-# mirror force
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
deleted file mode 100644
index 7dceb53ae..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate append=replace os_install_locale_language!=ru name=motd
-Welcome to the #-os_install_linux_name-# Installation CD!
-
-If any ethernet adapters were detected at boot, they should be auto-configured
-if DHCP is available on your network.
-To specify network settings, use utility "cl-setup-network".
-Example:"cl-setup-network --iface eth0:192.168.1.100:24 \
-          --route default:192.168.1.1 --dns 192.168.1.1"
-#?os_install_linux_system==server||os_install_linux_shortname==CLS#
-And restart net.eth0 by command "/etc/init.d/net.eth0 restart".
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_shortname!=CLS#
-And restart NetworkManager by command "/etc/init.d/NetworkManager restart".
-#os_install_linux_system#
-
-The latest version of the Handbook is always available from the Calculate Linux
-http://www.calculate-linux.org/handbook
-
-To start an ssh server on this system, type "/etc/init.d/sshd start".
-
-#?os_install_linux_system==server#
-For technical support, type "irc".
-#os_install_linux_system#
-#?os_install_linux_system==desktop#
-Please report any bugs you find to http://irc.calculate-linux.org.
-#os_install_linux_system#
-
-Thank you for using Calculate Linux!
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
deleted file mode 100644
index 08fe96d04..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate append=replace os_install_locale_language==ru name=motd
-Добро пожаловать в у�тановочный ди�к #-os_install_linux_name-#!
-
-Е�ли какой-либо из �етевых адаптеров был обнаружен при загрузке, он будет
-автоматиче�ки �конфигурирован, е�ли в �ети до�тупен DHCP �ервер.
-Дл� указани� �етевых на�троек и�пользуйте утилиту "cl-setup-network".
-Пример:"cl-setup-network --iface eth0:192.168.1.100:24 \
-        --route default:192.168.1.1 --dns 192.168.1.1"
-#?os_install_linux_system==server||os_install_linux_shortname==CLS#
-И перезапу�тите net.eth0 командой "/etc/init.d/net.eth0 restart".
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_shortname!=CLS#
-И перезапу�тите NetworkManager командой "/etc/init.d/NetworkManager restart".
-#os_install_linux_system#
-
-По�ледн�� вер�и� руковод�тва в�егда до�тупна на веб-�айте Calculate Linux
-http://www.calculate-linux.org/main/ru/handbook
-
-Дл� запу�ка ssh �ервера в �и�теме, выполните "/etc/init.d/sshd start".
-
-#?os_install_linux_system==server#
-Дл� получени� техниче�кой поддержки, выполните "irc".
-#os_install_linux_system#
-#?os_install_linux_system==desktop#
-Пожалуй�та �ообщайте о любых найденных ошибках на
-http://irc.calculate-linux.ru.
-#os_install_linux_system#
-
-Спа�ибо за и�пользование Calculate Linux!
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/timezone b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
deleted file mode 100644
index ccc0bfa56..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=replace protected
-#-os_install_clock_timezone-#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index b0f7904c0..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[client])!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
deleted file mode 100644
index a8a7fe987..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate env=client path=/etc/runlevels cl_remote_host!=||cl_remote_host_live!=
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
deleted file mode 100644
index 3364e0f67..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/client symbolic
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
deleted file mode 100644
index 0876ed39e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
deleted file mode 100644
index c393bcc1c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=openrc
-
-hostname="#-os_install_net_hostname-#"
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
deleted file mode 100644
index a602706bd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=openrc
-
-clock="local"
-#?os_root_type!=livecd#
-clock_systohc="YES"
-#os_root_type#
-#?os_root_type==livecd#
-clock_systohc="NO"
-#os_root_type#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
deleted file mode 100644
index 2f00a39cc..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=openrc
-
-keymap="#-os_install_locale_keymap-#"
-windowkeys="yes"
-extended_keymaps=""
-dumpkeys_charset="#-os_install_locale_dumpkeys-#"
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
deleted file mode 100644
index 9379b5caf..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate os_install_root_type==livecd&&pkg(sys-apps/openrc)<0.8.0 append=after comment=#
-# fix system time on livecd
-hwclock --hctosys
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
deleted file mode 100644
index e92cdc7e7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
+++ /dev/null
@@ -1,48 +0,0 @@
-# Calculate comment=# os_install_net_conf==openrc&&ac_install_disk==on||os_install_net_conf==openrc&&cl_setup==network||os_install_net_conf==openrc&&os_install_root_type==livecd||os_install_net_conf==openrc&&cl_merge_pkg!=
-
-#?os_install_linux_system==server#
-modules="!plug"
-#os_install_linux_system#
-#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
-config_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#"
-#list#
-#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)==on#
-config_#-list(os_install_net_interfaces,0)-#="dhcp"
-#list#
-#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=&&list(os_install_net_route,0)!=#
-routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
-#list#
-#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
-config_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#"
-#list#
-#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)==on#
-config_#-list(os_install_net_interfaces,1)-#="dhcp"
-#list#
-#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=&&list(os_install_net_route,1)!=#
-routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
-#list#
-#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
-config_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#"
-#list#
-#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)==on#
-config_#-list(os_install_net_interfaces,2)-#="dhcp"
-#list#
-#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=&&list(os_install_net_route,2)!=#
-routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
-#list#
-#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
-config_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#"
-#list#
-#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)==on#
-config_#-list(os_install_net_interfaces,3)-#="dhcp"
-#list#
-#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=&&list(os_install_net_route,3)!=#
-routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
-#list#
-#?os_install_net_dns!=#
-dns_servers="#-os_install_net_dns-#"
-#os_install_net_dns#
-#?os_install_net_dns_search!=#
-dns_search="#-os_install_net_dns_search-#"
-#os_install_net_dns_search#
-ifplugd="--no-beep"
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
deleted file mode 100644
index 2852882d6..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels name=default
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
deleted file mode 100644
index d6a5066c7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/numlock symbolic hr_laptop== ini(runlevels.openrc/numlock)!=on&&ini(runlevels.openrc/numlock,on)==||grep(/var/lib/calculate/-runlevels-openrc,/numlock)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
deleted file mode 100644
index 6159fb75c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=openrc protected
-
-LANG="#-os_install_locale_locale-#"
-LC_NUMERIC=POSIX
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
deleted file mode 100644
index afec7e616..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
deleted file mode 100644
index 03c136e6f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate name=net.#-list(os_install_net_interfaces,0)-# list(os_install_net_interfaces,0)!=&&os_install_net_conf==openrc&&list(os_install_net_status,0)!=off||list(os_install_net_interfaces,0)!=&&os_install_net_conf==openrc&&os_install_root_type==livecd&&cl_setup!=network link=net.lo symbolic
-
-# Создать файл запу�ка �етевой карты е�ли:
-# �етевой интерфей� �уще�твует (list(os_install_net_interfaces,0)!=)
-# дл� на�тройки �ети и�пользует�� openrc (os_install_net_conf==openrc)
-# �етевой интерфей� не выключен (list(os_install_net_status,0)!=off),
-# либо �то на�тройка при загрузке � livecd (os_install_root_type==livecd),
-# но не на�тройка через cl-setup-network (cl_setup!=network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
deleted file mode 100644
index f92784dcd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=remove name=net.#-list(os_install_net_interfaces,0)-# os_install_net_conf!=openrc&&list(os_install_net_interfaces,0)!=||list(os_install_net_status,0)==off&&cl_merge_pkg!=&&list(os_install_net_interfaces,0)!=||list(os_install_net_status,0)==off&&ac_install_disk==on&&list(os_install_net_interfaces,0)!=||list(os_install_net_status,0)==off&&cl_setup==network&&list(os_install_net_interfaces,0)!=
-
-# Удалить файл запу�ка �етевой карты е�ли (у�ловие не �вл�ет�� обратным):
-# �етевой интерфей� должен �уще�твовать (list(os_install_net_interfaces,0)==)
-# дл� на�тройки �ети и�пользует�� не openrc (os_install_net_conf!=openrc)
-# либо �етевой интерфей� выключен (list(os_install_net_status,0)==off) и
-#   �то у�тановка �и�темы на ди�к (ac_install_disk==on)
-#   либо �борка пакета (cl_merge_pkg!=)
-#   либо на�тройка �ети командой cl-setup-network (cl_setup==network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
deleted file mode 100644
index 620b6a553..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate name=net.#-list(os_install_net_interfaces,1)-# list(os_install_net_interfaces,1)!=&&os_install_net_conf==openrc&&list(os_install_net_status,1)!=off||list(os_install_net_interfaces,1)!=&&os_install_net_conf==openrc&&os_install_root_type==livecd&&cl_setup!=network link=net.lo symbolic
-
-# Создать файл запу�ка �етевой карты е�ли:
-# �етевой интерфей� �уще�твует (list(os_install_net_interfaces,1)!=)
-# дл� на�тройки �ети и�пользует�� openrc (os_install_net_conf==openrc)
-# �етевой интерфей� не выключен (list(os_install_net_status,1)!=off),
-# либо �то на�тройка при загрузке � livecd (os_install_root_type==livecd),
-# но не на�тройка через cl-setup-network (cl_setup!=network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
deleted file mode 100644
index 5101ce16f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=remove name=net.#-list(os_install_net_interfaces,1)-# os_install_net_conf!=openrc&&list(os_install_net_interfaces,1)!=||list(os_install_net_status,1)==off&&cl_merge_pkg!=&&list(os_install_net_interfaces,1)!=||list(os_install_net_status,1)==off&&ac_install_disk==on&&list(os_install_net_interfaces,1)!=||list(os_install_net_status,1)==off&&cl_setup==network&&list(os_install_net_interfaces,0)!=
-
-# Удалить файл запу�ка �етевой карты е�ли (у�ловие не �вл�ет�� обратным):
-# �етевой интерфей� должен �уще�твовать (list(os_install_net_interfaces,1)==)
-# дл� на�тройки �ети и�пользует�� не openrc (os_install_net_conf!=openrc)
-# либо �етевой интерфей� выключен (list(os_install_net_status,1)==off) и
-#   �то у�тановка �и�темы на ди�к (ac_install_disk==on)
-#   либо �борка пакета (cl_merge_pkg!=)
-#   либо на�тройка �ети командой cl-setup-network (cl_setup==network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
deleted file mode 100644
index a066a2b60..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate name=net.#-list(os_install_net_interfaces,2)-# list(os_install_net_interfaces,2)!=&&os_install_net_conf==openrc&&list(os_install_net_status,2)!=off||list(os_install_net_interfaces,2)!=&&os_install_net_conf==openrc&&os_install_root_type==livecd&&cl_setup!=network link=net.lo symbolic
-
-# Создать файл запу�ка �етевой карты е�ли:
-# �етевой интерфей� �уще�твует (list(os_install_net_interfaces,2)!=)
-# дл� на�тройки �ети и�пользует�� openrc (os_install_net_conf==openrc)
-# �етевой интерфей� не выключен (list(os_install_net_status,2)!=off),
-# либо �то на�тройка при загрузке � livecd (os_install_root_type==livecd),
-# но не на�тройка через cl-setup-network (cl_setup!=network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
deleted file mode 100644
index 6d41e2122..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=remove name=net.#-list(os_install_net_interfaces,2)-# os_install_net_conf!=openrc&&list(os_install_net_interfaces,2)!=||list(os_install_net_status,2)==off&&cl_merge_pkg!=&&list(os_install_net_interfaces,2)!=||list(os_install_net_status,2)==off&&ac_install_disk==on&&list(os_install_net_interfaces,2)!=||list(os_install_net_status,2)==off&&cl_setup==network&&list(os_install_net_interfaces,2)!=
-
-# Удалить файл запу�ка �етевой карты е�ли (у�ловие не �вл�ет�� обратным):
-# �етевой интерфей� должен �уще�твовать (list(os_install_net_interfaces,2)==)
-# дл� на�тройки �ети и�пользует�� не openrc (os_install_net_conf!=openrc)
-# либо �етевой интерфей� выключен (list(os_install_net_status,2)==off) и
-#   �то у�тановка �и�темы на ди�к (ac_install_disk==on)
-#   либо �борка пакета (cl_merge_pkg!=)
-#   либо на�тройка �ети командой cl-setup-network (cl_setup==network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3 b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
deleted file mode 100644
index 8d7e65238..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate name=net.#-list(os_install_net_interfaces,3)-# list(os_install_net_interfaces,3)!=&&os_install_net_conf==openrc&&list(os_install_net_status,3)!=off||list(os_install_net_interfaces,3)!=&&os_install_net_conf==openrc&&os_install_root_type==livecd&&cl_setup!=network link=net.lo symbolic
-
-# Создать файл запу�ка �етевой карты е�ли:
-# �етевой интерфей� �уще�твует (list(os_install_net_interfaces,3)!=)
-# дл� на�тройки �ети и�пользует�� openrc (os_install_net_conf==openrc)
-# �етевой интерфей� не выключен (list(os_install_net_status,3)!=off),
-# либо �то на�тройка при загрузке � livecd (os_install_root_type==livecd),
-# но не на�тройка через cl-setup-network (cl_setup!=network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
deleted file mode 100644
index 5a70acec4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=remove name=net.#-list(os_install_net_interfaces,3)-# os_install_net_conf!=openrc&&list(os_install_net_interfaces,3)!=||list(os_install_net_status,3)==off&&cl_merge_pkg!=&&list(os_install_net_interfaces,3)!=||list(os_install_net_status,3)==off&&ac_install_disk==on&&list(os_install_net_interfaces,3)!=||list(os_install_net_status,3)==off&&cl_setup==network&&list(os_install_net_interfaces,3)!=
-
-# Удалить файл запу�ка �етевой карты е�ли (у�ловие не �вл�ет�� обратным):
-# �етевой интерфей� должен �уще�твовать (list(os_install_net_interfaces,3)==)
-# дл� на�тройки �ети и�пользует�� не openrc (os_install_net_conf!=openrc)
-# либо �етевой интерфей� выключен (list(os_install_net_status,3)==off) и
-#   �то у�тановка �и�темы на ди�к (ac_install_disk==on)
-#   либо �борка пакета (cl_merge_pkg!=)
-#   либо на�тройка �ети командой cl-setup-network (cl_setup==network)
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
deleted file mode 100644
index f7802e8cd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate os_install_root_type==livecd&&pkg(sys-apps/openrc)>=0.8.0 comment=# chmod=0755
-# fix system time on livecd
-#?os_install_clock_type==local#
-hwclock --hctosys --localtime
-#os_install_clock_type#
-#?os_install_clock_type!=local#
-hwclock --hctosys --utc
-#os_install_clock_type#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
deleted file mode 100644
index b4afd0991..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=openrc
-
-#?os_install_root_dev==/dev/nfs#
-rc_nostop="netmount#?list(os_install_net_ip,0)!=# net.#-list(os_install_net_interfaces,0)-##list##?list(os_install_net_ip,1)!=# net.#-list(os_install_net_interfaces,1)-##list##?list(os_install_net_ip,2)!=# net.#-list(os_install_net_interfaces,2)-##list##?list(os_install_net_ip,3)!=# net.#-list(os_install_net_interfaces,3)-##list#"
-#os_install_root_dev#
-#?os_install_root_type==livecd#
-#disable unmounting of resources, created in initramfs
-no_umounts="/newroot.*:/lib/splash/cache:/lib64/splash/cache:/run/initramfs/live:/run/initramfs/isoscan"
-#os_install_root_type#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
deleted file mode 100644
index 411bfd791..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate exec=/bin/bash cl_setup==locale
-
-env-update &>/dev/null
-#/etc/init.d/keymaps restart &>/dev/null
-#/etc/init.d/consolefont restart &>/dev/null
-
-true
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
deleted file mode 100644
index 16bd59abc..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate exec=/bin/bash cl_setup==network&&env(client.os_remote_auth)==
-
-#?list(os_install_net_interfaces,0)!=&&os_install_net_conf==openrc#
-[[ -f /etc/init.d/net.#-list(os_install_net_interfaces,0)-# ]] && /etc/init.d/net.#-list(os_install_net_interfaces,0)-# restart &>/dev/null || ifconfig #-list(os_install_net_interfaces,0)-# down
-#list#
-#?list(os_install_net_interfaces,1)!=&&os_install_net_conf==openrc#
-[[ -f /etc/init.d/net.#-list(os_install_net_interfaces,1)-# ]] && /etc/init.d/net.#-list(os_install_net_interfaces,1)-# restart &>/dev/null || ifconfig #-list(os_install_net_interfaces,1)-# down
-#list#
-#?list(os_install_net_interfaces,2)!=&&os_install_net_conf==openrc#
-[[ -f /etc/init.d/net.#-list(os_install_net_interfaces,2)-# ]] && /etc/init.d/net.#-list(os_install_net_interfaces,2)-# restart &>/dev/null || ifconfig #-list(os_install_net_interfaces,2)-# down
-#list#
-#?list(os_install_net_interfaces,3)!=&&os_install_net_conf==openrc#
-[[ -f /etc/init.d/net.#-list(os_install_net_interfaces,3)-# ]] && /etc/init.d/net.#-list(os_install_net_interfaces,3)-# restart &>/dev/null || ifconfig #-list(os_install_net_interfaces,3)-# down
-#list#
-
-true
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/portage/make.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/portage/make.conf
deleted file mode 100644
index 999e87c58..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/portage/make.conf
+++ /dev/null
@@ -1,97 +0,0 @@
-# Calculate path=/etc/portage/make.conf name=custom protected exists(/etc/portage/make.conf/custom)==||ac_install_disk==on||os_install_root_type==livecd
-#?os_install_locale_language!=ru&&os_install_locale_language!=fr&&os_install_locale_language!=bg#
-#---------------------------
-# Basic build options
-#---------------------------
-# Update either from binary packages (by default) or from source.
-#os_install_locale_language#
-#?os_install_locale_language==ru#
-#------------------------------------
-# О�новные опции �борки
-#------------------------------------
-# И�пользование дл� обновлени� бинарных пакетов (по умолчанию) либо
-# и�ходных кодов.
-#os_install_locale_language#
-#?os_install_locale_language==fr#
-#-------------------------------
-# Configuration basique
-#-------------------------------
-# Mettre à jour depuis les paquets binaires (par défaut) ou les codes sources.
-#os_install_locale_language#
-#?os_install_locale_language==bg#
-#-----------------------------------------------
-# О�новни опции на компилатора
-#-----------------------------------------------
-#os_install_locale_language#
-#FEATURES="-getbinpkg"
-
-#?os_install_locale_language!=ru&&os_install_locale_language!=fr&&os_install_locale_language!=bg#
-#-------------------------
-# Compiler options
-#-------------------------
-# Additional options that will be passed to the compiler. The '-march=native' flag
-# tells it to optimize code generation for your specific hardware.
-#os_install_locale_language#
-#?os_install_locale_language==ru#
-#------------------------------------
-# �а�тройки компил�тора
-#------------------------------------
-# Дополнительные параметры, передаваемые компил�тору. Флаг '-march=native'
-# оптимизирует программы под ваше оборудование.
-#os_install_locale_language#
-#?os_install_locale_language==fr#
-#--------------------------------------
-# Paramètres du compilateur
-#--------------------------------------
-# Paramètres supplémentaires passés au compilateur. L'option '-march=native'
-# permet d'optimiser les applications en créant un code adapté à votre matériel.
-#os_install_locale_language#
-#?os_install_locale_language==bg#
-#----------------------------------------
-# �а�тройки на компилатора
-#----------------------------------------
-# Допълнителни параметри за компилатора. Флаг '-march=native'
-# оптимизира програмите �ъобразено � ваши� компютър.
-#os_install_locale_language#
-#CFLAGS="-O2 -march=native -pipe"
-#CXXFLAGS="${CFLAGS}"
-
-#?os_install_locale_language!=ru&&os_install_locale_language!=fr&&os_install_locale_language!=bg#
-#---------------------------------
-# Better compilation time
-#---------------------------------
-# Number of parallel processes run when installing a package. 
-#os_install_locale_language#
-#?os_install_locale_language==ru#
-#----------------------------------
-# У�корение компил�ции
-#----------------------------------
-# Количе�тво параллельных проце��ов, запу�каемых при у�тановке пакета.
-#os_install_locale_language#
-#?os_install_locale_language==fr#
-#------------------------------------------------------
-# Optimisation en vitesse de compilation
-#------------------------------------------------------
-# Nombre de processus lancés en parallèle pour installer un paquet.
-#os_install_locale_language#
-#?os_install_locale_language==bg#
-#-------------------------------------------
-# У�корение на компилирането
-#-------------------------------------------
-# Количе�тво паралелни проце�и, �тартирани при ин�талиране на пакети.
-#os_install_locale_language#
-MAKEOPTS="#-os_install_makeopts-#"
-
-#?os_install_locale_language!=ru&&os_install_locale_language!=fr&&os_install_locale_language!=bg#
-# Number of packages to build simultaneously.
-#os_install_locale_language#
-#?os_install_locale_language==ru#
-# Количе�тво пакетов дл� одновременной �борки.
-#os_install_locale_language#
-#?os_install_locale_language==fr#
-# Nombre de paquets à installer simultanément.
-#os_install_locale_language#
-#?os_install_locale_language==bg#
-# Количе�тво пакети за едновременно компилиране.
-#os_install_locale_language#
-#EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --jobs=1"
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/boot/preload b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
deleted file mode 100644
index d0c062695..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels name=default os_install_kernel_scheduler==noop
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
deleted file mode 100644
index 0b5e9ceb7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove ini(runlevels.preload,off)==
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
deleted file mode 100644
index d7e91f7a8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels os_install_kernel_scheduler!=noop
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default/preload b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default/preload
deleted file mode 100644
index 98713364f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/default/preload
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/preload symbolic os_install_root_type!=livecd ini(runlevels.preload)!=on&&ini(runlevels.preload,on)==||grep(/var/lib/calculate/-runlevels-preload,/preload)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/preload b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/preload
deleted file mode 100644
index 379eabec4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-apps/preload/preload
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=procmail path=/etc/conf.d
-
-PRELOAD_NICE="19"
-MIN_MEMORY="512"
-IONICE_OPTS="-c3"
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory
deleted file mode 100644
index 67f998182..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/consolekit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/polkit-1 name=actions
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/consolekit/org.freedesktop.consolekit.policy b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/consolekit/org.freedesktop.consolekit.policy
deleted file mode 100644
index 9fb20c96d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/consolekit/org.freedesktop.consolekit.policy
+++ /dev/null
@@ -1,49 +0,0 @@
-# Calculate append=replace
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<!--
-Policy definitions for ConsoleKit
--->
-
-<policyconfig>
-
-  <action id="org.freedesktop.consolekit.system.stop">
-    <description>Stop the system</description>
-    <message>System policy prevents stopping the system</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.consolekit.system.stop-multiple-users">
-    <description>Stop the system when multiple users are logged in</description>
-    <message>System policy prevents stopping the system when other users are logged in</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.consolekit.system.restart">
-    <description>Restart the system</description>
-    <message>System policy prevents restarting the system</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.consolekit.system.restart-multiple-users">
-    <description>Restart the system when multiple users are logged in</description>
-    <message>System policy prevents restarting the system when other users are logged in</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-</policyconfig>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
deleted file mode 100644
index c2a4fa073..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf
deleted file mode 100644
index a3cef442b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove force pkg(sys-apps/calculate-utils[-client])!=&&pkg(sys-apps/calculate-server)==
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/.calculate_directory
deleted file mode 100644
index c93e6e87f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate env=client append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/ldap.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/ldap.conf
deleted file mode 100644
index a66ff86b7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/ldap.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove force client.cl_remote_host==
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
deleted file mode 100644
index 90c3e8853..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-boot/grub:2)!= path=/boot
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
deleted file mode 100644
index 64c6cc109..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc name=grub.d cl_ver>=3.4.3&&install.os_install_root_type==hdd
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
deleted file mode 100644
index 174a90510..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate chmod=0755 protected builder.cl_builder_livemenu_path!=
-prefix="/usr"
-exec_prefix="/usr"
-datarootdir="/usr/share"
-livepath="#-builder.cl_builder_livemenu_path-#"
-
-. "/usr/share/grub/grub-mkconfig_lib"
-
-
-if [[ -d $livepath ]]; then
-	livedevice=$(grub-probe "$livepath" -t device)
-	liverelpath=$(grub-mkrelpath "$livepath")
-
-	cat <<EOF
-$(prepare_grub_to_access_device $livedevice)
-
-if [ -f ${liverelpath}/grub.cfg ]; then
-	menuentry 'Live HDD ...'  {
-$(prepare_grub_to_access_device $livedevice | grub_add_tab | grub_add_tab)
-		configfile ${liverelpath}/grub.cfg
-	}
-fi
-
-EOF
-fi
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
deleted file mode 100644
index f107559bd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=35_calculate append=remove builder.cl_builder_livemenu_path==
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
deleted file mode 100644
index 8fa573413..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=90_calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/menu.lst b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
deleted file mode 100644
index 62b9e12a0..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/boot/grub name=menu.lst append=remove
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/.calculate_directory
deleted file mode 100644
index f06e968c4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_ver>=3.3.1&&pkg(media-gfx/splash-themes-calculate)<14
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/create_hostonly b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/create_hostonly
deleted file mode 100644
index e3506d361..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/create_hostonly
+++ /dev/null
@@ -1,76 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off&&ac_install_unmerge==off&&pkg(sys-kernel/dracut)!=&&os_install_root_type!=livecd
-#!/bin/bash
-
-source /usr/share/grub/grub-mkconfig_lib
-
-get_latest_kernel() {
-    version_find_latest /boot/vmlinuz-*
-}
-
-get_safemode_name() {
-    local kernel=$1
-    #echo ${kernel/-calculate/-SafeMode}
-    [[ $kernel =~ ^([^-]+-[^-]+)-(.+)$ ]] && echo "${BASH_REMATCH[1]}-SafeMode-${BASH_REMATCH[2]}" || echo ${kernel}
-}
-
-get_kernel_version() {
-    local kernel=$1
-    file -L $kernel | sed -r 's/.*version (\S+)\s+.*/\1/'
-}
-
-get_kernel_initramfs() {
-    local kernel=$1
-    echo ${kernel/vmlinuz-/initramfs-}.img
-}
-
-is_calculate_kernel() {
-    local kernel=$1
-    local kernel_version=$(get_kernel_version $kernel)
-    [[ -f /usr/src/linux-${kernel_version}/.calculate ]]
-}
-
-die() {
-    echo $@ 1>&2
-    exit 1
-}
-
-create_hostonly_initramfs() {
-    local kernel_safemode=$(get_safemode_name $kernel)
-    local initrd=$(get_kernel_initramfs $kernel)
-    local initrd_tmp=$(get_kernel_initramfs $kernel).tmp
-    local initrd_safemode=$(get_safemode_name $initrd)
-
-    [[ -e $kernel_safemode ]] || (rm -f $kernel_safemode;ln -s $kernel $kernel_safemode &>/dev/null) || 
-        die "Failed to create kernel for safemode"
-
-    if ! [[ -e $initrd_safemode ]]
-    then
-        cp $initrd $initrd_safemode &>/dev/null || die "Failed to create initramfs safemode backup"
-    fi
-    if [[ -e $initrd_safemode ]]
-    then
-        local kernel_version=$(get_kernel_version $kernel)
-        [[ -n $kernel_version ]] || die "Failed to detect version"
-        echo "Creating Host-Only initramfs ..."
-#?os_install_x11_video_drv==#-os_x11_video_drv-##
-        dracut -H --xz -f --kver $kernel_version $initrd_tmp &>/dev/null ||
-            die "Failed to create Host-Only initramfs"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv!=#-os_x11_video_drv-##
-        dracut -H --xz -f --add-drivers="i915 uvesafb radeon nouveau amdgpu" --kver $kernel_version $initrd_tmp &>/dev/null ||
-            die "Failed to create Host-Only initramfs"
-#os_install_x11_video_drv#
-        mv $initrd_tmp $initrd &>/dev/null || die "Failed to rename initramfs"
-        echo "Host-Only initramfs has been created"
-    fi
-}
-
-kernel=$(get_latest_kernel)
-
-if [[ -e $kernel ]] && [[ -e $(get_kernel_initramfs $kernel) ]]
-then
-    is_calculate_kernel $kernel && create_hostonly_initramfs $kernel
-else
-    echo "Creating Host-Only initramfs was skipped"
-fi
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub
deleted file mode 100644
index 7bad93fd6..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type!=usb-hdd&&in(os_install_x11_video_drv,other,default)==
-#?os_install_linux_system==desktop&&kernel(zswap)==y#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop||kernel(zswap)!=y#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub.default b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub.default
deleted file mode 100644
index a200d41f2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub.default
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type!=usb-hdd&&in(os_install_x11_video_drv,other,default)!=
-#?os_install_linux_system==desktop&&kernel(zswap)==y#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# splash quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop||kernel(zswap)!=y#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# splash quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-#
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub.usbhdd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub.usbhdd
deleted file mode 100644
index 26db0e4f4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-plymouth/default.grub.usbhdd
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type==usb-hdd
-#?os_install_linux_system==desktop&&kernel(zswap)==y#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop||kernel(zswap)!=y#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-GRUB_DISABLE_OS_PROBER=true
-#
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/.calculate_directory
deleted file mode 100644
index 41200344b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_ver>=3.3.1&&pkg(media-gfx/splash-themes-calculate)>=14
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/create_hostonly b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/create_hostonly
deleted file mode 100644
index ab0238bf4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/create_hostonly
+++ /dev/null
@@ -1,76 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off&&ac_install_unmerge==off&&pkg(sys-kernel/dracut)!=&&os_install_root_type!=livecd
-#!/bin/bash
-
-source /usr/share/grub/grub-mkconfig_lib
-
-get_latest_kernel() {
-    version_find_latest /boot/vmlinuz-*
-}
-
-get_safemode_name() {
-    local kernel=$1
-    #echo ${kernel/-calculate/-SafeMode}
-    [[ $kernel =~ ^([^-]+-[^-]+)-(.+)$ ]] && echo "${BASH_REMATCH[1]}-SafeMode-${BASH_REMATCH[2]}" || echo ${kernel}
-}
-
-get_kernel_version() {
-    local kernel=$1
-    file -L $kernel | sed -r 's/.*version (\S+)\s+.*/\1/'
-}
-
-get_kernel_initramfs() {
-    local kernel=$1
-    echo ${kernel/vmlinuz-/initramfs-}.img
-}
-
-is_calculate_kernel() {
-    local kernel=$1
-    local kernel_version=$(get_kernel_version $kernel)
-    [[ -f /usr/src/linux-${kernel_version}/.calculate ]]
-}
-
-die() {
-    echo $@ 1>&2
-    exit 1
-}
-
-create_hostonly_initramfs() {
-    local kernel_safemode=$(get_safemode_name $kernel)
-    local initrd=$(get_kernel_initramfs $kernel)
-    local initrd_tmp=$(get_kernel_initramfs $kernel).tmp
-    local initrd_safemode=$(get_safemode_name $initrd)
-
-    [[ -e $kernel_safemode ]] || (rm -f $kernel_safemode;ln -s $kernel $kernel_safemode &>/dev/null) || 
-        die "Failed to create kernel for safemode"
-
-    if ! [[ -e $initrd_safemode ]]
-    then
-        cp $initrd $initrd_safemode &>/dev/null || die "Failed to create initramfs safemode backup"
-    fi
-    if [[ -e $initrd_safemode ]]
-    then
-        local kernel_version=$(get_kernel_version $kernel)
-        [[ -n $kernel_version ]] || die "Failed to detect version"
-        echo "Creating Host-Only initramfs ..."
-#?os_install_x11_video_drv==#-os_x11_video_drv-##
-        dracut -H --xz -f --kver $kernel_version $initrd_tmp &>/dev/null ||
-            die "Failed to create Host-Only initramfs"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv!=#-os_x11_video_drv-##
-        dracut -H --xz -f --add-drivers="i915 uvesafb radeon nouveau" --kver $kernel_version $initrd_tmp &>/dev/null ||
-            die "Failed to create Host-Only initramfs"
-#os_install_x11_video_drv#
-        mv $initrd_tmp $initrd &>/dev/null || die "Failed to rename initramfs"
-        echo "Host-Only initramfs has been created"
-    fi
-}
-
-kernel=$(get_latest_kernel)
-
-if [[ -e $kernel ]] && [[ -e $(get_kernel_initramfs $kernel) ]]
-then
-    is_calculate_kernel $kernel && create_hostonly_initramfs $kernel
-else
-    echo "Creating Host-Only initramfs was skipped"
-fi
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub
deleted file mode 100644
index 028e10120..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type!=usb-hdd&&in(os_install_x11_video_drv,other,default)==
-#?os_install_linux_system==desktop&&kernel(zswap)==y#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=silent,theme:calculate console=tty1 quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop||kernel(zswap)!=y#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=silent,theme:calculate console=tty1 quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub.default b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub.default
deleted file mode 100644
index 512a22d46..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub.default
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type!=usb-hdd&&in(os_install_x11_video_drv,other,default)!=
-#?os_install_linux_system==desktop&&kernel(zswap)==y#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# splash=silent,theme:calculate console=tty1 quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop||kernel(zswap)!=y#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# splash=silent,theme:calculate console=tty1 quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-#
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub.usbhdd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub.usbhdd
deleted file mode 100644
index f2608bd93..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/new-3.3.1-splashutils/default.grub.usbhdd
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type==usb-hdd
-#?os_install_linux_system==desktop&&kernel(zswap)==y#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=silent,theme:calculate console=tty1 quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop||kernel(zswap)!=y#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#  splash=silent,theme:calculate console=tty1 quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-GRUB_DISABLE_OS_PROBER=true
-#
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/.calculate_directory
deleted file mode 100644
index 4ede37ec6..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_ver<3.3.1
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/create_hostonly b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/create_hostonly
deleted file mode 100644
index ab0238bf4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/create_hostonly
+++ /dev/null
@@ -1,76 +0,0 @@
-# Calculate exec=/bin/bash ac_install_disk==off&&ac_install_unmerge==off&&pkg(sys-kernel/dracut)!=&&os_install_root_type!=livecd
-#!/bin/bash
-
-source /usr/share/grub/grub-mkconfig_lib
-
-get_latest_kernel() {
-    version_find_latest /boot/vmlinuz-*
-}
-
-get_safemode_name() {
-    local kernel=$1
-    #echo ${kernel/-calculate/-SafeMode}
-    [[ $kernel =~ ^([^-]+-[^-]+)-(.+)$ ]] && echo "${BASH_REMATCH[1]}-SafeMode-${BASH_REMATCH[2]}" || echo ${kernel}
-}
-
-get_kernel_version() {
-    local kernel=$1
-    file -L $kernel | sed -r 's/.*version (\S+)\s+.*/\1/'
-}
-
-get_kernel_initramfs() {
-    local kernel=$1
-    echo ${kernel/vmlinuz-/initramfs-}.img
-}
-
-is_calculate_kernel() {
-    local kernel=$1
-    local kernel_version=$(get_kernel_version $kernel)
-    [[ -f /usr/src/linux-${kernel_version}/.calculate ]]
-}
-
-die() {
-    echo $@ 1>&2
-    exit 1
-}
-
-create_hostonly_initramfs() {
-    local kernel_safemode=$(get_safemode_name $kernel)
-    local initrd=$(get_kernel_initramfs $kernel)
-    local initrd_tmp=$(get_kernel_initramfs $kernel).tmp
-    local initrd_safemode=$(get_safemode_name $initrd)
-
-    [[ -e $kernel_safemode ]] || (rm -f $kernel_safemode;ln -s $kernel $kernel_safemode &>/dev/null) || 
-        die "Failed to create kernel for safemode"
-
-    if ! [[ -e $initrd_safemode ]]
-    then
-        cp $initrd $initrd_safemode &>/dev/null || die "Failed to create initramfs safemode backup"
-    fi
-    if [[ -e $initrd_safemode ]]
-    then
-        local kernel_version=$(get_kernel_version $kernel)
-        [[ -n $kernel_version ]] || die "Failed to detect version"
-        echo "Creating Host-Only initramfs ..."
-#?os_install_x11_video_drv==#-os_x11_video_drv-##
-        dracut -H --xz -f --kver $kernel_version $initrd_tmp &>/dev/null ||
-            die "Failed to create Host-Only initramfs"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv!=#-os_x11_video_drv-##
-        dracut -H --xz -f --add-drivers="i915 uvesafb radeon nouveau" --kver $kernel_version $initrd_tmp &>/dev/null ||
-            die "Failed to create Host-Only initramfs"
-#os_install_x11_video_drv#
-        mv $initrd_tmp $initrd &>/dev/null || die "Failed to rename initramfs"
-        echo "Host-Only initramfs has been created"
-    fi
-}
-
-kernel=$(get_latest_kernel)
-
-if [[ -e $kernel ]] && [[ -e $(get_kernel_initramfs $kernel) ]]
-then
-    is_calculate_kernel $kernel && create_hostonly_initramfs $kernel
-else
-    echo "Creating Host-Only initramfs was skipped"
-fi
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub
deleted file mode 100644
index c63ad8712..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type!=usb-hdd&&in(os_install_x11_video_drv,other,default)==
-#?os_install_linux_system==desktop#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub.default b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub.default
deleted file mode 100644
index 4db3690d4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub.default
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type!=usb-hdd&&in(os_install_x11_video_drv,other,default)!=
-#?os_install_linux_system==desktop#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# splash quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# splash quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-#
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub.usbhdd b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub.usbhdd
deleted file mode 100644
index 630e3ce54..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/old/default.grub.usbhdd
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=openrc path=/etc/default name=grub os_install_root_type==usb-hdd
-#?os_install_linux_system==desktop#
-GRUB_CMDLINE_LINUX="zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=30 video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-#?os_install_linux_system!=desktop#
-GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet"
-#os_install_linux_system#
-GRUB_GFXMODE="#-os_install_fb_resolution-#"
-
-#?os_install_linux_subname==&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==off#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
-#os_install_linux_subname#
-#?os_install_linux_subname==&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
-#os_install_linux_subname#
-#?os_install_linux_subname!=&&os_install_scratch==on#
-GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
-#os_install_linux_subname#
-GRUB_DISABLE_OS_PROBER=true
-#
-#?os_install_grub_terminal==console#
-GRUB_TERMINAL=console
-#os_install_grub_terminal#
-#?os_install_grub_terminal==gfxterm#
-!GRUB_TERMINAL=
-#os_install_grub_terminal#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/update-grub b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/update-grub
deleted file mode 100644
index 86bfd9457..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/update-grub
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate exec=/bin/bash os_install_root_type!=livecd&&exists(/sbin/grub-mkconfig,root)!=&&pkg(sys-boot/grub)<2.00_p5000||os_install_root_type!=livecd&&exists(/usr/sbin/grub-mkconfig,root)!=&&pkg(sys-boot/grub)<2.00_p5000
-
-echo "Configuring the grub"
-#?exists(/sbin/grub-mkdevicemap,root)!=#
-/sbin/grub-mkdevicemap
-/sbin/grub-mkdevicemap -m #-cl_chroot_path-#/boot/grub/device.map
-#exists#
-#?exists(/usr/sbin/grub-mkconfig,root)!=#
-CHROOT_PATH=#-cl_chroot_grub-# /usr/sbin/grub-mkconfig -o #-cl_chroot_path-#/boot/grub/grub.cfg 2>/dev/null
-#exists#
-#?exists(/sbin/grub-mkconfig,root)!=#
-CHROOT_PATH=#-cl_chroot_grub-# /sbin/grub-mkconfig -o #-cl_chroot_path-#/boot/grub/grub.cfg 2>/dev/null
-#exists#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/update-grub.new b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/update-grub.new
deleted file mode 100644
index ea7fb95a4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-boot/grub/update-grub.new
+++ /dev/null
@@ -1,73 +0,0 @@
-# Calculate exec=/bin/bash os_install_root_type!=livecd&&os_install_scratch==off&&pkg(sys-boot/grub)>=2.00_p5000
-
-echo "Configuring the grub"
-# mount some need directories from the current system to the installing system
-
-#?ac_install_disk==on#
-mount -t proc none #-cl_chroot_path-#/proc
-mount -t sysfs none #-cl_chroot_path-#/sys
-mount -o bind /dev #-cl_chroot_path-#/dev
-#ac_install_disk#
-
-#?ac_install_disk==on&&os_arch_machine==i686&&os_install_arch_machine!=i686#
-for mdir in /bin /sbin /lib /usr/sbin /usr/bin /usr/lib /usr/libexec;do
-	mount -o bind $mdir #-cl_chroot_path-#/$mdir
-done
-#ac_install_disk#
-# bind mount current system root to install system for correct work os-prober
-#?os_root_type==hdd&&ac_install_disk==on#
-mount -o bind / #-cl_chroot_path-#/mnt
-#os_root_type#
-
-# temporary disable cache for blkid for correct work
-[[ -f #-cl_chroot_path-#/etc/blkid.conf ]] && mv #-cl_chroot_path-#/etc/blkid.conf #-cl_chroot_path-#/etc/blkid.conf.bak
-echo "CACHE_FILE=/dev/null" >#-cl_chroot_path-#/etc/blkid.conf
-
-loaded_modules() {
-	lsmod | sed -n '2,$p' | awk '{print $1}'
-}
-
-grep_modules() {
-	lsmod | sed -n '2,$p' | awk '{print  "-e "$1}'
-}
-
-before_mods=( $(grep_modules) )
-
-#?ac_install_disk==on#
-LANG=#-install.os_install_locale_locale-# /bin/chroot #-cl_chroot_path-# grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null
-#ac_install_disk#
-#?ac_install_disk==off#
-/usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null
-#ac_install_disk#
-res=$?
-
-for in in {0..3}
-do
-	for i in $(loaded_modules | grep -v ${before_mods[*]})
-	do
-		rmmod $i &>/dev/null
-	done 
-done
-
-
-[[ -f #-cl_chroot_path-#/etc/blkid.conf.bak ]] && mv #-cl_chroot_path-#/etc/blkid.conf.bak #-cl_chroot_path-#/etc/blkid.conf || rm -f #-cl_chroot_path-#/etc/blkid.conf
-
-#?ac_install_disk==on&&os_arch_machine==i686&&os_install_arch_machine!=i686#
-for mdir in /bin /sbin /lib /usr/sbin /usr/bin /usr/lib /usr/libexec;do
-	umount #-cl_chroot_path-#/$mdir
-done
-#ac_install_disk#
-
-#?ac_install_disk==on#
-umount #-cl_chroot_path-#/proc #-cl_chroot_path-#/sys #-cl_chroot_path-#/dev
-#ac_install_disk#
-
-#?os_root_type==hdd&&ac_install_disk==on#
-umount #-cl_chroot_path-#/mnt
-#os_root_type#
-
-#?exists(#-cl_chroot_path-#/boot/grub/unicode.pf2)!=&&exists(#-cl_chroot_path-#/usr/share/grub/unicode.pf2)!=#
-cp #-cl_chroot_path-#/usr/share/grub/unicode.pf2 #-cl_chroot_path-#/boot/grub/unicode.pf2 &>/dev/null
-#exists#
-
-exit $res
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
deleted file mode 100644
index 56f2a3ce9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate comment=# format=openrc os_install_root_type!=livecd
-PRELINKING=""
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
deleted file mode 100644
index 47e514c82..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate comment=# path=/etc/prelink.conf.d
--b /usr/lib32/libdbus-*
--b /usr/lib64/libdbus-*
--b /usr/lib/libdbus-*
--b /usr/lib64/libdbusmenu-qt.so*
--b /usr/lib/libdbusmenu-qt.so*
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
deleted file mode 100644
index 7a28eac79..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge(sys-fs/udev)!=&&pkg(sys-fs/udev)!=||merge(sys-fs/eudev)!=&&pkg(sys-fs/eudev)!= path=/etc name=modprobe.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
deleted file mode 100644
index 051cb085e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate comment=# path=/etc/udev/rules.d cl_ver>=3.3.2.5
-
-#?list(os_install_net_interfaces,0)!=#
-# #-list(os_install_net_name,0)-#
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="#-list(os_install_net_mac,0)-#", ATTR{dev_id}=="0x0", ATTR{type}=="1", NAME="#-list(os_install_net_interfaces,0)-#"
-#list#
-#?list(os_install_net_interfaces,1)!=#
-# #-list(os_install_net_name,1)-#
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="#-list(os_install_net_mac,1)-#", ATTR{dev_id}=="0x0", ATTR{type}=="1", NAME="#-list(os_install_net_interfaces,1)-#"
-#list#
-#?list(os_install_net_interfaces,2)!=#
-# #-list(os_install_net_name,2)-#
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="#-list(os_install_net_mac,2)-#", ATTR{dev_id}=="0x0", ATTR{type}=="1", NAME="#-list(os_install_net_interfaces,2)-#"
-#list#
-#?list(os_install_net_interfaces,3)!=#
-# #-list(os_install_net_name,3)-#
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="#-list(os_install_net_mac,3)-#", ATTR{dev_id}=="0x0", ATTR{type}=="1", NAME="#-list(os_install_net_interfaces,3)-#"
-#list#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
deleted file mode 100644
index d2c3e25b0..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/udev/rules.d name=70-persistent-net.rules os_install_root_type==usb-hdd
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/net_trigger b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/net_trigger
deleted file mode 100644
index c89586142..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/eudev/net_trigger
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate exec=/bin/bash pkg(sys-fs/eudev)!=&&pkg(sys-fs/eudev)<3.0
-
-/bin/udevadm trigger -c add -s net &>/dev/null
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
deleted file mode 100644
index 25323ea92..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/runlevels name=boot
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/lvm2/lvm b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
deleted file mode 100644
index 48533dbc5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate os_install_lvm_set==on link=/etc/init.d/lvm symbolic ini(runlevels.lvm2)!=on&&ini(runlevels.lvm2,on)==||grep(/var/lib/calculate/-runlevels-lvm2,/lvm)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
deleted file mode 100644
index 25323ea92..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/runlevels name=boot
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
deleted file mode 100644
index 8e38ba9f8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate os_install_mdadm_set==on link=/etc/init.d/mdadm symbolic ini(runlevels.mdadm)!=on&&ini(runlevels.mdadm,on)==||grep(/var/lib/calculate/-runlevels-mdadm,/mdadm)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
deleted file mode 100644
index 3687e19e2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=openrc path=/etc/conf.d os_install_root_type==usb-hdd
-
-# Disable adding new rules for persistent-net
-persistent_net_disable="yes"
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
deleted file mode 100644
index fd7ca1e95..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&os_install_root_type==hdd name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
deleted file mode 100644
index 185f6bea4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate comment=#
-
-#?os_install_locale_locale!=en_US.utf8#
-en_US.utf8 UTF-8
-#os_install_locale_locale#
-#-os_install_locale_locale-# UTF-8
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
deleted file mode 100644
index 67f998182..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/polkit-1 name=actions
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
deleted file mode 100644
index daf2dd627..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate comment=// path=/etc/polkit-1/rules.d pkg(xfce-base/xfce4-session)!=
-/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */
-
-// Allow to use the suspend and the hibernation with block session in XFCE
-//
-
-polkit.addRule(function(action, subject) {
-    if (/^org\.freedesktop\.upower\.(suspend|hibernate)$/.test(action.id) &&
-        subject.local) {
-        return polkit.Result.YES;
-    }
-});
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
deleted file mode 100644
index 0bce18ef5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<policyconfig>
-  <vendor>The DeviceKit-power Project</vendor>
-  <vendor_url>http://hal.freedesktop.org/docs/DeviceKit-power/</vendor_url>
-  <icon_name>system-suspend</icon_name>
-
-  <action id="org.freedesktop.upower.suspend">
-    <description>Suspend the system</description>
-    <message>Authentication is required to suspend the system</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.upower.hibernate">
-    <description>Hibernate the system</description>
-    <message>Authentication is required to hibernate the system</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-#?os_install_root_type==livecd#
-      <allow_active>no</allow_active>
-#os_install_root_type#
-#?os_install_root_type!=livecd#
-      <allow_active>yes</allow_active>
-#os_install_root_type#
-    </defaults>
-  </action>
-
-</policyconfig>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/vixie-cron/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/vixie-cron/.calculate_directory
deleted file mode 100644
index cd8dffbc2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/vixie-cron/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&os_install_root_type!=livecd path=/etc name=cron.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/vixie-cron/calculate-update b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/vixie-cron/calculate-update
deleted file mode 100644
index 49c6d1ab1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/sys-process/vixie-cron/calculate-update
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate
-
-# Global variables
-SHELL=/bin/bash
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-HOME=/
-
-# Check Update
-#?pkg(sys-apps/util-linux)!=#
-#-sum(c,1#-rnd(num,4)-#/170-58)-# * * * *	root	/usr/bin/nice -n19 /usr/bin/ionice -c3 /usr/sbin/cl-update --schedule -p --wait-another-update off &>/dev/null
-#pkg#
-#?pkg(sys-apps/util-linux)==#
-#-sum(c,1#-rnd(num,4)-#/170-58)-# * * * *       root    /usr/bin/nice -n19 /usr/sbin/cl-update --schedule -p --wait-another-update off &>/dev/null
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
deleted file mode 100644
index deeb84755..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
deleted file mode 100644
index 4e7f9c2b5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
+++ /dev/null
@@ -1,111 +0,0 @@
-# Calculate comment=# in(os_install_x11_video_drv,other,default)==
-
-Section "ServerLayout"
-  Identifier "Xorg Configured"
-  Screen "Monitor"
-EndSection
-
-Section "Files"
-  FontPath "/usr/share/fonts/corefonts"
-  FontPath "/usr/share/fonts/misc"
-  FontPath "/usr/share/fonts/droid"
-EndSection
-
-Section "Module"
-#?os_install_x11_video_drv!=nvidia&&os_install_x11_video_drv!=vesa#
-  Load "dri"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv==intel#
-  Load "i2c"
-  Load "bitmap"
-  Load "ddc"
-  Load "int10"
-  Load "vbe"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv!=intel#
-  Load "dbe" # Double buffer extension
-#os_install_x11_video_drv#
-  Load "glx" # OpenGL X protocol interface
-  Load "extmod" # Misc. required extension
-EndSection
-
-Section "Monitor"
-  Identifier "StandardMonitor"
-#?os_install_x11_video_drv==nvidia||os_install_x11_video_drv==vesa#
-  HorizSync 31.5 - 60.0
-  VertRefresh 60-160
-#os_install_x11_video_drv#
-  Option "DPMS"
-EndSection
-
-Section "Device"
-  Identifier "#-os_install_x11_video_drv-#VGA"
-#?hr_video_id!=#
-  BusID "PCI:#-hr_video_id-#"
-#hr_video_id#
-  Driver "#-os_install_x11_video_drv-#"
-#?os_install_x11_video_drv==nvidia#
-  Option "RenderAccel" "True"
-  Option "AllowGLXWithComposite" "True"
-  Option "NoLogo" "True"
-  Option "NvAgp" "1"
-  Option "DPI" "96x96"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv==fglrx#
-  Option "XAANoOffscreenPixmaps" "True"
-  Option "AllowGLXWithComposite" "True"
-  Option "RenderAccel" "True"
-  Option "AddARGBGLXVisuals" "True"
-  Option "TripleBuffer" "True"
-  Option "UseFBDev" "True"
-  #http://ru.gentoo-wiki.com/wiki/Fglrx
-  Option "VideoOverlay" "on" # fix bug with mplayer
-  Option "TexturedVideo" "on" # fix bug Xv
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv==intel#
-  Option "NoAccel" "False"
-  Option "DRI"     "True"
-  Option "AccelMethod" "sna"
-#os_install_x11_video_drv#
-EndSection
-
-Section "Screen"
-  Identifier "Monitor"
-  Device "#-os_install_x11_video_drv-#VGA"
-  Monitor "StandardMonitor"
-  DefaultDepth 24
-  Subsection "Display"
-    Viewport 0 0
-    Depth 24
-#?os_install_x11_resolution!=#
-    Modes "#-os_install_x11_resolution-#"
-#os_install_x11_resolution#
-  EndSubsection
-EndSection
-#?os_install_x11_video_drv!=nvidia&&os_install_x11_video_drv!=vesa&&os_install_x11_video_drv!=vmware&&os_install_x11_video_drv!=vboxvideo#
-
-Section "DRI"
-  Group        "video"
-  Mode         0666
-EndSection
-#os_install_x11_video_drv#
-
-#?os_install_x11_video_drv!=vmware&&os_install_x11_video_drv!=vboxvideo#
-Section "Extensions"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv==fglrx#
-  Option "RENDER" "On"
-  Option "XVideo" "On"
-#os_install_x11_video_drv#
-#?os_install_x11_composite==on&&os_install_x11_video_drv!=vesa&&os_install_x11_video_drv!=vmware&&os_install_x11_video_drv!=vboxvideo#
-  Option "Composite" "On"
-#os_install_x11_composite#
-#?os_install_x11_composite!=on&&os_install_x11_video_drv!=vesa&&os_install_x11_video_drv!=vmware&&os_install_x11_video_drv!=vboxvideo#
-  Option "Composite" "Off"
-#os_install_x11_composite#
-#?os_install_x11_video_drv==vesa#
-  Option "Composite" "Off"
-#os_install_x11_video_drv#
-#?os_install_x11_video_drv!=vmware&&os_install_x11_video_drv!=vboxvideo#
-EndSection
-#os_install_x11_video_drv#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
deleted file mode 100644
index d9b6b87f9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(x11-base/xorg-server)>=1.9.0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
deleted file mode 100644
index 54bf54163..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate comment=#
-
-# Keyboard settings
-Section "InputClass"
-  Identifier  "keyboard"
-  Driver  "evdev"
-  Option  "Protocol" "event"
-  MatchIsKeyboard "1"
-  Option "XkbLayout" "#-os_install_locale_xkbname-#"
-#?os_install_locale_language==ru#
-  Option "XkbOptions" "grp:caps_toggle,grp_led:scroll,compose:ralt"
-#os_install_locale_language#
-#?os_install_locale_language!=ru&&os_install_locale_language!=us#
-  Option "XkbOptions" "grp:caps_toggle,grp_led:scroll"
-#os_install_locale_language#
-EndSection
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
deleted file mode 100644
index 0ba532e4f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate comment=# in(os_install_x11_video_drv,other,default)!= name=xorg.conf
-
-Section "ServerLayout"
- Identifier "Xorg Configured"
- Screen "Monitor"
-EndSection
-
-Section "Files"
- FontPath "/usr/share/fonts/corefonts"
- FontPath "/usr/share/fonts/misc"
- FontPath "/usr/share/fonts/droid"
-EndSection
-
-Section "Module"
- Load "dbe" # Double buffer extension
- Load "glx" # OpenGL X protocol interface
- Load "extmod" # Misc. required extension
-EndSection
-
-Section "Screen"
- Identifier "Monitor"
-EndSection
-
-Section "Extensions"
-#?os_install_x11_composite==on#
- Option "Composite" "On"
-#os_install_x11_composite#
-#?os_install_x11_composite!=on#
- Option "Composite" "Off"
-#os_install_x11_composite#
-EndSection
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
deleted file mode 100644
index 1e8db6022..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
+++ /dev/null
@@ -1,36 +0,0 @@
-# Calculate comment=#
-
-CHECKVT=7
-#?cl_autologin!=&&pkg(x11-misc/lightdm)!=&&pkg(x11-misc/light-locker)!=#
-DISPLAYMANAGER="lightdm"
-START_STOP_ARGS=
-#cl_autologin#
-#?cl_autologin!=&&pkg(x11-misc/lightdm)==||cl_autologin!=&&pkg(x11-misc/light-locker)==#
-XUSER=#-cl_autologin-#
-DISPLAYMANAGER="bash"
-START_STOP_ARGS="--background -- /usr/bin/xautologin $XUSER $CHECKVT"
-#cl_autologin#
-#?cl_autologin==&&pkg(x11-misc/sddm)!=#
-DISPLAYMANAGER="sddm"
-START_STOP_ARGS=
-#cl_autologin#
-#?cl_autologin==&&pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="kdm"
-START_STOP_ARGS=
-#cl_autologin#
-#?cl_autologin==&&pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="lightdm"
-START_STOP_ARGS=
-#cl_autologin#
-#?cl_autologin==&&pkg(lxde-base/lxdm)!=&&pkg(x11-misc/lightdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="lxdm"
-START_STOP_ARGS=
-#cl_autologin#
-#?cl_autologin==&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(lxde-base/lxdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="gdm"
-START_STOP_ARGS=
-#cl_autologin#
-#?cl_autologin==&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(lxde-base/lxdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="slim"
-START_STOP_ARGS=
-#cl_autologin#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
deleted file mode 100644
index 4b9e8430d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/xdg name=autostart
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
deleted file mode 100644
index 0f7692b78..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[Desktop Entry]
-#?os_install_root_type==livecd#
-Exec=light-locker --lock-after-screensaver=86400
-#os_install_root_type#
-#?os_install_root_type!=livecd#
-Exec=light-locker
-#os_install_root_type#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
deleted file mode 100644
index 71933aab5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
deleted file mode 100644
index bdd263fca..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=kde path=/etc/lightdm
-
-[SeatDefaults]
-autologin-user=#-cl_autologin-#
-#?pkg(x11-wm/openbox)!=#
-user-session=openbox
-#pkg#
-#?pkg(xfce-base/xfce4-session)!=#
-user-session=xfce
-#pkg#
-#?pkg(mate-base/mate-session-manager)!=#
-user-session=mate
-#pkg#
-#?pkg(lxqt-base/lxqt-session)!=#
-user-session=lxqt
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
deleted file mode 100644
index 0876ed39e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
deleted file mode 100644
index 5e16aa47d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=kde
-
-[General]
-HaltCommand=/sbin/shutdown -h -P now
-RebootCommand=/sbin/shutdown -r now
-#?hr_laptop==#
-Numlock=on
-#hr_laptop#
-#?hr_laptop!=#
-Numlock=off
-#hr_laptop#
-
-[Theme]
-Current=maldives
-CursorTheme=Calculate
-
-[Users]
-MaximumUid=65000
-MinimumUid=1000
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
deleted file mode 100644
index 5db28ae97..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/sddm
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
deleted file mode 100644
index e4de77285..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[General]
-#?os_install_x11_resolution!=||os_install_root_type!=livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
-#?os_install_x11_resolution==&&os_install_root_type==livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
deleted file mode 100644
index e4de77285..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[General]
-#?os_install_x11_resolution!=||os_install_root_type!=livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
-#?os_install_x11_resolution==&&os_install_root_type==livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
deleted file mode 100644
index e4de77285..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[General]
-#?os_install_x11_resolution!=||os_install_root_type!=livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
-#?os_install_x11_resolution==&&os_install_root_type==livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
deleted file mode 100644
index e4de77285..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[General]
-#?os_install_x11_resolution!=||os_install_root_type!=livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
-#?os_install_x11_resolution==&&os_install_root_type==livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
deleted file mode 100644
index e4de77285..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[General]
-#?os_install_x11_resolution!=||os_install_root_type!=livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
-#?os_install_x11_resolution==&&os_install_root_type==livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#os_install_x11_resolution#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/slim/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/slim/.calculate_directory
deleted file mode 100644
index 0876ed39e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/slim/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/slim/slim.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/slim/slim.conf
deleted file mode 100644
index db2b88023..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-misc/slim/slim.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=proftpd
-#
-#?hr_laptop==#
-numlock	on
-#hr_laptop#
-#?hr_laptop!=#
-numlock	off
-#hr_laptop#
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
deleted file mode 100644
index 9e30a7f27..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
deleted file mode 100644
index da5ba7acb..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate append=replace pkg(x11-themes/gnome-themes-standard)>=3.8 path=/usr/share/themes/Adwaita/backgrounds
-<background>
-<static>
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution!=||pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_root_type!=livecd#
-<file>/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#</file>
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution==&&os_install_root_type==livecd#
-<file>/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#</file>
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
-<file>/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg</file>
-#pkg#
-</static>
-</background>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/.calculate_directory
deleted file mode 100644
index 360af5e42..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip hr_laptop!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/.calculate_directory
deleted file mode 100644
index 39de1e54e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip hr_laptop==lenovo
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
deleted file mode 100644
index 9f5c74c14..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=sudoers.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
deleted file mode 100644
index 3d53c5c09..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate path=/etc/sudoers.d chmod=0440
-#?load(char,/sys/bus/pci/devices/0000:03:00.0/vendor,root)!=0x8086||load(char,/sys/bus/pci/devices/0000:03:00.0/device,root)!=0x423d#
-Cmnd_Alias NETBOOK_CMDS = /usr/sbin/pm-hibernate
-#load#
-#?load(char,/sys/bus/pci/devices/0000:03:00.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:03:00.0/device,root)==0x423d#
-Cmnd_Alias NETBOOK_CMDS = /sbin/modprobe iwlagn, /sbin/rmmod iwlagn, /usr/sbin/pm-hibernate
-#load#
-%users	ALL=(ALL) NOPASSWD: NETBOOK_CMDS
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
deleted file mode 100644
index 5684a77d3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-# Calculate format=xml_gconf_tree
-<?xml version="1.0"?>
-<gconf>
-	<dir name="desktop">
-		<dir name="gnome">
-			<dir name="keybindings">
-#?load(char,/sys/bus/pci/devices/0000:03:00.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:03:00.0/device,root)==0x423d#
-				<dir name="custom_wifi_toggle">
-					<entry name="action" schema="/schemas/desktop/gnome/keybindings/custom_wifi_toggle/action"/>
-					<entry name="name" schema="/schemas/desktop/gnome/keybindings/custom_wifi_toggle/name"/>
-					<entry name="binding" schema="/schemas/desktop/gnome/keybindings/custom_wifi_toggle/binding"/>
-				</dir>
-#load#
-#?os_install_root_type!=livecd#
-				<dir name="custom_hibernate">
-					<entry name="action" schema="/schemas/desktop/gnome/keybindings/custom_hibernate/action"/>
-					<entry name="name" schema="/schemas/desktop/gnome/keybindings/custom_hibernate/name"/>
-					<entry name="binding" schema="/schemas/desktop/gnome/keybindings/custom_hibernate/binding"/>
-				</dir>
-#os_install_root_type#
-			</dir>
-		</dir>
-	</dir>
-	<dir name="schemas">
-		<dir name="desktop">
-			<dir name="gnome">
-				<dir name="keybindings">
-#?load(char,/sys/bus/pci/devices/0000:03:00.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:03:00.0/device,root)==0x423d#
-					<dir name="custom_wifi_toggle">
-						<entry name="action" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Toggle wifi">
-								<default type="string">
-									<stringvalue>/usr/bin/wifi_toggle</stringvalue>
-								</default>
-								<longdesc>
-          Command used to wifi toggle.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="binding" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Increase backlight">
-								<default type="string">
-									<stringvalue>XF86Launch6</stringvalue>
-								</default>
-								<longdesc>
-          Binding to wifi toggle.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="name" type="schema" stype="string" owner="calculate">
-							<local_schema locale="ru">
-								<default type="string">
-									<stringvalue>Включить/выключить бе�проводную �еть</stringvalue>
-								</default>
-							</local_schema>
-							<local_schema locale="C" short_desc="The name of the keyboard shortcut to increase screen backlight">
-								<default type="string">
-									<stringvalue>Toggle wifi</stringvalue>
-								</default>
-								<longdesc>
-          This is the name of the keyboard shortcut to wifi toggle. This name will be shown in the keyboard shortcut preferences dialog.
-        </longdesc>
-							</local_schema>
-						</entry>
-					</dir>
-#load#
-#?os_install_root_type!=livecd#
-					<dir name="custom_hibernate">
-						<entry name="action" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Hibernate">
-								<default type="string">
-									<stringvalue>sudo /usr/sbin/pm-hibernate</stringvalue>
-								</default>
-								<longdesc>
-          Command used to hibernate.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="binding" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Toggle cpu mode">
-								<default type="string">
-									<stringvalue>XF86Launch8</stringvalue>
-								</default>
-								<longdesc>
-          Binding to hibernate.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="name" type="schema" stype="string" owner="calculate">
-							<local_schema locale="ru">
-								<default type="string">
-									<stringvalue>Сп�щий режим</stringvalue>
-								</default>
-							</local_schema>
-							<local_schema locale="C" short_desc="The name of the keyboard shortcut to toggle cpu mode">
-								<default type="string">
-									<stringvalue>Hibernation</stringvalue>
-								</default>
-								<longdesc>
-          This is the name of the keyboard shortcut to hibernate. This name will be shown in the keyboard shortcut preferences dialog.
-        </longdesc>
-							</local_schema>
-						</entry>
-					</dir>
-#os_install_root_type#
-				</dir>
-			</dir>
-		</dir>
-	</dir>
-</gconf>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
deleted file mode 100644
index d7d0c0075..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/gconf name=gconf.xml.mandatory
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
deleted file mode 100644
index 6884e119e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/apps
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
deleted file mode 100644
index ee735fe52..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
+++ /dev/null
@@ -1,50 +0,0 @@
-# Calculate os_install_root_type!=livecd
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=This group contains actions that are set up for laptop.
-Comment[ru]=Группа дей�твий дл� ноутбуков.
-DataCount=1
-Enabled=true
-Name=Laptop Actions
-Name[ru]=Дей�тви� дл� ноутбука
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-AllowMerge=true
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=Hibernation.
-Comment[ru]=Включить �п�щий режим.
-Enabled=true
-Name=Hibernation
-Name[ru]=Сп�щий режим
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-CommandURL=sudo /usr/sbin/pm-hibernate
-Type=COMMAND_URL
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-Comment[ru]=Про�тое дей�твие
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Launch (A)
-Type=SHORTCUT
-
-[Main]
-Version=2
-ImportId=hibernate
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
deleted file mode 100644
index 12950ba4f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
+++ /dev/null
@@ -1,50 +0,0 @@
-# Calculate load(char,/sys/bus/pci/devices/0000:03:00.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:03:00.0/device,root)==0x423d
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=This group contains actions that are set up for laptop.
-Comment[ru]=Группа дей�твий дл� ноутбуков.
-DataCount=1
-Enabled=true
-Name=Laptop Actions
-Name[ru]=Дей�тви� дл� ноутбука
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-AllowMerge=true
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=Toggle wireless net.
-Comment[ru]=Включить/включить бе�проводную �еть.
-Enabled=true
-Name=Toggle wifi
-Name[ru]=Вкл/Выкл wifi
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-CommandURL=/usr/bin/wifi_toggle
-Type=COMMAND_URL
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-Comment[ru]=Про�тое дей�твие
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Launch (8)
-Type=SHORTCUT
-
-[Main]
-Version=2
-ImportId=toggle_wifi
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/.calculate_directory
deleted file mode 100644
index 0686f2dab..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils)!= path=/ name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/bin/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/bin/.calculate_directory
deleted file mode 100644
index 00db44bee..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/bin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/bin/wifi_toggle b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/bin/wifi_toggle
deleted file mode 100644
index ad15d75f5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/bin/wifi_toggle
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate chmod=0755 comment=# load(char,/sys/bus/pci/devices/0000:03:00.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:03:00.0/device,root)==0x423d
-#!/bin/bash
-# toggle wifi
-
-#?pkg(media-fonts/droid)!=#
-FONT='-*-droid sans-bold-*-*-*-34-*-*-*-*-*-*-*'
-#pkg#
-#?pkg(media-fonts/droid)==#
-FONT='-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*'
-#pkg#
-DELAY=1
-
-if lsmod | grep -q iwlagn
-then
-    sudo rmmod iwlagn
-    message="Wifi disable"
-else
-    sudo modprobe iwlagn
-    message="Wifi enable"
-fi
- 
-if which kdialog &>/dev/null
-then
-	kdialog --passivepopup "${message}" --title "Wifi" ${DELAY}
-elif which osd_cat &>/dev/null
-then
-	osd_cat -A center -p middle -f "${FONT}" -d ${DELAY} << EOF
-${message}
-EOF
-fi
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/init.d/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/init.d/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/init.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/init.d/laptopd b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/init.d/laptopd
deleted file mode 100644
index 5a6e1cb63..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/init.d/laptopd
+++ /dev/null
@@ -1,33 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.3-init.d,v 1.1 2010/04/04 16:39:09 ssuominen Exp $
-
-depend() {
-	after *
-}
-
-start() {
-	ebegin "Configure laptop"
-	setkeycodes e007 187   # XF86Launch8
-	setkeycodes e00e 185   # XF86Launch5
-	setkeycodes e04e 0     # Drop plus-minux
-	if lsmod | grep -q "^psmouse"
-	then
-		rmmod psmouse
-		modprobe psmouse
-	fi
-	lsmod | grep -q "^acer_wmi" && rmmod acer-wmi
-#?hr_laptop_model==Mariana-3B#
-	lsmod | grep -q "^tg3" && rmmod tg3
-	modprobe -q broadcom
-	modprobe -q tg3
-#hr_laptop_model#
-	eend 0
-}
-
-stop() {
-	eend 0
-}
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/laptopd b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/laptopd
deleted file mode 100644
index 5d76e4f51..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-install/runlevels/default/laptopd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/laptopd symbolic ini(runlevels.calculate-utils/laptopd)!=on&&ini(runlevels.calculate-utils/laptopd,on)==||grep(/var/lib/calculate/-runlevels-calculate-utils,/laptopd)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
deleted file mode 100644
index 390da254a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=modprobe.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
deleted file mode 100644
index a9566d81f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=patch comment=#
-<reg>blacklist usbkbd
-
-</reg>
-<text>blacklist usbkbd
-blacklist acer-wmi
-
-</text>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
deleted file mode 100644
index 390da254a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=modprobe.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
deleted file mode 100644
index a9566d81f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=patch comment=#
-<reg>blacklist usbkbd
-
-</reg>
-<text>blacklist usbkbd
-blacklist acer-wmi
-
-</text>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
deleted file mode 100644
index 390da254a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=modprobe.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
deleted file mode 100644
index 38de74dc4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-# Psmouse driver kernel modules' configuration file.
-
-options psmouse proto=imps
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
deleted file mode 100644
index 80af4cbe7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/xdg/xfce4/xfconf name=xfce-perchannel-xml
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index 1a0f329d2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-#?load(char,/sys/bus/pci/devices/0000:03:00.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:03:00.0/device,root)==0x423d#
-      <property name="XF86Launch6" type="string" value="/usr/bin/wifi_toggle"/>
-#load#
-#?os_install_root_type!=livecd#
-      <property name="XF86Launch8" type="string" value="/usr/bin/xfce4-session-logout --hibernate"/>
-#os_install_root_type#
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/.calculate_directory
deleted file mode 100644
index 2f80435c4..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip hr_laptop==samsung
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
deleted file mode 100644
index 9f5c74c14..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=sudoers.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
deleted file mode 100644
index 63d2957ea..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate path=/etc/sudoers.d chmod=0440
-#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)!=0x8086||load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)!=0xa011&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)!=0x2a42#
-Cmnd_Alias NETBOOK_CMDS = /usr/bin/cpufreq_toggle_osd, /usr/bin/cpufreq_toggle
-#load#
-#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42#
-Cmnd_Alias NETBOOK_CMDS = /usr/bin/backlight, /usr/bin/cpufreq_toggle_osd, /usr/bin/cpufreq_toggle
-#load#
-%users	ALL=(ALL) NOPASSWD: NETBOOK_CMDS
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
deleted file mode 100644
index 6aa37e1b6..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-# Calculate format=xml_gconf_tree
-<?xml version="1.0"?>
-<gconf>
-	<dir name="desktop">
-		<dir name="gnome">
-			<dir name="keybindings">
-#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42#
-				<dir name="custom_brn_up">
-					<entry name="action" schema="/schemas/desktop/gnome/keybindings/custom_brn_up/action"/>
-					<entry name="name" schema="/schemas/desktop/gnome/keybindings/custom_brn_up/name"/>
-					<entry name="binding" schema="/schemas/desktop/gnome/keybindings/custom_brn_up/binding"/>
-				</dir>
-				<dir name="custom_brn_down">
-					<entry name="action" schema="/schemas/desktop/gnome/keybindings/custom_brn_down/action"/>
-					<entry name="name" schema="/schemas/desktop/gnome/keybindings/custom_brn_down/name"/>
-					<entry name="binding" schema="/schemas/desktop/gnome/keybindings/custom_brn_down/binding"/>
-				</dir>
-				<dir name="custom_brn_toggle">
-					<entry name="action" schema="/schemas/desktop/gnome/keybindings/custom_brn_toggle/action"/>
-					<entry name="name" schema="/schemas/desktop/gnome/keybindings/custom_brn_toggle/name"/>
-					<entry name="binding" schema="/schemas/desktop/gnome/keybindings/custom_brn_toggle/binding"/>
-				</dir>
-#load#
-				<dir name="custom_cpu_toggle">
-					<entry name="action" schema="/schemas/desktop/gnome/keybindings/custom_cpu_toggle/action"/>
-					<entry name="name" schema="/schemas/desktop/gnome/keybindings/custom_cpu_toggle/name"/>
-					<entry name="binding" schema="/schemas/desktop/gnome/keybindings/custom_cpu_toggle/binding"/>
-				</dir>
-			</dir>
-		</dir>
-	</dir>
-	<dir name="schemas">
-		<dir name="desktop">
-			<dir name="gnome">
-				<dir name="keybindings">
-#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42#
-					<dir name="custom_brn_up">
-						<entry name="action" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Increase backlight">
-								<default type="string">
-									<stringvalue>sudo /usr/bin/backlight up</stringvalue>
-								</default>
-								<longdesc>
-          Command used to increase screen backlight.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="binding" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Increase backlight">
-								<default type="string">
-									<stringvalue>XF86KbdBrightnessUp</stringvalue>
-								</default>
-								<longdesc>
-          Binding to increase screen backlight.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="name" type="schema" stype="string" owner="calculate">
-							<local_schema locale="ru">
-								<default type="string">
-									<stringvalue>Увеличить �рко�ть �крана</stringvalue>
-								</default>
-							</local_schema>
-							<local_schema locale="C" short_desc="The name of the keyboard shortcut to increase screen backlight">
-								<default type="string">
-									<stringvalue>Increase screen backlight</stringvalue>
-								</default>
-								<longdesc>
-          This is the name of the keyboard shortcut to increase screen backlight. This name will be shown in the keyboard shortcut preferences dialog.
-        </longdesc>
-							</local_schema>
-						</entry>
-					</dir>
-					<dir name="custom_brn_down">
-						<entry name="action" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Decrease backlight">
-								<default type="string">
-									<stringvalue>sudo /usr/bin/backlight down</stringvalue>
-								</default>
-								<longdesc>
-          Command used to decrease screen backlight.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="binding" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Decrease backlight">
-								<default type="string">
-									<stringvalue>XF86KbdBrightnessDown</stringvalue>
-								</default>
-								<longdesc>
-          Binding to decrease screen backlight.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="name" type="schema" stype="string" owner="calculate">
-							<local_schema locale="ru">
-								<default type="string">
-									<stringvalue>Уменьшить �рко�ть �крана</stringvalue>
-								</default>
-							</local_schema>
-							<local_schema locale="C" short_desc="The name of the keyboard shortcut to decrease screen backlight">
-								<default type="string">
-									<stringvalue>Decrease screen backlight</stringvalue>
-								</default>
-								<longdesc>
-          This is the name of the keyboard shortcut to decrease screen backlight. This name will be shown in the keyboard shortcut preferences dialog.
-        </longdesc>
-							</local_schema>
-						</entry>
-					</dir>
-					<dir name="custom_brn_toggle">
-						<entry name="action" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Toggle backlight">
-								<default type="string">
-									<stringvalue>sudo /usr/bin/backlight toggle</stringvalue>
-								</default>
-								<longdesc>
-          Command used to toggle screen backlight.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="binding" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Toggle backlight">
-								<default type="string">
-									<stringvalue>XF86Launch1</stringvalue>
-								</default>
-								<longdesc>
-          Binding to toggle screen backlight.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="name" type="schema" stype="string" owner="calculate">
-							<local_schema locale="ru">
-								<default type="string">
-									<stringvalue>Выключить/включить �кран</stringvalue>
-								</default>
-							</local_schema>
-							<local_schema locale="C" short_desc="The name of the keyboard shortcut to toggle screen backlight">
-								<default type="string">
-									<stringvalue>Toggle screen backlight</stringvalue>
-								</default>
-								<longdesc>
-          This is the name of the keyboard shortcut to toggle screen backlight. This name will be shown in the keyboard shortcut preferences dialog.
-        </longdesc>
-							</local_schema>
-						</entry>
-					</dir>
-#load#
-					<dir name="custom_cpu_toggle">
-						<entry name="action" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Toggle cpu mode">
-								<default type="string">
-									<stringvalue>sudo /usr/bin/cpufreq_toggle_osd</stringvalue>
-								</default>
-								<longdesc>
-          Command used to toggle cpu mode.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="binding" type="schema" stype="string" owner="calculate">
-							<local_schema locale="C" short_desc="Toggle cpu mode">
-								<default type="string">
-									<stringvalue>XF86Launch3</stringvalue>
-								</default>
-								<longdesc>
-          Binding to toggle cpu mode.
-        </longdesc>
-							</local_schema>
-						</entry>
-						<entry name="name" type="schema" stype="string" owner="calculate">
-							<local_schema locale="ru">
-								<default type="string">
-									<stringvalue>Переключить режим проце��ора</stringvalue>
-								</default>
-							</local_schema>
-							<local_schema locale="C" short_desc="The name of the keyboard shortcut to toggle cpu mode">
-								<default type="string">
-									<stringvalue>Toggle cpu mode</stringvalue>
-								</default>
-								<longdesc>
-          This is the name of the keyboard shortcut to toggle cpu mode. This name will be shown in the keyboard shortcut preferences dialog.
-        </longdesc>
-							</local_schema>
-						</entry>
-					</dir>
-				</dir>
-			</dir>
-		</dir>
-	</dir>
-</gconf>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
deleted file mode 100644
index d7d0c0075..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/gconf name=gconf.xml.mandatory
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
deleted file mode 100644
index 6884e119e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/apps
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
deleted file mode 100644
index ad1ffb5d1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
+++ /dev/null
@@ -1,50 +0,0 @@
-# Calculate load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=This group contains actions that are set up for laptop.
-Comment[ru]=Группа дей�твий дл� ноутбуков.
-DataCount=1
-Enabled=true
-Name=Laptop Actions
-Name[ru]=Дей�тви� дл� ноутбука
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-AllowMerge=true
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=Decrease screen backlight.
-Comment[ru]=Уменьшить �рко�ть �крана.
-Enabled=true
-Name=BacklightDown
-Name[ru]=Уменьшить �рко�ть
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-CommandURL=sudo /usr/bin/backlight down
-Type=COMMAND_URL
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-Comment[ru]=Про�тое дей�твие
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Keyboard Brightness Down
-Type=SHORTCUT
-
-[Main]
-Version=2
-ImportId=brightdown
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
deleted file mode 100644
index 61cd22204..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
+++ /dev/null
@@ -1,50 +0,0 @@
-# Calculate load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=This group contains actions that are set up for laptop.
-Comment[ru]=Группа дей�твий дл� ноутбуков.
-DataCount=1
-Enabled=true
-Name=Laptop Actions
-Name[ru]=Дей�тви� дл� ноутбука
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-AllowMerge=true
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=Increase screen backlight.
-Comment[ru]=Увеличить �рко�ть �крана.
-Enabled=true
-Name=BacklightUp
-Name[ru]=Увеличить �рко�ть
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-CommandURL=sudo /usr/bin/backlight up
-Type=COMMAND_URL
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-Comment[ru]=Про�тое дей�твие
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Keyboard Brightness Up
-Type=SHORTCUT
-
-[Main]
-Version=2
-ImportId=brightup
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
deleted file mode 100644
index bc56a2b4a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
+++ /dev/null
@@ -1,50 +0,0 @@
-# Calculate load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=This group contains actions that are set up for laptop.
-Comment[ru]=Группа дей�твий дл� ноутбуков.
-DataCount=1
-Enabled=true
-Name=Laptop Actions
-Name[ru]=Дей�тви� дл� ноутбука
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-AllowMerge=true
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=Toggle screen backlight.
-Comment[ru]=Выключить/включить �кран.
-Enabled=true
-Name=Toggle backlight
-Name[ru]=Вкл/Выкл �кран
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-CommandURL=sudo /usr/bin/backlight toggle
-Type=COMMAND_URL
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-Comment[ru]=Про�тое дей�твие
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Launch (3)
-Type=SHORTCUT
-
-[Main]
-Version=2
-ImportId=togglebacklight
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
deleted file mode 100644
index e8385d082..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
+++ /dev/null
@@ -1,49 +0,0 @@
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=This group contains actions that are set up for laptop.
-Comment[ru]=Группа дей�твий дл� ноутбуков.
-DataCount=1
-Enabled=true
-Name=Laptop Actions
-Name[ru]=Дей�тви� дл� ноутбука
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-AllowMerge=true
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=Toggle cpu mode.
-Comment[ru]=Переключить режим работы проце��ора.
-Enabled=true
-Name=Toggle cpu
-Name[ru]=Переключить проце��ор
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-CommandURL=/usr/bin/cpufreq_toggle_kde
-Type=COMMAND_URL
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-Comment[ru]=Про�тое дей�твие
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Launch (5)
-Type=SHORTCUT
-
-[Main]
-Version=2
-ImportId=togglecpu
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/.calculate_directory
deleted file mode 100644
index 337207d78..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/ name=etc
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/.calculate_directory
deleted file mode 100644
index 00db44bee..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/backlight b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/backlight
deleted file mode 100644
index d42450eab..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/backlight
+++ /dev/null
@@ -1,65 +0,0 @@
-# Calculate chmod=0755 comment=# load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42
-#!/bin/bash
-# increase/decrease/set/get the backlight brightness (range 0-255)
-#
- 
-# PCI device on which to operate
-DEVICE=00:02.0
-
-# Amount to raise/lower the backlight when called with "up" or "down"
-AMOUNT=8
-
-# Minimum backlight value reachable via "down"
-MIN=1
-
-# Default backlight level when toggling on
-DEFAULT=aa
- 
-#get current brightness in hex and convert to decimal
-var1=`setpci -s $DEVICE F4.B`
-var1d=$((0x$var1))
-case "$1" in
-       up)
-               #calculate new brightness
-               var2=$(($var1d + $AMOUNT))
-               if [[ $var2 -gt 255 ]]
-               then
-                      var2=255
-               fi
-               var2=`printf "%x" $var2`
-               echo "$0: increasing brightness from 0x$var1 to 0x$var2"
-               setpci -s $DEVICE F4.B=$var2
-               ;;
-       down)
-               #calculate new brightness
-               var2=$(($var1d - $AMOUNT))
-               if [[ $var2 -lt $MIN ]]
-               then
-                      var2=$MIN
-               fi
-               var2=`printf "%x" $var2`
-               echo "$0: decreasing brightness from 0x$var1 to 0x$var2"
-               setpci -s $DEVICE F4.B=$var2
-               ;;
-       set)
-               #n.b. this does allow "set 0" i.e. backlight off
-               echo "$0: setting brightness to 0x$2"
-               setpci -s $DEVICE F4.B=$2
-               ;;
-       get)
-               echo "$0: current brightness is 0x$var1"
-               ;;
-       toggle)
-               if [ $var1d -eq 0 ] ; then
-                       echo "toggling up"
-                       setpci -s $DEVICE F4.B=$DEFAULT
-               else
-                       echo "toggling down"
-                       setpci -s $DEVICE F4.B=0
-               fi
-               ;;
-       *)
-               echo "usage: $0 {up|down|set <val>|get|toggle}"
-               ;;
-esac
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle
deleted file mode 100644
index 56e8b0bad..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate chmod=0755 comment=#
-#!/bin/bash
-
-current=`cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor`
-future=unknown
-
-if [ "$current" == "performance" ]; then
-   future="ondemand"
-elif [ "$current" == "ondemand" ]; then
-   future="powersave"
-else
-   future="performance"
-fi
-
-echo "$future" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-echo "$future" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor
-
-echo "$future"
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle_kde b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle_kde
deleted file mode 100644
index cb0ffb870..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle_kde
+++ /dev/null
@@ -1,22 +0,0 @@
-# Calculate chmod=0755 comment=#
-#!/bin/bash
-
-DELAY=1
-
-state=`sudo /usr/bin/cpufreq_toggle`
-message="CPU Performance State Unknown"
-
-if [ "${state}" == "performance" ]; then
-   message="Performance Mode"
-elif [ "${state}" == "powersave" ]; then
-   message="Power Save Mode"
-elif [ "${state}" == "ondemand" ]; then
-   message="Automatic Mode"
-fi
-
-if which kdialog &>/dev/null
-then
-	kdialog --passivepopup "${message}" --title "Cpu mode" ${DELAY}
-fi
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle_osd b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle_osd
deleted file mode 100644
index 0c02a8f37..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/bin/cpufreq_toggle_osd
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate chmod=0755 comment=#
-#!/bin/bash
-
-#?pkg(media-fonts/droid)!=#
-FONT='-*-droid sans-bold-*-*-*-34-*-*-*-*-*-*-*'
-#pkg#
-#?pkg(media-fonts/droid)==#
-FONT='-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*'
-#pkg#
-DELAY=1
-
-state=`sudo /usr/bin/cpufreq_toggle`
-message="CPU Performance State Unknown"
-
-if [ "${state}" == "performance" ]; then
-   message="Performance Mode"
-elif [ "${state}" == "powersave" ]; then
-   message="Power Save Mode"
-elif [ "${state}" == "ondemand" ]; then
-   message="Automatic Mode"
-fi
-
-if which osd_cat &>/dev/null
-then
-	osd_cat -A center -p middle -f "${FONT}" -d ${DELAY} << EOF
-${message}
-EOF
-fi
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/init.d/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/init.d/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/init.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/init.d/laptopd b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/init.d/laptopd
deleted file mode 100644
index c0e8c0514..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/init.d/laptopd
+++ /dev/null
@@ -1,39 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.3-init.d,v 1.1 2010/04/04 16:39:09 ssuominen Exp $
-
-depend() {
-	after *
-}
-
-start() {
-	ebegin "Configure laptop"
-	setkeycodes e002 227   # Fn+F4 maps to switchvidmode
-	setkeycodes e003 236   # Fn+F2 maps to battery
-	setkeycodes e004 148   # Fn+F5 maps to prog1
-	setkeycodes e006 238   # Fn+F9 maps to wlan
-#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)!=0x8086||load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)!=0x2a42#
-	setkeycodes e008 225   # Fn+Up maps to brightnessup
-	setkeycodes e009 224   # Fn+Dn maps to brightnessdown
-#load#
-#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42#
-	setkeycodes e008 230   # Fn+Up maps to brightnessup
-	setkeycodes e009 229   # Fn+Dn maps to brightnessdown
-	/usr/bin/backlight set aa
-#load#
-	setkeycodes e031 149   # Fn+F7 maps to prog2
-	setkeycodes e033 202   # Fn+F8 maps to prog3
-	setkeycodes e077 191   # Fn+F10 maps to F21 whenever the touchpad is enabled
-	setkeycodes e079 192   # Fn+F10 maps to F22 whenever the touchpad is disabled
-
-	# Ensure key release events occur for all except Fn+F7, which properly reports a key release for some reason
-	echo 130,131,132,134,136,137,179,247,249 > /sys/devices/platform/i8042/serio0/force_release
-	eend $?
-}
-
-stop() {
-	eend 0
-}
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/laptopd b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/laptopd
deleted file mode 100644
index 5d76e4f51..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-install/runlevels/default/laptopd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/laptopd symbolic ini(runlevels.calculate-utils/laptopd)!=on&&ini(runlevels.calculate-utils/laptopd,on)==||grep(/var/lib/calculate/-runlevels-calculate-utils,/laptopd)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
deleted file mode 100644
index ea7c29237..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/X11 name=xorg.conf.d
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
deleted file mode 100644
index 54aa4e9b1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate
-Section "Device"
-    Identifier  "intelVGA"
-    Option      "Backlight"  "intel_backlight"
-EndSection
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
deleted file mode 100644
index 80af4cbe7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/xdg/xfce4/xfconf name=xfce-perchannel-xml
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index 6d3a61d05..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-#?load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0xa011||load(char,/sys/bus/pci/devices/0000:00:02.0/vendor,root)==0x8086&&load(char,/sys/bus/pci/devices/0000:00:02.0/device,root)==0x2a42#
-      <property name="XF86KbdBrightnessUp" type="string" value="sudo /usr/bin/backlight up"/>
-      <property name="XF86KbdBrightnessDown" type="string" value="sudo /usr/bin/backlight down"/>
-      <property name="XF86Launch1" type="string" value="sudo /usr/bin/backlight toggle"/>
-#load#
-      <property name="XF86Launch3" type="string" value="/usr/bin/cpufreq_toggle_osd"/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/.calculate_directory
deleted file mode 100644
index 6fb3dadea..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sys-apps/calculate-utils[desktop])!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/kdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/kdm/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/kdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/kdm/kdmrc b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/kdm/kdmrc
deleted file mode 100644
index 229850826..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/kde-base/kdm/kdmrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=/usr/share/config/kdm
-[X-*-Core]
-Reset=/usr/share/calculate/xdm/xdm --logout
-Startup=/usr/share/calculate/xdm/xdm --login
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/.calculate_directory
deleted file mode 100644
index b2f7255d5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc merge()!=&&pkg()!= name=lxdm
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout
deleted file mode 100755
index dc1b4cf41..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/bin/sh
-#
-/usr/bin/sessreg -d -l $DISPLAY $USER
-/usr/share/calculate/xdm/xdm --logout
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre
deleted file mode 100755
index a9fe03ac0..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/bin/sh
-#
-if pgrep -f 'xdm/xdm --logout'
-then
-	xmessage -buttons "" "Please wait to ending sessions" &
-	XMESPID=$!
-	while pgrep -f 'xdm/xdm --logout'
-	do
-		sleep 1
-	done
-	kill -9 $XMESPID &>/dev/null
-fi
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin
deleted file mode 100755
index 8fcfc9c2b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/bin/sh
-#
-bash -c "/usr/bin/sessreg -a -l $DISPLAY $USER &" &
-/usr/share/calculate/xdm/xdm --login || kill -9 $PPID
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot
deleted file mode 100755
index 4e0bc3f2c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/bin/sh
-#
-sleep 1
-if pgrep -f 'xdm/xdm --logout'
-then
-	xmessage -buttons "" "Please wait to ending sessions" &
-	XMESPID=$!
-	for i in {1..500}
-	do
-		if pgrep -f 'xdm/xdm --logout' &>/dev/null
-		then
-			sleep 1
-		else
-			break
-		fi
-	done
-	kill -9 $XMESPID &>/dev/null
-fi
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown
deleted file mode 100755
index 4e0bc3f2c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate comment=# chmod=0755
-#!/bin/sh
-#
-sleep 1
-if pgrep -f 'xdm/xdm --logout'
-then
-	xmessage -buttons "" "Please wait to ending sessions" &
-	XMESPID=$!
-	for i in {1..500}
-	do
-		if pgrep -f 'xdm/xdm --logout' &>/dev/null
-		then
-			sleep 1
-		else
-			break
-		fi
-	done
-	kill -9 $XMESPID &>/dev/null
-fi
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm
deleted file mode 100644
index 1831efca2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate comment=# path=/etc/pam.d name=lxdm
-#%PAM-1.0
-auth       optional		pam_env.so
-auth       include		system-login
-auth       required		pam_nologin.so
-
-account    include		system-login
-
-password   include		system-login
-
-session    include		system-auth
-session    optional		pam_gnome_keyring.so auto_start
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/greeter.ui b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/greeter.ui
deleted file mode 100644
index dde5f45b1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/greeter.ui
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=patch path=/usr/share/lightdm-gtk-greeter name=greeter.ui
-
-<reg>\s*&lt;child&gt;
-\s*&lt;object class="GtkMenuItem" id="a11y_menuitem"&gt;
-\s*&lt;property name="name"&gt;a11y_menuitem&lt;/property&gt;
-\s*&lt;property name="visible"&gt;True&lt;/property&gt;</reg>
-<text>&lt;child&gt;
-&lt;object class="GtkMenuItem" id="a11y_menuitem"&gt;
-&lt;property name="name"&gt;a11y_menuitem&lt;/property&gt;
-&lt;property name="visible"&gt;False&lt;/property&gt;</text>
-<reg>\s*&lt;object class="GtkLabel" id="hostname_label"&gt;
-\s*&lt;property name="name"&gt;hostname_label&lt;/property&gt;
-\s*&lt;property name="visible"&gt;True&lt;/property&gt;</reg>
-<text>&lt;object class="GtkLabel" id="hostname_label"&gt;
-&lt;property name="name"&gt;hostname_label&lt;/property&gt;
-&lt;property name="visible"&gt;False&lt;/property&gt;</text>
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
deleted file mode 100644
index 28a265569..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calculate format=kde path=/etc/lightdm
-
-[greeter]
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution!=||pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_root_type!=livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1&&os_install_x11_resolution==&&os_install_root_type==livecd#
-background=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_install_fb_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
-background=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
-#pkg#
-logo=/usr/share/wallpapers/calculate-logo.png
-#?pkg(media-gfx/lightdm-themes-calculate)!=#
-theme-name=lightdm-calculate
-#pkg#
-#?pkg(x11-themes/greybird)!=&&pkg(media-gfx/lightdm-themes-calculate)==#
-theme-name=Greybird
-#pkg#
-#?pkg(x11-themes/greybird)==&&pkg(media-gfx/lightdm-themes-calculate)==#
-theme-name=Calculate
-#pkg#
-icon-theme-name=Calculate
-font-name=Droid Sans
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
deleted file mode 100644
index 331fc2408..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share name=wallpapers pkg(x11-misc/lightdm-gtk-greeter)<1.6.1
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png
deleted file mode 100644
index 6b40bb7f2..000000000
Binary files a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/.calculate_directory
deleted file mode 100644
index 71933aab5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/99lightdm b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/99lightdm
deleted file mode 100644
index 1e82da261..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/99lightdm
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate path=/usr/share/calculate/xdm/logout.d
-#!/bin/bash
-
-chvt $(ps ax | grep -v root/$DISPLAY | sed -rn 's/^.*lightdm\/root.*vt([0-9]+).*$/\1/p' | awk '{print $1}')
-exit 0
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/lightdm.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/lightdm.conf
deleted file mode 100644
index 6cee18b32..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde path=/etc/lightdm
-
-[SeatDefaults]
-session-setup-script=/usr/share/calculate/xdm/xdm --login
-session-cleanup-script=/usr/share/calculate/xdm/xdm --logout
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/.calculate_directory
deleted file mode 100644
index 2ab1b4228..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/sddm name=scripts
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/Xlogin b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/Xlogin
deleted file mode 100755
index 250724ff9..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/Xlogin
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# Xlogin - run as root before user login
-
-VT="vt$(( ${DISPLAY#:} + 7 ))"
-XAUTHORITY=$(ps ax | sed -nr "s/.*usr\/bin\/X.*-auth (\S+).*$VT.*/\1/p")
-export XAUTHORITY
-/usr/share/calculate/xdm/xdm --login
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/Xlogout b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/Xlogout
deleted file mode 100755
index 4a7997b98..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/sddm/Xlogout
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# Xlogout - run as root after user logout
-
-VT="vt$(( ${DISPLAY#:} + 7 ))"
-XAUTHORITY=$(ps ax | sed -nr "s/.*usr\/bin\/X.*-auth (\S+).*$VT.*/\1/p")
-export XAUTHORITY
-/usr/share/calculate/xdm/xdm --logout
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/slim/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/slim/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/slim/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/slim/slim.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/slim/slim.conf
deleted file mode 100644
index 25e3000f3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/install/x11-misc/slim/slim.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=proftpd path=/etc
-
-login_cmd               /usr/share/calculate/xdm/cmd_login && exec /bin/bash -login /etc/X11/xinit/xinitrc
-sessionstart_cmd        export USER=%user && /usr/share/calculate/xdm/xdm --login && exec /usr/bin/sessreg -a -l :0.0 %user
-sessionstop_cmd         export USER=%user && start-stop-daemon --start --exec /usr/share/calculate/xdm/xdm -- --logout && killall gam_server && /usr/bin/sessreg -d -l :0.0 %user
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/remerge b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/remerge
deleted file mode 100644
index 0d1bfc1d0..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/remerge
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[desktop])!=&&ini(merge-calculate.desktop)==||merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[-desktop])!=&&ini(merge-calculate.desktop)!= merge=gnome-base/gdm,gnome-base/gnome-shell,kde-base/kdm,lxde-base/lxdm,x11-misc/slim,x11-misc/lightdm,x11-misc/sddm
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/.calculate_directory
deleted file mode 100644
index c2de9ff67..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sys-apps/calculate-utils[desktop])==
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/kdmrc b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/kdmrc
deleted file mode 100644
index eb59b77ed..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/kde-base/kdm/kdmrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde path=/usr/share/config/kdm
-[X-*-Core]
-Reset=/usr/share/config/kdm/Xreset
-Startup=/usr/share/config/kdm/Xstartup
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/.calculate_directory
deleted file mode 100644
index 5f5e4301a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/lxdm merge()!=&&pkg()!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout
deleted file mode 100755
index c162faaa8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-#!/bin/sh
-#
-# Note: this is a sample and will not be run as is.
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin
deleted file mode 100755
index c162faaa8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-#!/bin/sh
-#
-# Note: this is a sample and will not be run as is.
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot
deleted file mode 100755
index c162faaa8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-#!/bin/sh
-#
-# Note: this is a sample and will not be run as is.
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown
deleted file mode 100755
index c162faaa8..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-#!/bin/sh
-#
-# Note: this is a sample and will not be run as is.
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/lightdm/.calculate_directory
deleted file mode 100644
index 71933aab5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/lightdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/lightdm/lightdm.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/lightdm/lightdm.conf
deleted file mode 100644
index a581a6a5e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde path=/etc/lightdm
-
-[SeatDefaults]
-!session-setup-script=
-!session-cleanup-script=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/.calculate_directory
deleted file mode 100644
index 2ab1b4228..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/usr/share/sddm name=scripts
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/Xlogin b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/Xlogin
deleted file mode 100755
index 227559f2c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/Xlogin
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# Xlogin - run as root before user login
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/Xlogout b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/Xlogout
deleted file mode 100755
index 11d0902da..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/sddm/Xlogout
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate chmod=0755
-#!/bin/sh
-# Xlogout - run as root after user logout
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/slim.conf b/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/slim.conf
deleted file mode 100644
index c3bc8e651..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/3-desktop/uninstall/x11-misc/slim/slim.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=proftpd path=/etc
-
-login_cmd               exec /bin/bash -login /etc/X11/xinit/xinitrc
-sessionstart_cmd        /usr/bin/sessreg -a -l :0.0 %user
-sessionstop_cmd         /usr/bin/sessreg -d -l :0.0 %user
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/.calculate_directory
deleted file mode 100644
index dfccc153e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_merge_pkg!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/dm-themes-calculate b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/dm-themes-calculate
deleted file mode 100644
index 3f8384a54..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/dm-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=mate-base/mate-desktop
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/droid b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/droid
deleted file mode 100644
index e17403d03..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/droid
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-fonts/droid)!= merge=sys-apps/calculate-utils
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gdm b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gdm
deleted file mode 100644
index e9822979d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(gnome-base/gdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gnome-backgrounds b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gnome-backgrounds
deleted file mode 100644
index 1f5a80b8c..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gnome-backgrounds
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-themes/gnome-backgrounds)!= merge=media-gfx/calculate-wallpapers
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/grub-splashes-calculate b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/grub-splashes-calculate
deleted file mode 100644
index 92b963a3b..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/grub-splashes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/grub-splashes-calculate)!= merge=sys-boot/grub
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gtkplus b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gtkplus
deleted file mode 100644
index 755684367..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/gtkplus
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(x11-libs/gtk+)!= merge=media-video/smplayer
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/kdm b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/kdm
deleted file mode 100644
index 41b44787f..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/kdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-base/kdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/kmix b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/kmix
deleted file mode 100644
index 7b81e9fa1..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/kmix
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-apps/kmix)!= merge=kde-plasma/plasma-pa
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/light-locker b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/light-locker
deleted file mode 100644
index ee808ff8a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/light-locker
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-misc/light-locker)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lightdm b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lightdm
deleted file mode 100644
index 6a8453808..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lightdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-misc/lightdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lxdm b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lxdm
deleted file mode 100644
index 122a1e795..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lxdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(lxde-base/lxdm)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lxqt-session b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lxqt-session
deleted file mode 100644
index 9bafb612a..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/lxqt-session
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(lxqt-base/lxqt-session)!= merge=x11-misc/lightdm
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/mate-session-manager b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/mate-session-manager
deleted file mode 100644
index 225fb92f2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/mate-session-manager
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(mate-base/mate-session-manager)!= merge=media-gfx/calculate-wallpapers,x11-misc/lightdm
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/openrc b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/openrc
deleted file mode 100644
index a604102dd..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/openrc
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/openrc)!= merge=sys-apps/baselayout 
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/plymouth-themes-calculate b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/plymouth-themes-calculate
deleted file mode 100644
index 103b08991..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/plymouth-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/plymouth-themes-calculate)!= merge=sys-apps/openrc,sys-boot/grub,sys-boot/plymouth,sys-kernel/calculate-sources
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/pulseaudio.old b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/pulseaudio.old
deleted file mode 100644
index c173546a7..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/pulseaudio.old
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-sound/pulseaudio)!=&&cl_ver<3.4.7 merge=media-sound/alsa-utils
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/slim b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/slim
deleted file mode 100644
index e6efe5283..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/slim
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-misc/slim)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/splash-themes-calculate b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/splash-themes-calculate
deleted file mode 100644
index c42c35d49..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/splash-themes-calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=sys-boot/grub
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xbmc b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xbmc
deleted file mode 100644
index 2c6e326fa..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xbmc
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-tv/xbmc)!= merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xfce4-session b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xfce4-session
deleted file mode 100644
index 12eea95b2..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xfce4-session
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfce4-session)!= merge=sys-power/upower,x11-misc/lightdm
-
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xfdesktop b/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xfdesktop
deleted file mode 100644
index 3fabfa00d..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Depends/xfdesktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfdesktop)!= merge=media-gfx/calculate-wallpapers
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/.calculate_directory b/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/.calculate_directory
deleted file mode 100644
index dfccc153e..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_merge_pkg!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/calculate-sources b/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/calculate-sources
deleted file mode 100644
index 1bfcc5e38..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/calculate-sources
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-kernel/calculate-sources)!=&&pkg(sys-kernel/calculate-sources:#-core.cl_core_pkg_slot-#[vmlinuz])!= postmerge=sys-kernel/dracut,sys-boot/grub
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/calculate-utils b/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/calculate-utils
deleted file mode 100644
index 427aee726..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/calculate-utils
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate protected path=/var/lib/calculate/calculate-core name=restart cl_ebuild_phase!=&&merge(sys-apps/calculate-utils)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/file b/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/file
deleted file mode 100644
index e94e9e5c5..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/Postmerge/file
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate protected path=/var/lib/calculate/calculate-core name=restart cl_ebuild_phase!=&&merge(sys-apps/file)!=
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/README-eng.txt b/profiles/templates/deprecated/3.4/3_ac_install_live/README-eng.txt
deleted file mode 100644
index 7380711af..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/README-eng.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate append=skip
-
-The ac_install_live event:
-- package installation (not chroot*)
-- package removal (not chroot)
-- system setup
-- system installation
-- first boot
-
-
-*The event will not be used while the system is being built or if the package
-is being installed in builder mode.
-
-Action: package configuration
-env: install
diff --git a/profiles/templates/deprecated/3.4/3_ac_install_live/README-rus.txt b/profiles/templates/deprecated/3.4/3_ac_install_live/README-rus.txt
deleted file mode 100644
index ac6202b27..000000000
--- a/profiles/templates/deprecated/3.4/3_ac_install_live/README-rus.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_live:
-- у�тановка пакета (не chroot*)
-- удаление пакета (не chroot)
-- на�тройка �и�темы
-- у�тановка �и�темы
-- перва� загрузка
-
-*Событие не будет и�пользовать�� во врем� �борки �и�темы или у�тановке пакета
-в builder-режиме.
-
-Дей�твие: на�тройка пакета
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/.calculate_directory
deleted file mode 100644
index e120ec041..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=client pkg(sys-apps/calculate-utils[client])!=&&ac_client_domain==on
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/README-eng.txt b/profiles/templates/deprecated/3.4/5_ac_client_domain/README-eng.txt
deleted file mode 100644
index 37bd5b28c..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/README-eng.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=skip
-
-The ac_client_domain event:
-- join the domain
-- first boot
-- system setup
-
-Action: host configuration for domain operation
-env: client
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/README-rus.txt b/profiles/templates/deprecated/3.4/5_ac_client_domain/README-rus.txt
deleted file mode 100644
index 792191adb..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/README-rus.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=skip
-
-Событие ac_client_domain:
-- ввод машины в домен
-- перва� загрузка
-- на�тройка �и�темы
-
-Дей�твие: на�тройка машины дл� работы в домене
-env: client
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/sudo/.calculate_directory
deleted file mode 100644
index 9f5c74c14..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/sudo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=sudoers.d
-
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/sudo/domain b/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/sudo/domain
deleted file mode 100644
index 89fd38c7c..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/app-admin/sudo/domain
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate comment=# chmod=0440
-
-#?install.os_install_net_domain!=#
-%sudo-#-install.os_install_net_domain-# ALL=(ALL) ALL
-#install.os_install_net_domain#
-%sudo-#-install.os_install_net_hostname-# ALL=(ALL) ALL
-%sudo ALL=(ALL) ALL
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/.calculate_directory
deleted file mode 100644
index 69c468966..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!=&&pkg()<3.0 append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/.calculate_directory
deleted file mode 100644
index a53849ba7..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/X11/gdm
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/00Default b/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/00Default
deleted file mode 100644
index 9bc336ef2..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/00Default
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=Default.old link=/etc/X11/gdm/Init/Default mirror load(/etc/X11/gdm/Init/Default.old)== force
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/05Default b/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/05Default
deleted file mode 100644
index 73efb4fbf..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/Init/05Default
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate append=replace chmod=755 name=Default force
-#!/bin/bash
-
-/usr/share/calculate/xdm/wait_domain
-OLDDEFAULT=/etc/X11/gdm/Init/Default.old
-[[ -f $OLDDEFAULT ]] && source $OLDDEFAULT
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/custom.conf b/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/custom.conf
deleted file mode 100644
index 9f7a9b185..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/gnome-base/gdm/custom.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde path=/etc/X11/gdm
-
-[greeter]
-MinimalUID=1000
-
-[daemon]
-AutomaticLoginEnable=false
-AutomaticLoginUser=
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/kdm/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/kdm/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/kdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/kdm/kdmrc b/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/kdm/kdmrc
deleted file mode 100644
index aec7a191f..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/kde-base/kdm/kdmrc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=kde path=/usr/share/config/kdm 
-[X-*-Core]
-Setup=/usr/share/calculate/xdm/wait_domain
-[X-*-Greeter]
-FaceDir=/var/calculate/remote/share/faces/
-#?env(unix.sr_unix_min_id)!=#
-MinShowUID=#-env(unix.sr_unix_min_id)-#
-#env#
-#?env(unix.sr_unix_min_id)==#
-MinShowUID=1000
-#env#
-[X-:0-Core]
-AutoLoginEnable=false
-AutoLoginUser=
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/openssh/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/openssh/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/openssh/ssh_config b/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/openssh/ssh_config
deleted file mode 100644
index a10a39b3b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/net-misc/openssh/ssh_config
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/ssh
-StrictHostKeyChecking=no
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/sysvinit/.calculate_directory
deleted file mode 100644
index 56a260cb1..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/sysvinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-apps/sysvinit)!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab
deleted file mode 100644
index 7c8f5b028..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate comment=# format=patch
-<reg>(rc::bootwait:/sbin/(?:open)?rc boot
-
-)(l0:0:wait:/sbin/(?:open)?rc shutdown)</reg>
-<text>\1l06:06:wait:/usr/sbin/logout
-\2</text>
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/nss_ldap/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/nss_ldap/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/nss_ldap/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/nss_ldap/ldap.conf b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/nss_ldap/ldap.conf
deleted file mode 100644
index d13dd7f35..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/nss_ldap/ldap.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=ldap append=replace server(unix.dn)!= chmod=0644 chown=root:root path=/etc
-host #-cl_remote_host-#
-base #-server(ldap.services_dn)-#
-rootbinddn #-server(unix.dn)-#
-binddn #-server(unix.bind_dn)-#
-bindpw #-server(unix.bind_pw)-#
-timelimit 5
-bind_timelimit 5
-port 389
-ldap_version 3
-bind_policy soft
-
-#у�корим ограничив обла�ть пои�ка
-nss_base_passwd ou=Users,#-server(unix.dn)-#?one?shadowFlag=1
-nss_base_shadow ou=Users,#-server(unix.dn)-#?one?shadowFlag=1
-nss_base_group  ou=Groups,#-server(unix.dn)-#?one
-#?server(samba.dn)!=#
-nss_base_group  ou=Groups,#-server(samba.dn)-#?one
-#server#
-
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/su b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/su
deleted file mode 100644
index 684b24a26..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/su
+++ /dev/null
@@ -1,39 +0,0 @@
-# Calculate comment=# path=/etc/pam.d
-#%PAM-1.0
-
-auth       sufficient   pam_rootok.so
-
-# If you want to restrict users begin allowed to su even more,
-# create /etc/security/suauth.allow (or to that matter) that is only
-# writable by root, and add users that are allowed to su to that
-# file, one per line.
-#auth       required     pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
-
-# Uncomment this to allow users in the wheel group to su without
-# entering a passwd.
-#auth       sufficient   pam_wheel.so use_uid trust
-
-# Alternatively to above, you can implement a list of users that do
-# not need to supply a passwd with a list.
-#auth       sufficient   pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
-
-# Comment this to allow any user, even those not in the 'wheel'
-# group to su
-#?install.os_install_net_domain!=#
-auth       [success=3 default=ignore]   pam_wheel.so use_uid group=su-#-install.os_install_net_domain-# trust
-#install.os_install_net_domain#
-auth       [success=2 default=ignore]   pam_wheel.so use_uid group=su-#-install.os_install_net_hostname-# trust
-auth       [success=1 default=ignore]   pam_wheel.so use_uid group=su trust
-auth       required     pam_wheel.so use_uid
-
-auth       include      system-auth
-
-account    include      system-auth
-
-password   include      system-auth
-
-session    include      system-auth
-session    required     pam_env.so
-session    optional     pam_xauth.so
-# need for xautologin
-session    optional     pam_ck_connector.so nox11
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/system-auth b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/system-auth
deleted file mode 100644
index beda6bdcc..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-auth/pambase/system-auth
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc/pam.d pkg(sys-auth/pam_client)==
-auth       required     pam_env.so
-auth       optional     pam_keystore.so
-auth       sufficient   pam_unix.so use_first_pass
-#?pkg(sys-auth/pam_client)!=#
-auth       optional     pam_client.so
-#pkg#
-auth       sufficient   pam_ldap.so use_first_pass
-auth       required     pam_deny.so
-
-account    required     pam_unix.so
-account    sufficient   pam_ldap.so
-
-password   required     pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-password   sufficient   pam_unix.so nullok sha256 shadow use_authtok
-password   sufficient   pam_ldap.so
-password   required     pam_deny.so
-
-session    required     pam_limits.so
-session    required     pam_unix.so
-session    optional     pam_ldap.so
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/boot/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/boot/.calculate_directory
deleted file mode 100644
index 801aa9f38..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/runlevels
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/boot/nscd b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/boot/nscd
deleted file mode 100644
index 52860ca07..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/boot/nscd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/nscd symbolic
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/cron.hourly/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/cron.hourly/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/cron.hourly/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/cron.hourly/refresh-nscd b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/cron.hourly/refresh-nscd
deleted file mode 100644
index c6f334805..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/cron.hourly/refresh-nscd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate chmod=0755
-#!/bin/bash
-
-# Updating of domain users nss-cache.
-# The NSS-cache is used for fix resume from suspend mode of domain users
-#
-# Обновление к�ша пользователей домена.
-# К�ширование и�пользует�� дл� поддержки �п�щего режима доменных машин.
-
-if pgrep -f /usr/sbin/nscd &>/dev/null; then
-    # get hours uptime of nscd
-    working_hours=$(( ($(date +%s) - $(stat -c%Y /proc/`pgrep -f /usr/sbin/nscd`)) / 3600 ))
-    # check multiplicity of 3 and check domain server available
-    if [[ "$(( $working_hours % #-cl_client_nscd_cache-# ))" == "0" ]] &&
-        ldapsearch -D "#-server(unix.bind_dn)-#" -w "#-server(unix.bind_pw)-#" -b "#-server(ldap.services_dn)-#"  -h "#-cl_remote_host-#" -l5 -onettimeout=5 -n &>/dev/null;then
-        /usr/sbin/nscd-refresh
-    fi
-fi
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/local.d/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/local.d/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/local.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/local.d/nscd-restart.start b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/local.d/nscd-restart.start
deleted file mode 100755
index 6a107fce9..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/local.d/nscd-restart.start
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate chmod=0755
-#!/bin/bash
-
-pidfile="/var/run/nscd/nscd.pid"
-if [ -f ${pidfile} ]
-then
-	start-stop-daemon --stop --quiet \
-		--exec /usr/sbin/nscd --pidfile ${pidfile}
-
-	start-stop-daemon --start --quiet --background \
-		--exec /usr/sbin/nscd --pidfile ${pidfile} \
-		-- $secure --config-file=/etc/nscd-cache.conf
-fi
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/nscd.start b/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/nscd.start
deleted file mode 100644
index ea017618f..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/sys-libs/glibc/nscd.start
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate exec=/bin/bash
-
-#?cl_system_boot_set==off#
-(/etc/init.d/nscd status || /etc/init.d/nscd restart ) &>/dev/null
-/etc/local.d/nscd-restart.start &>/dev/null
-#cl_system_boot_set#
-
-true
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/xorg-server/.calculate_directory
deleted file mode 100644
index 0876ed39e..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/xorg-server/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=etc
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/xorg-server/conf.d/xdm b/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/xorg-server/conf.d/xdm
deleted file mode 100644
index f8e574dab..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-base/xorg-server/conf.d/xdm
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate comment=#
-
-CHECKVT=7
-#?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(lxde-base/lxdm)!=&&pkg(x11-misc/lightdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="lxdm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(lxde-base/lxdm)==&&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(lxde-base/lxdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="slim"
-START_STOP_ARGS=
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/lightdm/.calculate_directory
deleted file mode 100644
index 71933aab5..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/lightdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/lightdm/lightdm.conf b/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/lightdm/lightdm.conf
deleted file mode 100644
index 758581647..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_domain/x11-misc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=kde path=/etc/lightdm
-
-[SeatDefaults]
-autologin-user=
-#?pkg(x11-wm/openbox)!=#
-user-session=openbox
-#pkg#
-#?pkg(xfce-base/xfce4-session)!=#
-user-session=xfce
-#pkg#
-#?pkg(mate-base/mate-session-manager)!=#
-user-session=mate
-#pkg#
-#?pkg(lxqt-base/lxqt-session)!=#
-user-session=lxqt
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/.calculate_directory
deleted file mode 100644
index 573e741c2..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip install.ac_install_live==on&&ini(merge-calculate.client-undomain)==yes||install.ac_install_live==on&&merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[-client])!=&&ini(merge-calculate.client)!=||pkg(sys-apps/calculate-utils[client])!=&&client.ac_client_undomain==on
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/0-undomain b/profiles/templates/deprecated/3.4/5_ac_client_undomain/0-undomain
deleted file mode 100644
index c28def9ab..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/0-undomain
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate name=ini.env format=samba ini(merge-calculate.client-undomain)==yes
-
-[merge-calculate]
-!client-undomain =
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/1-remerge b/profiles/templates/deprecated/3.4/5_ac_client_undomain/1-remerge
deleted file mode 100644
index d8f332b3c..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/1-remerge
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate name=ini.env format=samba merge(sys-apps/calculate-utils)!=&&pkg(sys-apps/calculate-utils[-client])!=&&ini(merge-calculate.client)!= merge=gnome-base/gdm,kde-base/kdm,net-misc/openssh,sys-apps/sysvinit,sys-auth/nss_ldap,sys-auth/pambase,sys-libs/glibc,x11-base/xorg-server,app-admin/sudo
-
-[merge-calculate]
-client-undomain = yes
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/README-eng.txt b/profiles/templates/deprecated/3.4/5_ac_client_undomain/README-eng.txt
deleted file mode 100644
index 6f41d7785..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/README-eng.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=skip
-
-The ac_client_undomain event:
-- unjoin the domain
-- first boot
-- system setup
-
-Action: host configuration for local operation
-env: client
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/README-rus.txt b/profiles/templates/deprecated/3.4/5_ac_client_undomain/README-rus.txt
deleted file mode 100644
index ffa8bae4d..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/README-rus.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate append=skip
-
-Событие ac_client_undomain:
-- вывод машины из домена
-- перва� загрузка
-- на�тройка �и�темы
-
-Дей�твие: на�тройка машины дл� локальной работы
-env: client
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/sudo/.calculate_directory
deleted file mode 100644
index 9f5c74c14..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/sudo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=sudoers.d
-
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/sudo/domain.remove b/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/sudo/domain.remove
deleted file mode 100644
index 889ce757b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/app-admin/sudo/domain.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=domain
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/kdm/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/kdm/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/kdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/kdm/kdmrc b/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/kdm/kdmrc
deleted file mode 100644
index 214b2c84a..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/kde-base/kdm/kdmrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde pkg(kde-base/kdm)!= path=/usr/share/config/kdm
-[X-*-Core]
-Setup=/usr/share/config/kdm/Xsetup
-[X-*-Greeter]
-MinShowUID=1000
-FaceDir=/var/lib/kdm/faces/
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/openssh/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/openssh/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/openssh/ssh_config b/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/openssh/ssh_config
deleted file mode 100644
index a10a39b3b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/net-misc/openssh/ssh_config
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/ssh
-StrictHostKeyChecking=no
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index 3985fba0a..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc/runlevels name=default
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/calculate.env
deleted file mode 100644
index 1160ee9da..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/calculate.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=samba pkg(sys-apps/calculate-utils[client])== path=/etc/calculate name=calculate.env
-
-[!client]
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/client.remove b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/client.remove
deleted file mode 100644
index 2119fbdbb..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/calculate-utils/client.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=client pkg(sys-apps/calculate-utils[client])==
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/sysvinit/.calculate_directory
deleted file mode 100644
index 56a260cb1..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/sysvinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg(sys-apps/sysvinit)!= name=etc
-
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab
deleted file mode 100644
index 72517bd87..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=# format=patch
-<reg>l06:06:wait:/usr/sbin/logout
-</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/nss_ldap/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/nss_ldap/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/nss_ldap/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/nss_ldap/ldap.conf b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/nss_ldap/ldap.conf
deleted file mode 100644
index 94427eb28..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/nss_ldap/ldap.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=remove force path=/etc force
-
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/su b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/su
deleted file mode 100644
index 8c642914b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/su
+++ /dev/null
@@ -1,34 +0,0 @@
-# Calculate comment=# path=/etc/pam.d
-#%PAM-1.0
-
-auth       sufficient   pam_rootok.so
-
-# If you want to restrict users begin allowed to su even more,
-# create /etc/security/suauth.allow (or to that matter) that is only
-# writable by root, and add users that are allowed to su to that
-# file, one per line.
-#auth       required     pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
-
-# Uncomment this to allow users in the wheel group to su without
-# entering a passwd.
-#auth       sufficient   pam_wheel.so use_uid trust
-
-# Alternatively to above, you can implement a list of users that do
-# not need to supply a passwd with a list.
-#auth       sufficient   pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
-
-# Comment this to allow any user, even those not in the 'wheel'
-# group to su
-auth       required     pam_wheel.so use_uid
-
-auth       include      system-auth
-
-account    include      system-auth
-
-password   include      system-auth
-
-session    include      system-auth
-session    required     pam_env.so
-session    optional     pam_xauth.so
-# need for xautologin
-session    optional     pam_ck_connector.so nox11
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/system-auth b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/system-auth
deleted file mode 100644
index f1e427553..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-auth/pambase/system-auth
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=ldap append=replace chmod=0644 chown=root:root path=/etc/pam.d pkg(sys-auth/pam_client)==
-auth       required     pam_env.so
-auth       sufficient   pam_unix.so
-auth       required     pam_deny.so
-
-account    required     pam_unix.so
-
-password   required     pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-password   sufficient   pam_unix.so nullok sha256 shadow use_authtok
-password   required     pam_deny.so
-
-session    required     pam_limits.so
-session    required     pam_unix.so
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/boot/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/boot/.calculate_directory
deleted file mode 100644
index 801aa9f38..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/runlevels
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/boot/nscd.remove b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/boot/nscd.remove
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/boot/nscd.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/cron.hourly/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/cron.hourly/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/cron.hourly/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/cron.hourly/refresh-nscd b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/cron.hourly/refresh-nscd
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/cron.hourly/refresh-nscd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/local.d/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/local.d/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/local.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/local.d/nscd-restart.start b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/local.d/nscd-restart.start
deleted file mode 100755
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/local.d/nscd-restart.start
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/nscd.stop b/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/nscd.stop
deleted file mode 100644
index 360cb90d0..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/sys-libs/glibc/nscd.stop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate exec=/bin/bash
-
-#?cl_system_boot_set==off#
-(/etc/init.d/nscd status && /etc/init.d/nscd stop ) &>/dev/null
-#cl_system_boot_set#
-#?cl_system_boot_set==on&&env(client.cl_remote_host)!=#
-pidfile="/var/run/nscd/nscd.pid"
-[[ -f $pidfile ]] && start-stop-daemon --stop --quiet \
-	--exec /usr/sbin/nscd --pidfile ${pidfile} &>/dev/null
-#cl_system_boot_set#
-
-true
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-base/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-base/xorg-server/.calculate_directory
deleted file mode 100644
index 44173c36b..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-base/xorg-server/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip merge=x11-base/xorg-server
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-misc/lightdm/.calculate_directory
deleted file mode 100644
index 80ca06584..000000000
--- a/profiles/templates/deprecated/3.4/5_ac_client_undomain/x11-misc/lightdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc merge=x11-misc/lightdm
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/.calculate_directory
deleted file mode 100644
index cca551ea3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=builder ac_builder_iso==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/.calculate_directory
deleted file mode 100644
index 66eeec63b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=bootmenu
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/0-bootparam.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/0-bootparam.config
deleted file mode 100644
index 8dcb4868e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/0-bootparam.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate append=replace name=bootparam.config
-#?pkg(sys-kernel/dracut)!=#init=/linuxrc rd.live.squashimg=#-cl_builder_current_squash-# nodevfs quiet noresume#pkg#
-#?pkg(sys-kernel/dracut)==#init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-cl_builder_current_squash-# nodevfs cdroot console=tty1 udev quiet noresume scandelay=3 doscsi#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/desktop.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/desktop.config
deleted file mode 100644
index 4470d79b1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/desktop.config
+++ /dev/null
@@ -1,65 +0,0 @@
-# Calculate name=system.config os_builder_linux_system==desktop&&pkg(media-gfx/gfxboot-themes-calculate)==
-HEADER
-cld;
-#?os_builder_linux_subname!=#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-#;
-#os_builder_linux_subname#
-#?os_builder_linux_subname==#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-#;
-#os_builder_linux_subname#
-/boot/vmlinuz;
-#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
-/boot/initrd;
-#?pkg(media-gfx/splashutils)!=#
-#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)!=&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# splash;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# verbose;
-#pkg#
-
-cld-docache;
-#?os_builder_linux_subname!=#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-# (RAM);
-#os_builder_linux_subname#
-#?os_builder_linux_subname==#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM);
-#os_builder_linux_subname#
-/boot/vmlinuz;
-#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
-/boot/initrd;
-#?pkg(media-gfx/splashutils)!=#
-#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 docache;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)!=&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# splash docache;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# verbose docache;
-#pkg#
-
-cld-nox;
-#?os_builder_linux_subname!=#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-# (No-X);
-#os_builder_linux_subname#
-#?os_builder_linux_subname==#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-X);
-#os_builder_linux_subname#
-/boot/vmlinuz;
-#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
-/boot/initrd;
-#?pkg(media-gfx/splashutils)!=#
-#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 nox;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)!=&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# splash nox;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# verbose nox;
-#pkg#
-
-#-livemenu(submenu)-#
-
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
deleted file mode 100644
index 66e50aa60..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate name=system.config pkg(media-gfx/gfxboot-themes-calculate)!=
-HEADER
-cl;
-#?os_builder_linux_subname!=#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-#;
-#os_builder_linux_subname#
-#?os_builder_linux_subname==#
-#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-#;
-#os_builder_linux_subname#
-/boot/vmlinuz;
-#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
-/boot/initrd;
-#?pkg(media-gfx/splashutils)!=#
-#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)!=&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# splash;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# verbose;
-#pkg#
-
-#-livemenu(submenu)-#
-
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/keymap.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/keymap.config
deleted file mode 100644
index 62505423c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/keymap.config
+++ /dev/null
@@ -1,22 +0,0 @@
-HEADER
-English,USA;English,USA;en_US
-English,GB;English,GB;en_GB
-Belarusian;Белару�ка�;be_BY
-Brazilian;Português do Brasil;pt_BR
-Bulgarian;Българ�ки;bg_BG
-Danish;Dansk;da_DK
-Belgium;Belgier;fr_BE
-French;Français;fr_FR
-French,Canada;Français Canadien;fr_CA
-German;Deutsch;de_DE
-Icelandic;Icelandic;is_IS
-Italian;Italiano;it_IT
-Norwegian,Nynorsk;Norsk nynorsk;nn_NO
-Polish;Polski;pl_PL
-Portuguese;Português;pt_PT
-Romanian;Română;ro_RO
-Russian;Ру��кий;ru_RU
-Spanish;Español;es_ES
-Swedish;Svenska;sv_SE
-Ukrainian;Україн�ька;uk_UA
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/lang.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/lang.config
deleted file mode 100644
index 965b86198..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/lang.config
+++ /dev/null
@@ -1,40 +0,0 @@
-HEADER
-Belarusian (Belarus);Белару�ка� (Белару�ь);be_BY;be_BY;Europe/Minsk
-Bulgarian (Bulgaria);Българ�ки (Българи�);bg_BG;bg_BG;Europe/Sofia
-Bosnian (Bosnia and Herzegovina);Bosanski (Bosna i Hercegovina);bs_BA;bs_BA;Europe/Sarajevo
-Czech (Czech Republic);Čeština (Česká republika);cs_CZ;cs_CZ;Europe/Prague
-Danish (Denmark);Dansk (Danmark);da_DK;da_DK;Europe/Copenhagen
-German (Germany);Deutsch (Deutschland);de_DE;de_DE;Europe/Berlin
-English (Australia);English (Australia);en_AU;en_AU;Australia/Canberra
-English (United Kingdom);English (United Kingdom);en_GB;en_GB;Europe/London
-English (United States);English (United States);en_US;en_US;America/New_York
-Spanish (Spain);Español (España);es_ES;es_ES;Europe/Madrid
-Spanish (Uruguay);Español (Uruguay);es_UY;es_UY;America/Montevideo
-Spanish (Venezuela);Español (Venezuela);es_VE;es_VE;America/Caracas
-Estonian (Estonia);Eesti (Eesti);et_EE;et_EE;Europe/Tallinn
-French (Belgium);Français (Belgique);fr_BE;fr_BE;Europe/Brussels
-French (Canada);Français (Canada);fr_CA;fr_CA;Canada/Pacific
-French (France);Français (France);fr_FR;fr_FR;Europe/Paris
-Croatian (Croatia);Hrvatski (Hrvatska);hr_HR;hr_HR;Europe/Zagreb
-Icelandic (Iceland);�slenska (�sland);is_IS;is_IS;Atlantic/Reykjavik
-Italian (Italy);Italiano (Italia);it_IT;it_IT;Europe/Rome
-Kazakh (Kazakhstan);Қазақ тілі (Қазақ�тан);kk_KZ;kk_KZ;Asia/Almaty
-Lithuanian (Lithuania);Lietuvių (Lietuva);lt_LT;lt_LT;Europe/Vilnius
-Latvian (Latvia);Latviešu (Latvija);lv_LV;lv_LV;Europe/Riga
-Hungarian (Hungary);Magyar (Magyarország);hu_HU;hu_HU;Europe/Budapest
-Dutch (Belgium);Nederlands (België);nl_BE;nl_BE;Europe/Brussels
-Dutch (Netherlands);Nederlands (Nederland);nl_NL;nl_NL;Europe/Amsterdam
-Norwegian Nynorsk (Norway);Nynorsk (Noreg);nn_NO;nn_NO;Europe/Oslo
-Polish (Poland);Polski (Polska);pl_PL;pl_PL;Europe/Warsaw
-Portuguese (Brazil);Português (Brasil);pt_BR;pt_BR;Brazil/East
-Portuguese (Portugal);Português (Portugal);pt_PT;pt_PT;Europe/Lisbon
-Romanian (Romania);Română (România);ro_RO;ro_RO;Europe/Bucharest
-Russian (Russia);Ру��кий (Ро��и�);ru_RU;ru_RU;Europe/Moscow
-Slovak (Slovakia);Sloven�ina (Slovenská republika);sk_SK;sk_SK;Europe/Bratislava
-Slovenian (Slovenia);Slovenš�ina (Slovenija);sl_SI;sl_SI;Europe/Ljubljana
-Albanian (Albania);Shqip (Shqipëria);sq_AL;sq_AL;Europe/Tirane
-Finnish (Finland);Suomi (Suomi);fi_FI;fi_FI;Europe/Helsinki
-Serbian (Serbia);Срп�ки (Србија);sr_RS;sr_RS;Europe/Belgrade
-Swedish (Sweden);Svenska (Sverige);sv_SE;sv_SE;Europe/Stockholm
-Ukrainian (Ukraine);Україн�ька (Україна);uk_UA;uk_UA;Europe/Kiev
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/server.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/server.config
deleted file mode 100644
index 26ec8b752..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/server.config
+++ /dev/null
@@ -1,44 +0,0 @@
-# Calculate name=system.config os_builder_linux_system!=desktop&&pkg(media-gfx/gfxboot-themes-calculate)==
-HEADER
-cds;
-#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-#;
-/boot/vmlinuz;
-#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
-/boot/initrd;
-#?pkg(media-gfx/splashutils)!=#
-#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 elevator=deadline;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)!=&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# splash elevator=deadline;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# verbose elevator=deadline;
-#pkg#
-
-cds-docache;
-#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (RAM);
-/boot/vmlinuz;
-#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
-/boot/initrd;
-#?pkg(media-gfx/splashutils)!=#
-#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 elevator=deadline docache;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)!=&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# splash elevator=deadline docache;
-#pkg#
-#?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
-#-load(/bootmenu/bootparam.config)-# verbose elevator=deadline docache;
-#pkg#
-
-#?pkg(media-gfx/splash-themes-calculate)!=#
-cds-nofb;
- #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-# (No-FB);
-/boot/vmlinuz;
-#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
-/boot/initrd;
-#-load(/bootmenu/bootparam.config)-# verbose splash=off elevator=deadline;
-#pkg#
-
-#-livemenu(submenu)-#
-
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/timezone.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/timezone.config
deleted file mode 100644
index 667c2acc2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/timezone.config
+++ /dev/null
@@ -1,92 +0,0 @@
-HEADER
-GMT-12:00;International Date Line West;Etc/GMT-12
-GMT-11:00;Midway Island,Samoa;Pacific/Midway
-GMT-10:00;Hawaii;Pacific/Honolulu
-GMT-09:00;Alaska;America/Anchorage
-GMT-08:00;Pacific Time (US & Canada);Canada/Pacific
-GMT-08:00;Tijuana,Baja California;America/Tijuana
-GMT-07:00;Arizona;America/Phoenix
-GMT-07:00;Mountain Time (US & Canada);America/Denver
-GMT-07:00;Chihuahua,La Paz,Mazatlan - New;America/Mazatlan
-GMT-07:00;Chihuahua,La Paz,Mazatlan - Old;America/Mazatlan
-GMT-06:00;Guadalajara,Mexico City,Monterrey - New;America/Monterrey
-GMT-06:00;Guadalajara,Mexico City,Monterrey - Old;America/Monterrey
-GMT-06:00;Saskatchewan;America/Regina
-GMT-06:00;Central America;America/Mexico_City
-GMT-06:00;Central Time (US & Canada);Canada/Central
-GMT-05:00;Bogota,Lima,Quito,Rio Branco;America/Bogota
-GMT-05:00;Eastern Time (US & Canada);America/New_York
-GMT-05:00;Indiana (East);America/Indiana/Indianapolis
-GMT-04:00;Atlantic Time (Canada);America/Halifax
-GMT-04:00;Caracas,La Paz;America/Caracas
-GMT-04:00;Manaus;America/Manaus
-GMT-04:00;Santiago;America/Santiago
-GMT-03:30;Newfoundland;America/St_Johns
-GMT-03:00;Brasilia;America/Sao_Paulo
-GMT-03:00;Buenos Aires,Georgetown;America/Argentina/Buenos_Aires
-GMT-03:00;Greenland;Etc/GMT+3
-GMT-03:00;Montevideo;America/Montevideo
-GMT-02:00;Mid-Atlantic;Atlantic/South_Georgia
-GMT-01:00;Azores;Atlantic/Azores
-GMT-01:00;Cape Verde Is. ;Atlantic/Cape_Verde
-GMT+00:00;Greenwich Mean Time: Dublin,Edinburgh,Lisbon,London;UTC
-GMT+00:00;Casablanca,Monrovia,Reykjavik;Africa/Casablanca
-GMT+01:00;Amsterdam,Berlin,Bern,Rome,Stockholm,Vienna;Europe/Amsterdam
-GMT+01:00;Belgrade,Bratislava,Budapest,Ljubljana,Prague;Europe/Belgrade
-GMT+01:00;Brussels,Copenhagen,Madrid,Paris;Europe/Brussels
-GMT+01:00;Sarajevo,Skopje,Warsaw,Zagreb,Oslo;Europe/Zagreb
-GMT+01:00;West Central Africa;Africa/Tunis
-GMT+02:00;Kaliningrad;Europe/Kaliningrad
-GMT+02:00;Amman;Asia/Amman
-GMT+02:00;Athens,Bucharest,Istanbul;Europe/Istanbul
-GMT+02:00;Beirut;Asia/Beirut
-GMT+02:00;Helsinki,Riga,Tallinn,Vilnius;Europe/Helsinki
-GMT+02:00;Kiev;Europe/Kiev
-GMT+02:00;Sofia;Europe/Sofia
-GMT+02:00;Windhoek;Africa/Windhoek
-GMT+02:00;Jerusalem;Asia/Jerusalem
-GMT+02:00;Cairo;Africa/Cairo
-GMT+02:00;Minsk;Europe/Minsk
-GMT+02:00;Harare,Pretoria;Africa/Harare
-GMT+03:00;Moscow,St. Petersburg,Volgograd;Europe/Moscow
-GMT+03:00;Baghdad;Asia/Baghdad
-GMT+03:00;Kuwait,Riyadh;Asia/Kuwait
-GMT+03:00;Nairobi;Africa/Nairobi
-GMT+03:00;Tbilisi;Asia/Tbilisi
-GMT+03:30;Tehran;Asia/Tehran
-GMT+04:00;Samara,Izhevsk;Europe/Samara
-GMT+04:00;Abu Dhabi,Muscat;Asia/Muscat
-GMT+04:00;Baku;Asia/Baku
-GMT+04:00;Yerevan;Asia/Yerevan
-GMT+04:30;Kabul;Asia/Kabul
-GMT+05:00;Ekaterinburg,Perm,Ufa;Asia/Yekaterinburg
-GMT+05:00;Islamabad,Karachi,Tashkent;Asia/Karachi
-GMT+05:30;Chennai,Kalkata,Bumbai,New Delhi;Asia/Calcutta
-GMT+05:30;Sri Jayawardenepura;Asia/Jayapura
-GMT+05:45;Kathmandu;Asia/Katmandu
-GMT+05:00;Almaty;Asia/Almaty
-GMT+06:00;Omsk,Novosibirsk;Asia/Omsk
-GMT+06:00;Astana,Dhaka;Asia/Dhaka
-GMT+06:30;Yangon (Rangoon);Asia/Rangoon
-GMT+07:00;Krasnoyarsk;Asia/Krasnoyarsk
-GMT+07:00;Bangkok,Hanoi,Jakarta;Asia/Bangkok
-GMT+08:00;Irkutsk,Ulaan Bataar;Asia/Irkutsk
-GMT+08:00;Beijing,Chongqing,Hong Kong,Urumqi;Asia/Hong_Kong
-GMT+08:00;Kuala Lumpur,Singapore;Asia/Singapore
-GMT+08:00;Perth;Australia/Perth
-GMT+08:00;Taipei;Asia/Taipei
-GMT+09:00;Yakutsk,Blagoveshchensk;Asia/Yakutsk
-GMT+09:00;Osaka,Sapporo,Tokyo;Asia/Tokyo
-GMT+09:00;Seoul;Asia/Seoul
-GMT+09:30;Adelaide;Australia/Adelaide
-GMT+09:30;Darwin;Australia/Darwin
-GMT+10:00;Vladivostok,Khabarovsk,Magadan;Asia/Vladivostok
-GMT+10:00;Brisbane;Australia/Brisbane
-GMT+10:00;Guam,Port Moresby;Pacific/Guam
-GMT+10:00;Canberra,Melbourne,Sydney;Australia/Melbourne
-GMT+10:00;Hobart;Australia/Hobart
-GMT+11:00;Srednekolymsk,New Caledonia,Solomon Is. ;Asia/Srednekolymsk
-GMT+12:00;Kamchatka,Fiji,Marshall Is. ;Asia/Kamchatka
-GMT+12:00;Auckland,Wellington;Pacific/Auckland
-GMT+13:00;Nuku'alofa;Etc/GMT-13
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/vga.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/vga.config
deleted file mode 100644
index 3d0eada3e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/vga.config
+++ /dev/null
@@ -1,29 +0,0 @@
-HEADER
-auto;Auto
-640x480;640x480
-800x480;800x480
-800x600;800x600
-1024x576;1024x576
-1024x600;1024x600
-1024x768;1024x768
-1200x800;1200x800
-1280x720;1280x720
-1280x768;1280x768
-1280x800;1280x800
-1280x1024;1280x1024
-1360x768;1360x768
-1366x768;1366x768
-1368x768;1368x768
-1400x1050;1400x1050
-1440x900;1440x900
-1600x768;1600x768
-1600x900;1600x900
-1600x1200;1600x1200
-1680x945;1680x945
-1680x1050;1680x1050
-1920x1080;1920x1080
-1920x1200;1920x1200
-2048x1152;2048x1152
-2560x1440;2560x1440
-2560x1600;2560x1600
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/video.config b/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/video.config
deleted file mode 100644
index a603320fe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/0_bootmenu/video.config
+++ /dev/null
@@ -1,14 +0,0 @@
-HEADER
-Auto;auto;on
-AMD Radeon (radeon) with composite;radeon;on
-AMD Radeon (radeon);radeon;off
-AMD AMDGPU (amdgpu) with composite;amdgpu;on
-AMD AMDGPU (amdgpu);amdgpu;off
-Intel (intel) with composite;i915;on
-Intel (intel);i915;off
-Nvidia Nouveau (nouveau) with composite;nouveau;on
-Nvidia Nouveau (nouveau);nouveau;off
-#?os_builder_linux_shortname!=CLS#Nvidia Graphic Driver (nvidia) with composite;nvidia;on
-Nvidia Graphics Driver (nvidia);nvidia;off#os_builder_linux_shortname#
-Generic VESA (vesa);vesa;off
-FOOTER
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
deleted file mode 100644
index 8aff98b40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
deleted file mode 100644
index e6b2784f0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=isolinux
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
deleted file mode 100644
index c265a3381..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/16x16.fnt mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
deleted file mode 100644
index 4bbbceeb6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/back.jpg mirror
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
deleted file mode 100644
index 942362cdc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/be.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
deleted file mode 100644
index 7ab30be45..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/bg.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
deleted file mode 100644
index 7349771bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/bs.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
deleted file mode 100644
index 41125035d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/chain.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
deleted file mode 100644
index 50516d3ef..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/cs.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
deleted file mode 100644
index 0fe39a73f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/da.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
deleted file mode 100644
index ea038707d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/de.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
deleted file mode 100644
index 61fa18ee7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/en.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
deleted file mode 100644
index b25949bd3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/es.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
deleted file mode 100644
index 048c4ffa9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/et.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
deleted file mode 100644
index 17cb8378d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/fi.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
deleted file mode 100644
index 36ed670f0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/fr.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
deleted file mode 100644
index 43cbee33f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/syslinux/gfxboot.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
deleted file mode 100644
index c01f9c795..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-foreground=0x43b3fe
-background=0x958490
-screen-colour=0x270A1E
-hidden-timeout=0
-composite-labels=
-label auto=Auto
-append auto=
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label radeon=AMD Radeon (radeon)
-append radeon=video:radeon
-applies radeon=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label amdgpu=AMD AMDGPU (amdgpu)
-append amdgpu=video:amdgpu
-applies amdgpu=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label intel=Intel (intel)
-append intel=video:intel
-applies intel=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label nouveau=Nvidia Nouveau (nouveau)
-append nouveau=video:nouveau
-applies nouveau=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?cl_builder_videodrv_set==on#
-label nvidia=Nvidia Graphics Driver (nvidia)
-append nvidia=video:nvidia
-applies nvidia=#?cl_builder_videodrv_set==on#cl #cl_builder_videodrv_set##-livemenu(video)-#
-#cl_builder_videodrv_set#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label vesa=Generic VESA (vesa)
-append vesa=video:vesa,composite:off
-applies vesa=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
deleted file mode 100644
index 39af1d85a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/hr.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
deleted file mode 100644
index d6b9e837b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/hu.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
deleted file mode 100644
index 0989aad4f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/init mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
deleted file mode 100644
index 5343a24c6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/is.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
deleted file mode 100644
index 9e5cf9420..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 300
-ui gfxboot bootlogo
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
deleted file mode 100644
index 3659253bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/it.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
deleted file mode 100644
index ed6234850..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/kk.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
deleted file mode 100644
index 5d2f1f060..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/langlist mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
deleted file mode 100644
index d0b50516c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/ldlinux.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
deleted file mode 100644
index cc1e24a0d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/libcom32.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
deleted file mode 100644
index 793895521..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/libutil.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
deleted file mode 100644
index db458e1ee..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/lt.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
deleted file mode 100644
index f8bf8ddb0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/lv.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
deleted file mode 100644
index 2a9847d0f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/system.config mirror
-<reg>(.*);
-(.*);
-(.*);
-(.*);
-(.*);
-(.*);
-</reg>
-<text>LABEL \1
-	MENU LABEL \2
-	KERNEL \3
-	APPEND \4 initrd=\5 vga=current \6
-</text>
-<reg>HEADER</reg>
-<text>INCLUDE common.cfg
-
-MENU TITLE Welcome to Calculate Linux (#-os_builder_arch_machine-#)
-</text>
-<reg>FOOTER</reg>
-<text>
-#?pkg(sys-apps/memtest86+)!=#
-LABEL memtest
-	MENU LABEL Test ^memory
-	KERNEL memtest
-#pkg#
-
-LABEL harddisk
-	MENU LABEL ^Boot from first hard disk
-#?pkg(sys-boot/syslinux)<5#
-	localboot 0x80
-	append SLX=0x80
-#pkg#
-#?pkg(sys-boot/syslinux)>=5#
-	COM32 chain.c32
-	APPEND hd0
-#pkg#
-</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
deleted file mode 100644
index fec2fbc86..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch name=menu.cfg cl_builder_flash_uuid!=&&cl_builder_action==menu
-<reg>LABEL=\S+</reg>
-<text>UUID=#-cl_builder_flash_uuid-#</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
deleted file mode 100644
index c0c469e4e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nl_BE.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
deleted file mode 100644
index e4d83207d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nl_NL.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
deleted file mode 100644
index 4701db1c4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nn.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
deleted file mode 100644
index c3378f6f0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/pl.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
deleted file mode 100644
index 5ce3f24ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/pt.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
deleted file mode 100644
index 28006793b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/pt_BR.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
deleted file mode 100644
index 030a16d76..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/ro.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
deleted file mode 100644
index 6204e43f7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/ru.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
deleted file mode 100644
index e3282eb59..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sk.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
deleted file mode 100644
index e6b7ae0f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sl.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
deleted file mode 100644
index 324d52347..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sq.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
deleted file mode 100644
index 2769c5236..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sr.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
deleted file mode 100644
index 9ace168fd..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sv.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
deleted file mode 100644
index 8d8052565..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/uk.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
deleted file mode 100644
index fd5fb5445..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
+++ /dev/null
@@ -1,44 +0,0 @@
-# Calculate run=/bin/bash
-
-cd #-cl_builder_iso_path-#/isolinux
-cpio --quiet -o >bootlogo <<EOF
-langlist
-init
-isolinux.cfg
-be.tr
-bg.tr
-bs.tr
-cs.tr
-da.tr
-de.tr
-en.tr
-es.tr
-et.tr
-fi.tr
-fr.tr
-hr.tr
-hu.tr
-is.tr
-it.tr
-kk.tr
-lt.tr
-lv.tr
-nl_BE.tr
-nl_NL.tr
-nn.tr
-pl.tr
-pt_BR.tr
-pt.tr
-ro.tr
-ru.tr
-sk.tr
-sl.tr
-sq.tr
-sr.tr
-sv.tr
-uk.tr
-back.jpg
-16x16.fnt
-menu.cfg
-gfxboot.cfg
-EOF
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
deleted file mode 100644
index 56c664973..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=syslinux
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
deleted file mode 100644
index c265a3381..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/16x16.fnt mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
deleted file mode 100644
index 4bbbceeb6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/back.jpg mirror
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
deleted file mode 100644
index 942362cdc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/be.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
deleted file mode 100644
index 7ab30be45..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/bg.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
deleted file mode 100644
index 154013cc4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/isolinux/bootlogo mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
deleted file mode 100644
index 7349771bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/bs.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
deleted file mode 100644
index 41125035d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/chain.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
deleted file mode 100644
index 50516d3ef..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/cs.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
deleted file mode 100644
index 0fe39a73f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/da.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
deleted file mode 100644
index ea038707d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/de.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
deleted file mode 100644
index 61fa18ee7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/en.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
deleted file mode 100644
index b25949bd3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/es.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
deleted file mode 100644
index 048c4ffa9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/et.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
deleted file mode 100644
index 17cb8378d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/fi.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
deleted file mode 100644
index 36ed670f0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/fr.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
deleted file mode 100644
index 43cbee33f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/syslinux/gfxboot.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
deleted file mode 100644
index c01f9c795..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-foreground=0x43b3fe
-background=0x958490
-screen-colour=0x270A1E
-hidden-timeout=0
-composite-labels=
-label auto=Auto
-append auto=
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label radeon=AMD Radeon (radeon)
-append radeon=video:radeon
-applies radeon=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label amdgpu=AMD AMDGPU (amdgpu)
-append amdgpu=video:amdgpu
-applies amdgpu=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label intel=Intel (intel)
-append intel=video:intel
-applies intel=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label nouveau=Nvidia Nouveau (nouveau)
-append nouveau=video:nouveau
-applies nouveau=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?cl_builder_videodrv_set==on#
-label nvidia=Nvidia Graphics Driver (nvidia)
-append nvidia=video:nvidia
-applies nvidia=#?cl_builder_videodrv_set==on#cl #cl_builder_videodrv_set##-livemenu(video)-#
-#cl_builder_videodrv_set#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
-label vesa=Generic VESA (vesa)
-append vesa=video:vesa,composite:off
-applies vesa=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
deleted file mode 100644
index 39af1d85a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/hr.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
deleted file mode 100644
index d6b9e837b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/hu.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
deleted file mode 100644
index 0989aad4f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/init mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
deleted file mode 100644
index 5343a24c6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/is.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
deleted file mode 100644
index 3659253bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/it.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
deleted file mode 100644
index ed6234850..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/kk.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
deleted file mode 100644
index 5d2f1f060..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/langlist mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
deleted file mode 100644
index d0b50516c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/ldlinux.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
deleted file mode 100644
index cc1e24a0d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/libcom32.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
deleted file mode 100644
index 793895521..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)>=5 link=#-cl_builder_squash_path-#/usr/share/syslinux/libutil.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
deleted file mode 100644
index db458e1ee..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/lt.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
deleted file mode 100644
index f8bf8ddb0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/lv.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
deleted file mode 100644
index 74174e931..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/isolinux/menu.cfg mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
deleted file mode 100644
index d5234432a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate dotall format=patch name=menu.cfg
-<reg>LABEL harddisk.*</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
deleted file mode 100644
index c0c469e4e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nl_BE.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
deleted file mode 100644
index e4d83207d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nl_NL.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
deleted file mode 100644
index 4701db1c4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nn.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
deleted file mode 100644
index c3378f6f0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/pl.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
deleted file mode 100644
index 5ce3f24ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/pt.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
deleted file mode 100644
index 28006793b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/pt_BR.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
deleted file mode 100644
index 030a16d76..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/ro.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
deleted file mode 100644
index 6204e43f7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/ru.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
deleted file mode 100644
index e3282eb59..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sk.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
deleted file mode 100644
index e6b7ae0f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sl.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
deleted file mode 100644
index 324d52347..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sq.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
deleted file mode 100644
index 2769c5236..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sr.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
deleted file mode 100644
index 9ace168fd..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/sv.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
deleted file mode 100644
index 9e5cf9420..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 300
-ui gfxboot bootlogo
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
deleted file mode 100644
index 8d8052565..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/uk.tr mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index 0112ead1d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-apps/calculate-utils)!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
deleted file mode 100644
index a0c91d391..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
+++ /dev/null
@@ -1 +0,0 @@
-calculate
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
deleted file mode 100644
index 1fbdf5f4d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge(sys-apps/memtest86+)!=&&pkg(sys-apps/memtest86+)>=4.0 append=skip
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
deleted file mode 100644
index 19d0f325f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/boot/memtest86plus/memtest.bin mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
deleted file mode 100644
index 19d0f325f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/boot/memtest86plus/memtest.bin mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
deleted file mode 100644
index 55834d50a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()>=2&&os_builder_arch_machine==x86_64 path=/boot
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
deleted file mode 100644
index 356b2bec6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/efi name=boot
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
deleted file mode 100644
index e67a616ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate run=/bin/bash path=/
-
-IMAGE_DIR=#-cl_chroot_path-#
-CDROOT_DIR=#-cl_chroot_path-#/#-cl_root_path-#
-GRUB_BOOT_DIR_PREFIX=/boot/grub
-x86_64_EFI_DIR_PREFIX="/usr/lib/grub/x86_64-efi"
-x86_64_EFI_DIR="${IMAGE_DIR}${x86_64_EFI_DIR_PREFIX}"
-
-grub-mkimage \
-		-p "${GRUB_BOOT_DIR_PREFIX}" \
-		-d "${x86_64_EFI_DIR_PREFIX}" \
-		-o "${CDROOT_DIR}/efi/boot/bootx64.efi" \
-		-O x86_64-efi gzio ext2 fat lvm part_msdos \
-			part_gpt hfsplus bsd search_fs_uuid normal \
-			chain iso9660 configfile loadenv \
-			reboot cat
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
deleted file mode 100644
index 41bfb9567..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate format=raw link=#-cl_builder_squash_path-#/boot/grub/grub-calculate.png mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
deleted file mode 100644
index 53fa03339..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
+++ /dev/null
@@ -1,148 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/system.config mirror
-<reg>(.*);
-(.*);
-(.*);
-(.*);
-(.*);
-(.*);
-</reg>
-<text>menuentry "\2" {
-   echo "Language: ${bootlang}"
-   echo "Keyboard: ${bootkeymap}"
-   echo "Timezone: ${boottimezone}"
-   echo "Bootparams: ${bootparams}"
-   echo "Please wait..."
-   linux \3 \4 \6 ${bootparams} ${noefi_opt} ${no_gfxmode}
-   initrd \5
-}
-</text>
-<reg>HEADER</reg>
-<text>
-if [ x$timeout = x ]; then
-    set timeout=5
-fi
-if [ x$default = x ]; then
-    set default=0
-fi
-set fallback=2
-set pager=1
-
-function load_video {
-  if [ x$feature_all_video_module = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
-if loadfont /boot/grub/unicode.pf2 ; then
-   set gfxmode=auto
-   load_video
-   if [ x$no_gfxmode = x ]; then
-       insmod gfxterm
-       terminal_output gfxterm
-   else
-       terminal_output console
-   fi
-   insmod gettext
-fi
-
-if [ -f /boot/grub/grub-calculate.png ]; then
-   insmod png
-   background_image -m stretch /boot/grub/grub-calculate.png
-fi
-
-if [ x$noefi_opt = x ]; then
-   noefi_opt=''
-   export noefi_opt
-fi
-
-bootparams=calculate=
-
-if [ x$bootlang != x ]
-then
-    bootparams=${bootparams}lang:${bootlang}
-fi
-bootparams=${bootparams},
-
-if [ x$bootkeymap != x ]
-then
-    bootparams=${bootparams}keymap:${bootkeymap}
-fi
-bootparams=${bootparams},
-
-if [ x$boottimezone != x ]
-then
-    bootparams=${bootparams}timezone:${boottimezone}
-fi
-bootparams=${bootparams},
-
-if [ x$bootvga != x ]
-then
-    bootparams=${bootparams}resolution:${bootvga}
-fi
-bootparams=${bootparams},
-
-if [ x$bootvideo != x ]
-then
-    bootparams=${bootparams}video:${bootvideo}
-fi
-bootparams=${bootparams},
-
-if [ x$bootcomposite != x ]
-then
-    bootparams=${bootparams}composite:${bootcomposite}
-fi
-
-if [ x$bootparams = xcalculate=,,,,, ]
-then
-    bootparams=
-fi
-
-insmod part_gpt
-
-if [ x$no_gfxmode = x ]; then
-    menuentry "Disable grub gfxmode" {
-        set no_gfxmode="grub_nogfxmode"
-        export no_gfxmode
-        set timeout=30
-        export timeout
-        configfile /boot/grub/grub.cfg
-    }
-fi
-</text>
-<reg>FOOTER</reg>
-<text>
-submenu "Advanced Options" {
-#?pkg(sys-apps/memtest86+)!=#
-   menuentry "memtest86+" {
-      linux16 /isolinux/memtest
-   }
-#pkg#
-
-   menuentry "Disable EFI" {
-      echo "Disabling EFI..."
-      set noefi_opt="noefi"
-      export noefi_opt
-      configfile /boot/grub/grub.cfg
-   }
-}
-
-if [ x$no_gfxmode = x ]; then
-    source /boot/grub/lang.cfg
-else
-    source /boot/grub/lang_nogfx.cfg
-fi
-source /boot/grub/timezone.cfg
-#?os_builder_linux_system==desktop#
-source /boot/grub/video.cfg
-source /boot/grub/vga.cfg
-#os_builder_linux_system#
-
-</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
deleted file mode 100644
index f3664b742..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate run=/bin/bash
-
-cp -Rp --no-preserve=mode,ownership #-cl_chroot_path-#/usr/lib/grub/x86_64-efi #-cl_chroot_path-#/#-cl_root_path-#/boot/grub/ 
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
deleted file mode 100644
index 39e81fc08..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/keymap.config mirror
-<reg>([^;\n]+);([^;\n]+);(.*)</reg>
-<text>menuentry "\2" {
-      commonkeymap "$chosen" \3
-}
-</text>
-<reg>HEADER</reg>
-<text>
-function commonkeymap {
-      echo "Switching to: $1"
-      set bootkeymap=$2
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-}
-
-submenu "Keymap Selection" {
-</text>
-<reg>FOOTER</reg>
-<text>}</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
deleted file mode 100644
index f5dcbc644..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/keymap.config mirror
-<reg>([^;\n]+);([^;\n]+);(.*)</reg>
-<text>menuentry "\1" {
-      commonkeymap "$chosen" \3
-}
-</text>
-<reg>HEADER</reg>
-<text>
-function commonkeymap {
-      echo "Switching to: $1"
-      set bootkeymap=$2
-      export bootkeymap
-      configfile /boot/grub/grub.cfg
-}
-
-submenu "Keymap Selection" {
-</text>
-<reg>FOOTER</reg>
-<text>}</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
deleted file mode 100644
index 3a82f5efe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/lang.config mirror
-<reg>([^;\n]+);([^;\n]+);([^;\n]+);([^;\n]+);(.*)</reg>
-<text>menuentry "\2" {
-      commonlang "$chosen" \3 \4 \5
-}
-</text>
-<reg>HEADER</reg>
-<text>
-function commonlang {
-      echo "Switching to: $1"
-      set lang=$2
-      set bootlang=$2
-      set bootkeymap=$3
-      set boottimezone=$4
-      export lang
-      export bootlang
-      export bootkeymap
-      export boottimezone
-      configfile /boot/grub/grub.cfg
-}
-
-submenu "Language Selection" {
-</text>
-<reg>FOOTER</reg>
-<text>}</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
deleted file mode 100644
index 69961e03a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/lang.config mirror
-<reg>([^;\n]+);([^;\n]+);([^;\n]+);([^;\n]+);(.*)</reg>
-<text>menuentry "\1" {
-      commonlang "$chosen" \3 \4 \5
-}
-</text>
-<reg>HEADER</reg>
-<text>
-function commonlang {
-      echo "Switching to: $1"
-      set lang=$2
-      set bootlang=$2
-      set bootkeymap=$3
-      set boottimezone=$4
-      export lang
-      export bootlang
-      export bootkeymap
-      export boottimezone
-      configfile /boot/grub/grub.cfg
-}
-
-submenu "Language Selection" {
-</text>
-<reg>FOOTER</reg>
-<text>}</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
deleted file mode 100644
index bfc30a57b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/timezone.config mirror
-<reg>([^;\n]+);([^;\n]+);(.*)</reg>
-<text>menuentry "(\1) \2" {
-      commontimezone "$chosen" \3
-}
-</text>
-<reg>HEADER</reg>
-<text>
-function commontimezone {
-      echo "Switching to: $1"
-      set boottimezone=$2
-      export boottimezone
-      configfile /boot/grub/grub.cfg
-}
-
-submenu "Timezone Selection" {
-</text>
-<reg>FOOTER</reg>
-<text>}</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
deleted file mode 100644
index bdba53f3d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
+++ /dev/null
@@ -1,42 +0,0 @@
-# Calculate run=/bin/bash
-
-IMAGE_DIR=#-cl_chroot_path-#
-CDROOT_DIR=#-cl_chroot_path-#/#-cl_root_path-#
-EFI_IMAGE_DIR=${CDROOT_DIR}/efi-image.dir
-BOOT_GRUB_DIR=${EFI_IMAGE_DIR}/boot/grub
-CD_GRUB_DIR=${CDROOT_DIR}/boot/grub
-MEMDISK=${CDROOT_DIR}/memdisk.img
-ID_FILE=id${RANDOM}.uefi
-
-rm -f ${CDROOT_DIR}/id*.uefi
-touch ${CDROOT_DIR}/${ID_FILE}
-
-mkdir -p ${BOOT_GRUB_DIR}
-
-cat >${BOOT_GRUB_DIR}/grub.cfg <<EOF
-search --file --set=root /${ID_FILE}
-set prefix=(\$root)/boot/grub
-source \$prefix/x86_64-efi/grub.cfg
-EOF
-
-
-for i in ${IMAGE_DIR}/usr/lib/grub/x86_64-efi/part_*.mod;do echo insmod `basename $i .mod`;done >${CD_GRUB_DIR}/x86_64-efi/grub.cfg
-echo "source /boot/grub/grub.cfg" >>${CD_GRUB_DIR}/x86_64-efi/grub.cfg
-tar cf - -C "${EFI_IMAGE_DIR}" boot >${MEMDISK}
-grub-mkimage -O x86_64-efi -d ${IMAGEDIR}/usr/lib/grub/x86_64-efi -m ${MEMDISK} -o ${CDROOT_DIR}/bootx64.efi -p '(memdisk)/boot/grub' search iso9660 configfile normal memdisk tar part_msdos fat
-rm -f ${CD_GRUB_DIR}/efi.img
-MKFSVER=$(mkfs.fat 2>/dev/null | sed -nr "s/mkfs.fat\s([0-9]).*/\1/;/[0-9]/p")
-if [[ -n $MKFSVER && $MKFSVER -lt 4 ]]
-then
-    SPT=32
-else
-    SPT=63
-fi
-mkfs.fat -C ${CD_GRUB_DIR}/efi.img $(( ($(stat -c %s "${CDROOT_DIR}/bootx64.efi") / 1024 + 55) / $SPT * $SPT )) &>/dev/null
-mmd -i ${CD_GRUB_DIR}/efi.img ::efi
-mmd -i ${CD_GRUB_DIR}/efi.img ::efi/boot
-mcopy -i ${CD_GRUB_DIR}/efi.img ${CDROOT_DIR}/bootx64.efi ::efi/boot/bootx64.efi
-rm ${CDROOT_DIR}/bootx64.efi
-rm ${MEMDISK}
-rm -r ${EFI_IMAGE_DIR}
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2 b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
deleted file mode 100644
index d6eec44f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate format=raw link=#-cl_builder_squash_path-#/usr/share/grub/unicode.pf2 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
deleted file mode 100644
index 31c956123..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/vga.config mirror
-<reg>([^;\n]+);(.*)</reg>
-<text>menuentry "\2" {
-      commonvga "$chosen" \1
-}
-</text>
-<reg>HEADER</reg>
-<text>
-function commonvga {
-      echo "Switching to: $1"
-      set bootvga=$2
-      export bootvga
-      configfile /boot/grub/grub.cfg
-}
-
-submenu "Resolution Selection" {
-</text>
-<reg>FOOTER</reg>
-<text>}</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
deleted file mode 100644
index 5472dac4f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate append=patch format=patch link=/bootmenu/video.config mirror
-<reg>([^;\n]+);([^;\n]+);(.*)</reg>
-<text>menuentry "\1" {
-      commonvideo "$chosen" \2 \3
-}
-</text>
-<reg>HEADER</reg>
-<text>
-function commonvideo {
-      echo "Switching to: $1"
-      set bootvideo=$2
-      set bootcomposite=$3
-      export bootvideo
-      export bootcomposite
-      configfile /boot/grub/grub.cfg
-}
-
-submenu "Video Selection" {
-</text>
-<reg>FOOTER</reg>
-<text>}</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
deleted file mode 100644
index 96e18fdf3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
deleted file mode 100644
index 5b4285c77..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/syslinux/isolinux.bin mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
deleted file mode 100644
index 5b4285c77..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/usr/share/syslinux/isolinux.bin mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
deleted file mode 100644
index b944516f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate merge()!=&&pkg()!= name=boot
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
deleted file mode 100644
index b5af17e22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_squash_path-#/boot/#-cl_builder_initrd_install-# mirror force
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz b/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
deleted file mode 100644
index b45b09a07..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=replace format=bin link=#-cl_builder_squash_path-#/boot/#-cl_builder_kernel-# mirror force
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/9_bootmenu/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_iso/9_bootmenu/.calculate_directory
deleted file mode 100644
index be8eacc0b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/9_bootmenu/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/ name=bootmenu
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_builder_iso/README-eng.txt
deleted file mode 100644
index d3d15533c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
- 
- The ac_builder_iso event:
- - iso creation
-
- Action: iso configuration
- env: builder
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_iso/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_builder_iso/README-rus.txt
deleted file mode 100644
index 724ccf4ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_iso/README-rus.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-Событие ac_builder_iso:
-- �оздание iso образа
-
-Дей�твие: на�тройка iso образа
-env: builder
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/.calculate_directory
deleted file mode 100644
index e44a70032..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=builder ac_builder_prepare==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/README-eng.txt
deleted file mode 100644
index 9ca5e2195..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/README-eng.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=skip
-
-The ac_builder_prepare event:
-- system setup after unpacking the image while building
-- system setup before system update while building
-
-Action: setup of the system to be built after unpacking
-env: builder
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/README-rus.txt
deleted file mode 100644
index b826e9fcd..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/README-rus.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=skip
-
-Событие ac_builder_prepare:
-- на�тройка �и�темы во врем� �борки по�ле ра�паковки образа
-- на�тройка �и�темы во врем� �борки перед обновлением пакетов
-
-Дей�твие: на�тройка �обираемой �и�темы по�ле ра�паковки
-env: builder
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/baselayout/localtime b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/baselayout/localtime
deleted file mode 100644
index 189231ff9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/baselayout/localtime
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/zoneinfo/UTC mirror force
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/openrc/resolv.conf b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
deleted file mode 100644
index 465e27b0c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_builder_parent_path-#/etc/resolv.conf mirror protected
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
deleted file mode 100644
index a58f57fbd..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/portage name=make.conf pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/builder b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/builder
deleted file mode 100644
index d94959429..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/builder
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate comment=# protected
-MAKEOPTS="#-os_builder_makeopts-#"
-EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --jobs=1"
-PKGDIR="#-cl_builder_pkgdir-#"
-
-#?pkg(dev-util/ccache)!=#
-FEATURES="${FEATURES} ccache"
-CCACHE_SIZE="30G"
-CCACHE_DIR="/var/calculate/remote/tmp/ccache-#-os_builder_arch_machine-#-gcc-#-pkg(sys-devel/gcc)-#"
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
deleted file mode 100644
index 814ccaf06..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/.calculate_directory
deleted file mode 100644
index 3f922aff0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=builder ac_builder_setup==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_builder_setup/README-eng.txt
deleted file mode 100644
index 48bde6b40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/README-eng.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=skip
-
-The ac_builder_setup event:
-- system setup before package compilation while building
-- system setup before package update while building
-
-Action: setup of the system to be built before compiling the packages
-env: builder
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_builder_setup/README-rus.txt
deleted file mode 100644
index f5befb6cb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/README-rus.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=skip
-
-Событие ac_builder_setup:
-- на�тройка �и�темы во врем� �борки перед �боркой пакетов
-- на�тройка �и�темы во врем� �борки перед обновлением пакетов
-
-Дей�твие: на�тройка �обираемой �и�темы перед �боркой пакетов
-env: builder
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/app-portage/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/app-portage/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/app-portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
deleted file mode 100644
index 43d38f7e7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/cache name=revdep-rebuild append=clear pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/shadow b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/shadow
deleted file mode 100644
index 115803713..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/shadow
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=patch protected chmod=0600
-<reg>^root:.*
-</reg>
-<text>root:$1$JMvNh5xg$VnV1DyJdTcwuZ0hp5YiJG0:14349:0:::::
-</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/shadow- b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/shadow-
deleted file mode 100644
index 91cd262bd..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/baselayout/shadow-
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/shadow mirror force protected chmod=0600
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index 636040311..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
deleted file mode 100644
index a64f89bc4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate path=/etc/calculate comment=# format=samba
-[main]
-cl_autoupdate_set = on
-cl_template_locate = #-cl_builder_template_location-#
-!cl_template_path = del
-
-[update]
-cl_update_binhost = #-update.cl_update_binhost-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/etc-update.conf b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/etc-update.conf
deleted file mode 100644
index e94da7d9c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/etc-update.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=openrc
-# arguments used whenever mv is called
-mv_opts=""
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/.calculate_directory
deleted file mode 100644
index 9f08de4c9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate cl_ver>=2.2.32
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
deleted file mode 100644
index 113b9f374..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=#
-
-source /var/lib/layman/make.conf
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
deleted file mode 100644
index d94959429..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate comment=# protected
-MAKEOPTS="#-os_builder_makeopts-#"
-EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --jobs=1"
-PKGDIR="#-cl_builder_pkgdir-#"
-
-#?pkg(dev-util/ccache)!=#
-FEATURES="${FEATURES} ccache"
-CCACHE_SIZE="30G"
-CCACHE_DIR="/var/calculate/remote/tmp/ccache-#-os_builder_arch_machine-#-gcc-#-pkg(sys-devel/gcc)-#"
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
deleted file mode 100644
index bce5bd62e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.keywords/custom)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
deleted file mode 100644
index d00a01b3a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.mask/custom)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
deleted file mode 100644
index 32c589d26..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.unmask/custom)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
deleted file mode 100644
index 31a0700f1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/package.use/custom)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
deleted file mode 100644
index 04758ba75..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate exists(/etc/portage/profile/package.provided)==
-# Packages that you do not want to update (see: man portage)
-# Example:
-# net-misc/wicd-1.7.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/sets/custom b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
deleted file mode 100644
index 781390a1b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/etc/portage/sets/custom)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/world_sets b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/world_sets
deleted file mode 100644
index 0862935f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/portage/world_sets
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/var/lib/portage load(/var/lib/portage/world_sets)==
-@custom
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/shadow/login.defs b/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/shadow/login.defs
deleted file mode 100644
index 0b0ec5200..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_setup/sys-apps/shadow/login.defs
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate comment=# format=patch
-<reg>
-GID_MIN.*
-</reg>
-<text>
-GID_MIN\t\t\t  100
-</text>
-<reg>
-UID_MIN.*
-</reg>
-<text>
-UID_MIN\t\t\t  100
-</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/.calculate_directory
deleted file mode 100644
index 71e53191c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=builder ac_builder_squash==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
deleted file mode 100644
index 5c797e393..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/calculate name=server append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
deleted file mode 100644
index cd8068501..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/calculate name=tmp append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/distfiles/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
deleted file mode 100644
index 7cb9f5f98..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/calculate/remote name=distfiles append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/elog/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/elog/.calculate_directory
deleted file mode 100644
index d4471b10b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/elog/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/log/portage name=elog append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
deleted file mode 100644
index ee4205d53..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
deleted file mode 100644
index e1159a236..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/portage/make.conf name=binhost append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
deleted file mode 100644
index a548515ab..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/log name=calculate append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
deleted file mode 100644
index c215a20d2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/log name=clamav append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.bash_history b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.bash_history
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.bash_history
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.viminfo b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.viminfo
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/root/.viminfo
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/tmp.portage/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/tmp.portage/.calculate_directory
deleted file mode 100644
index 0638056cc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/tmp.portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/tmp name=portage append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/tmp/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/tmp/.calculate_directory
deleted file mode 100644
index 4bf87b8ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/tmp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=tmp append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
deleted file mode 100644
index 53dea1682..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/cache/edb name=binhost append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
deleted file mode 100644
index 649a8ad8d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/cache name=revdep-rebuild append=clear
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/.locks b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/.locks
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/.locks
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/.svn-src b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/.svn-src
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/.svn-src
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/emerge.log b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/emerge.log
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/emerge.log
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/genkernel.log b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/genkernel.log
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/genkernel.log
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/lastlog b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/lastlog
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/lastlog
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/prelink.log b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/prelink.log
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/prelink.log
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/wtmp b/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/wtmp
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/0_clean/var/log/wtmp
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index 4d6e07f05..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!=&&merge()!= path=/ name=etc
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
deleted file mode 100644
index 1eb5db8a6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
+++ /dev/null
@@ -1,22 +0,0 @@
-# Calculate comment=# format=samba path=/etc/calculate
-[main]
-os_linux_build = #-os_builder_linux_build-#
-os_linux_files = #-os_builder_linux_files-#
-!cl_merges =
-!cl_template_path =
-!cl_autoupdate_set =
-!cl_kernel_uid =
-!cl_template_locate =
-
-[install]
-!os_install_net_settings =
-
-[update]
-!cl_update_branch_name =
-!cl_update_binhost =
-#?cl_ver>=3.4.7.7&&cl_builder_binhost_stable_set==off#
-cl_update_binhost_stable_set = off
-#cl_ver#
-#?cl_ver<3.4.7.7||cl_builder_binhost_stable_set==on#
-!cl_update_binhost_stable_set =
-#cl_ver#
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
deleted file mode 100644
index 35c0c9838..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch cl_builder_live_set==off
-<reg>LANG=C /usr/bin/cl-install --startup --live</reg>
-<text>LANG=C /usr/bin/cl-install --startup</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
deleted file mode 100644
index 619d1f45d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/calculate symbolic pkg(sys-apps/calculate-install)>=2&&pkg(sys-apps/calculate-install)<3
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
deleted file mode 100644
index 23903f160..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/calculate-core symbolic pkg(x11-base/xorg-server)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
deleted file mode 100644
index 8b74da309..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=calculate-corei append=remove pkg(x11-base/xorg-server)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
deleted file mode 100644
index 636040311..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
deleted file mode 100644
index d92d0da0e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/cache name=man chown=man:man
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
deleted file mode 100644
index e801f8583..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=openrc
-
-hostname="calculate"
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
deleted file mode 100644
index 04d8fd364..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=openrc
-# Set CLOCK to "UTC" if your system clock is set to UTC (also known as
-# Greenwich Mean Time).  If your clock is set to the local time, then 
-# set CLOCK to "local".  Note that if you dual boot with Windows, then 
-# you should set it to "local".
-clock="local"
-
-# If you want to set the Hardware Clock to the current System Time 
-# during shutdown, then say "YES" here.
-# You normally don't need to do this if you run a ntp daemon.
-clock_systohc="NO"
-
-# If you wish to pass any other arguments to hwclock during bootup,
-# you may do so here. Alpha users may wish to use --arc or --srm here.
-clock_args=""
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
deleted file mode 100644
index 0b14b309f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=openrc
-# use sulogin for interactive authentificate
-rc_shell=/sbin/sulogin
-#able to press the I key during boot so you can choose to start specific services
-#?pkg(sys-boot/plymouth)==#
-rc_interactive="YES"
-#pkg#
-#?pkg(sys-boot/plymouth)!=#
-rc_interactive="NO"
-#pkg#
-#use all net.* for network atapters (need for CDS)
-rc_hotplug="*"
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
deleted file mode 100644
index 34d6835f8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=openrc
-# arguments used whenever mv is called
-mv_opts="-i"
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
deleted file mode 100644
index 6956dbfe2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc/portage
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
deleted file mode 100644
index 01346c074..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate comment=# format=patch
-<reg>
-GID_MIN.*
-</reg>
-<text>
-GID_MIN\t\t\t  1000
-</text>
-<reg>
-UID_MIN.*
-</reg>
-<text>
-UID_MIN\t\t\t  1000
-</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
deleted file mode 100644
index 68a1592e0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=# format=patch
-<reg>^(s[01])</reg>
-<text>#\1</text>
-<reg>(c[0-9]:.*agetty).*(tty\d linux)</reg>
-<text>\1 -nl /bin/bashlogin 38400 \2</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
deleted file mode 100644
index 4bf524353..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/ name=etc pkg()!=&&merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab b/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
deleted file mode 100644
index fa98c787b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate protected
-
-/dev/loop0	/		squashfs ro,defaults		0 0
-
-proc		/proc		proc	defaults		0 0
-shm		/dev/shm	tmpfs	nodev,nosuid,noexec	0 0
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_builder_squash/README-eng.txt
deleted file mode 100644
index cc9081eb9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/README-eng.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate append=skip
-
-The ac_builder_squash event:
-- iso creation
-- iso reforming*
-
-*Calling cl-image squash
-
-Action: squash image configuration
-env: builder
diff --git a/profiles/templates/deprecated/3.4/6_ac_builder_squash/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_builder_squash/README-rus.txt
deleted file mode 100644
index 94f4b8e26..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_builder_squash/README-rus.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate append=skip
-
-Событие ac_builder_squash:
-- �оздание iso образа
-- переформирование образа*
-
-*Вызов команды cl-image squash
-
-Дей�твие: на�тройка squash образана
-env: builder
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/.calculate_directory
deleted file mode 100644
index 0af99e1c5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate env=desktop path=~ name= chown=#-main.ur_login-#:#-main.ur_group-# ac_desktop_profile==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/.calculate_directory
deleted file mode 100644
index e24ea2809..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ur_login!=root&&load(~/.calculate/ini.env)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
deleted file mode 100644
index 1db5e1da6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~ name= chmod=0700 exists(~/.kde4/share/config)==&&exists(~/.gconf)==&&exists(~/.config)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
deleted file mode 100644
index 393d201a7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=samba path=~/.calculate name=ini.env
-
-[main]
-update = on
-lock = on
-
-[ver]
-patch = 36
-
-[update]
-patch = on
-
-[resource]
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-path = /home/#-ur_login-#/Home
-#env#
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-path = /home/#-ur_login-#
-#env#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
deleted file mode 100644
index 023f00ca6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=samba path=~/.calculate name=ini.env
-
-[resource]
-desktop = /home/#-ur_login-#/Desktop
-documents = #-ini(resource.path)-#/Documents
-downloads = #-ini(resource.path)-#/Downloads
-music = #-ini(resource.path)-#/Music
-pictures = #-ini(resource.path)-#/Pictures
-public = #-ini(resource.path)-#/Public
-templates = #-ini(resource.path)-#/Templates
-videos = #-ini(resource.path)-#/Videos
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
deleted file mode 100644
index 13bac6542..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
+++ /dev/null
@@ -1,146 +0,0 @@
-# Calculate format=samba path=~/.calculate name=ini.env
-
-[resource]
-#?os_locale_lang==bg_BG#
-documents = #-ini(resource.path)-#/Документи
-downloads = #-ini(resource.path)-#/Свалени
-music = #-ini(resource.path)-#/Музика
-pictures = #-ini(resource.path)-#/Изображени�
-public = #-ini(resource.path)-#/Публични
-templates = #-ini(resource.path)-#/Шаблони
-videos = #-ini(resource.path)-#/Видео
-#os_locale_lang#
-#?os_locale_lang==bg_BG&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Работен плот
-#os_locale_lang#
-
-#?os_locale_lang==de_DE#
-documents = #-ini(resource.path)-#/Dokumente
-downloads = #-ini(resource.path)-#/Downloads
-music = #-ini(resource.path)-#/Musik
-pictures = #-ini(resource.path)-#/Bilder
-public = #-ini(resource.path)-#/Öffentlich
-templates = #-ini(resource.path)-#/Vorlagen
-videos = #-ini(resource.path)-#/Videos
-#os_locale_lang#
-#?os_locale_lang==de_DE&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Arbeitsfläche
-#os_locale_lang#
-
-#?os_locale_lang==es_ES#
-documents = #-ini(resource.path)-#/Documentos
-downloads = #-ini(resource.path)-#/Descargas
-music = #-ini(resource.path)-#/Música
-pictures = #-ini(resource.path)-#/Imágenes
-public = #-ini(resource.path)-#/Público
-templates = #-ini(resource.path)-#/Plantillas
-videos = #-ini(resource.path)-#/Vídeos
-#os_locale_lang#
-#?os_locale_lang==es_ES&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Escritorio
-#os_locale_lang#
-
-#?os_locale_lang==fr_FR#
-documents = #-ini(resource.path)-#/Documents
-downloads = #-ini(resource.path)-#/Téléchargements
-music = #-ini(resource.path)-#/Musique
-pictures = #-ini(resource.path)-#/Images
-public = #-ini(resource.path)-#/Public
-templates = #-ini(resource.path)-#/Modèles
-videos = #-ini(resource.path)-#/Vidéos
-#os_locale_lang#
-#?os_locale_lang==fr_FR&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Bureau
-#os_locale_lang#
-
-#?os_locale_lang==it_IT#
-documents = #-ini(resource.path)-#/Documenti
-downloads = #-ini(resource.path)-#/Scaricati
-music = #-ini(resource.path)-#/Musica
-pictures = #-ini(resource.path)-#/Immagini
-public = #-ini(resource.path)-#/Pubblici
-templates = #-ini(resource.path)-#/Modelli
-videos = #-ini(resource.path)-#/Video
-#os_locale_lang#
-#?os_locale_lang==it_IT&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Ambiente grafico
-#os_locale_lang#
-
-#?os_locale_lang==pl_PL#
-documents = #-ini(resource.path)-#/Dokumenty
-downloads = #-ini(resource.path)-#/Pobrane
-music = #-ini(resource.path)-#/Muzyka
-pictures = #-ini(resource.path)-#/Obrazy
-public = #-ini(resource.path)-#/Publiczny
-templates = #-ini(resource.path)-#/Szablony
-videos = #-ini(resource.path)-#/Wideo
-#os_locale_lang#
-#?os_locale_lang==pl_PL&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Pulpit
-#os_locale_lang#
-
-#?os_locale_lang==pt_BR#
-documents = #-ini(resource.path)-#/Documentos
-downloads = #-ini(resource.path)-#/Download
-music = #-ini(resource.path)-#/Música
-pictures = #-ini(resource.path)-#/Imagens
-public = #-ini(resource.path)-#/Público
-templates = #-ini(resource.path)-#/Modelos
-videos = #-ini(resource.path)-#/Vídeos
-#os_locale_lang#
-#?os_locale_lang==pt_BR&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/�rea de trabalho
-#os_locale_lang#
-
-#?os_locale_lang==pt_PT#
-documents = #-ini(resource.path)-#/Documentos
-downloads = #-ini(resource.path)-#/Transferências
-music = #-ini(resource.path)-#/Música
-pictures = #-ini(resource.path)-#/Imagens
-public = #-ini(resource.path)-#/Público
-templates = #-ini(resource.path)-#/Modelos
-videos = #-ini(resource.path)-#/Vídeos
-#os_locale_lang#
-#?os_locale_lang==pt_PT&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Desktop
-#os_locale_lang#
-
-#?os_locale_lang==ru_RU#
-documents = #-ini(resource.path)-#/Документы
-downloads = #-ini(resource.path)-#/Загрузки
-music = #-ini(resource.path)-#/Музыка
-pictures = #-ini(resource.path)-#/Картинки
-public = #-ini(resource.path)-#/Общедо�тупные
-templates = #-ini(resource.path)-#/Шаблоны
-videos = #-ini(resource.path)-#/Видео
-#os_locale_lang#
-#?os_locale_lang==ru_RU&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Рабочий �тол
-#os_locale_lang#
-
-#?os_locale_lang==ro_RO#
-documents = #-ini(resource.path)-#/Documente
-downloads = #-ini(resource.path)-#/Descărcări
-music = #-ini(resource.path)-#/Muzică
-pictures = #-ini(resource.path)-#/Poze
-public = #-ini(resource.path)-#/Public
-templates = #-ini(resource.path)-#/Templates
-videos = #-ini(resource.path)-#/Video
-#os_locale_lang#
-#?os_locale_lang==ro_RO&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Desktop
-#os_locale_lang#
-
-#?os_locale_lang==uk_UA#
-documents = #-ini(resource.path)-#/Документи
-downloads = #-ini(resource.path)-#/Завантаженн�
-music = #-ini(resource.path)-#/Музика
-pictures = #-ini(resource.path)-#/Картинки
-public = #-ini(resource.path)-#/Загальнодо�тупні
-templates = #-ini(resource.path)-#/Шаблони
-videos = #-ini(resource.path)-#/Відео
-#os_locale_lang#
-#?os_locale_lang==uk_UA&&ur_domain_set==off#
-desktop = /home/#-ur_login-#/Робочий �тіл
-#os_locale_lang#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
deleted file mode 100644
index 879d99897..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
deleted file mode 100644
index 248d55b90..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path=#-ini(resource.documents)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
deleted file mode 100644
index fe6f3dafb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Icon=folder-documents
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
deleted file mode 100644
index f9bd1942d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path=#-ini(resource.downloads)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
deleted file mode 100644
index d414f16d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Icon=folder-downloads
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
deleted file mode 100644
index 79b65ee28..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path=#-ini(resource.music)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
deleted file mode 100644
index 90fa43b2a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Icon=folder-sound
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
deleted file mode 100644
index 6810f03b3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path=#-ini(resource.pictures)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
deleted file mode 100644
index 4763c3f57..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Icon=folder-image
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
deleted file mode 100644
index 29761a027..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path=#-ini(resource.public)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
deleted file mode 100644
index d13dfe3a4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Icon=folder-html
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
deleted file mode 100644
index 3d530c633..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path=#-ini(resource.templates)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
deleted file mode 100644
index b129c12af..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Icon=folder-txt
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
deleted file mode 100644
index 6e3af60fb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path=#-ini(resource.videos)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
deleted file mode 100644
index 3c68e3e6c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Icon=folder-video
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
deleted file mode 100644
index cdcadb285..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=.calculate exists(~/.kde4/share/config)!=||exists(~/.gconf)!=||exists(~/.config)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/full_dir/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/full_dir/ini.env
deleted file mode 100644
index 4ce093db4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/1-user-init/full_dir/ini.env
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba
-
-[main]
-update = off
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/.calculate_directory
deleted file mode 100644
index 4855a325e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ur_login==root&&ini(main.update)!=off
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
deleted file mode 100644
index fa7b98a24..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.mc)!=off&&ini(ver.mc)==&&pkg()>=4.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
deleted file mode 100644
index 3ef8e8c59..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde path=~/.config/mc
-
-[Midnight-Commander]
-skin=/root/.config/mc/skins/modarcon16root-defbg.ini
-
-[Layout]
-menubar_visible=0
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
deleted file mode 100644
index de802a967..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-mc = 4.8
-
-[update]
-mc = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
deleted file mode 100644
index 516978446..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
+++ /dev/null
@@ -1,183 +0,0 @@
-# Calculate format=raw path=~/.config/mc/skins
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-  description=MoDarCon16root-DefaultBG (root)
-  256colors=false
-
-[Lines]
-  horiz=─
-  vert=│
-  lefttop=┌
-  righttop=�
-  leftbottom=â””
-  rightbottom=┘
-  topmiddle=─
-  bottommiddle=─
-  leftmiddle=├
-  rightmiddle=┤
-  cross=┼
-  dhoriz=─
-  dvert=│
-  dlefttop=┌
-  drighttop=�
-  dleftbottom=â””
-  drightbottom=┘
-  dtopmiddle=─
-  dbottommiddle=─
-  dleftmiddle=├
-  drightmiddle=┤
-
-[core]
-  _default_=color7;default
-  selected=color15;color1
-  marked=color11;;bold
-  markselect=color8;color1;bold
-  gauge=color15;color1
-  input=color15;color0
-  inputmark=color8;color1;bold
-  inputunchanged=;color0
-  commandlinemark=color8;color1;bold
-  reverse=color0;color9
-  header=color3
-  disabled=color8;color7
-  #inputhistory=
-  #commandhistory=
-
-[dialog]
-  _default_=color0;color7
-  dhotnormal=color3
-  dfocus=color8;color1;bold
-  dhotfocus=color5;color1;bold
-  dtitle=color8;;bold
-
-[error]
-  _default_=color15;color1
-  errdfocus=color8;color3;bold
-  errdhotnormal=color13
-  errdhotfocus=color13;color3
-  errdtitle=color8;;bold
-
-[filehighlight]
-  directory=color15
-  executable=color10
-  symlink=color12
-  hardlink=
-  stalelink=color9
-  device=color13
-  special=color3
-  core=color1
-  temp=color8
-  archive=color3
-  doc=color14
-  source=color6
-  media=color5
-  graph=color13
-  database=color2
-
-[menu]
-  _default_=color7;default
-  menuhot=color3
-  menusel=color8;color1;bold
-  menuhotsel=color5;color1;bold
-  menuinactive=color8
-
-[popupmenu]
-  _default_=color7;default
-  menusel=color8;color1;bold
-  menutitle=color8;;bold
-
-[buttonbar]
-  button=color7
-  hotkey=color15;color3
-
-[statusbar]
-  _default_=color15;color1
-
-[help]
-  _default_=color0;color7
-  helpitalic=color10;;bold
-  helpbold=color5
-  helplink=color2
-  helpslink=color8;color1;bold
-
-[editor]
-  _default_=color7;default
-  editbold=color15;;bold
-  editmarked=color8;color1;bold
-  editwhitespace=color12;color4
-  editlinestate=color1;color0
-  bookmark=color0;color7
-  bookmarkfound=color0;color7
-  editrightmargin=color0;color7
-
-[viewer]
-  _default_=color7;default
-  viewunderline=;;underline
-
-[diffviewer]
-  changedline=color15;color4
-  changednew=color15;color5
-  changed=color15;color3
-  added=color0;color7
-  removed=color8;color0
-  folder=color8;color0;bold
-  error=color15;color1
-
-[widget-common]
-  sort-sign-up=↓
-  sort-sign-down=↑
-
-[widget-panel]
-  hiddenfiles-sign-show=•
-  hiddenfiles-sign-hide=â—‹
-  history-prev-item-sign=«
-  history-next-item-sign=»
-  history-show-list-sign=^
-
-[widget-scollbar]
-  first-vert-char=↑
-  last-vert-char=↓
-  first-horiz-char=«
-  last-horiz-char=»
-  current-char=â– 
-  background-char=â–’
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
deleted file mode 100644
index c0e7d1074..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=kde path=~/.config/mc
-
-[New Left Panel]
-list_mode=brief
-
-[New Right Panel]
-list_mode=brief
-
-[Dirs]
-other_dir=/
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
deleted file mode 100644
index dc2ea2895..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=replace os_root_type==livecd
-
-# need for autologin
-#?os_root_type==livecd#
-export HOME="/root"
-export LOGNAME="root"
-export SHELL="/bin/bash"
-#os_root_type#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
deleted file mode 100644
index ba6473e5a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-bash = 4.0
-
-[update]
-bash = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
deleted file mode 100644
index 8e7d1324c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&os_root_type==livecd&&ini(update.bash)!=off&&ini(ver.bash)==&&pkg()>=4.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
deleted file mode 100644
index a6c17215c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-qtgui = 4.8.6.1
-
-[update]
-qtgui = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
deleted file mode 100644
index 2541cad44..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.qtgui)!=off&&ini(ver.qtgui)<4.8.6.1&&pkg()>=4.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
deleted file mode 100644
index b2144f7ba..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Calculate format=raw path=~/.config
-[qt]
-font="Droid Sans,10,-1,5,50,0,0,0,0,0"
-#?pkg(gnome-base/gnome-core-libs)!=||pkg(xfce-base/xfdesktop)!=||pkg(mate-base/mate-settings-daemon)!=||pkg(x11-themes/gnome-breeze)!=||pkg(kde-plasma/breeze-gtk)!=#
-style=GTK+
-#pkg#
-#?pkg(kde-base/kdelibs)!=&&pkg(kde-plasma/breeze)==#
-Palette\active=#221f1e, #dfdcd9, #f6f5f5, #dfdcdb, #797472, #b7afab, #1f1c1b, #ffffff, #221f1e, #ffffff, #d6d2d0, #464342, #43ace8, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #181513, #e7fdff
-Palette\inactive=#221f1e, #dfdcd9, #f6f5f5, #dfdcdb, #797472, #b7afab, #1f1c1b, #ffffff, #221f1e, #ffffff, #d6d2d0, #464342, #94caef, #221f1e, #0057ae, #644a9b, #f8f7f6, #000000, #181513, #e7fdff
-Palette\disabled=#908d8b, #d6d2ce, #eceae9, #d7d3d1, #746f6c, #afa8a4, #a9a7a7, #ffffff, #969391, #f4f4f4, #cdc8c6, #454240, #cdc8c6, #908d8b, #97bcdf, #c1b6d7, #eeece9, #000000, #181513, #e7fdff
-KWinPalette\activeBackground=#30aee8
-KWinPalette\activeBlend=#ffffff
-KWinPalette\activeForeground=#ffffff
-KWinPalette\frame=#d6d2d0
-KWinPalette\activeTitleBtnBg=#d6d2d0
-KWinPalette\inactiveBackground=#e0dfde
-KWinPalette\inactiveBlend=#4b4743
-KWinPalette\inactiveForeground=#4b4743
-KWinPalette\inactiveFrame=#d6d2d0
-KWinPalette\inactiveTitleBtnBg=#d6d2d0
-KDE\contrast=5
-#pkg#
-#?pkg(kde-plasma/breeze)!=#
-KDE\contrast=4
-KWinPalette\activeBackground=#475057
-KWinPalette\activeBlend=#ffffff
-KWinPalette\activeForeground=#eff0f1
-KWinPalette\activeTitleBtnBg=#eff0f1
-KWinPalette\frame=#eff0f1
-KWinPalette\inactiveBackground=#eff0f1
-KWinPalette\inactiveBlend=#4b4743
-KWinPalette\inactiveForeground=#bdc3c7
-KWinPalette\inactiveFrame=#eff0f1
-KWinPalette\inactiveTitleBtnBg=#eff0f1
-Palette\active=#31363b, #eff0f1, #ffffff, #f7f7f8, #888e93, #c4c9cd, #31363b, #ffffff, #31363b, #fcfcfc, #eff0f1, #474a4c, #3daee9, #eff0f1, #2980b9, #7f8c8d, #eff0f1, #000000, #31363b, #eff0f1
-Palette\disabled=#a5a7a9, #e3e5e7, #ffffff, #ecedee, #82878c, #bcc0c5, #acaeb0, #ffffff, #a5a7a9, #f1f1f1, #e3e5e7, #47494c, #e3e5e7, #a5a7a9, #a2c8e0, #c7cbcb, #e3e5e7, #000000, #31363b, #eff0f1
-Palette\inactive=#31363b, #eff0f1, #ffffff, #f7f7f8, #888e93, #c4c9cd, #31363b, #ffffff, #31363b, #fcfcfc, #eff0f1, #474a4c, #c2e0f5, #31363b, #2980b9, #7f8c8d, #eff0f1, #000000, #31363b, #eff0f1
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
deleted file mode 100644
index 2ccbdee7f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-git = 1.7.0
-
-[update]
-git = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
deleted file mode 100644
index e697ff501..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.git)!=off&&ini(ver.git)==&&pkg()>=1.7.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
deleted file mode 100644
index a18a37f97..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=samba
-[color]
-	diff = auto
-	branch = auto
-	interactive = auto
-	status = auto
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.calculate/ini.env
deleted file mode 100644
index 113823cf0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-dm-themes = 14.2
-
-[update]
-dm-themes = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.calculate_directory
deleted file mode 100644
index 87b003929..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.dm-themes)!=off&&ini(ver.dm-themes)<=14.2&&pkg()>=14
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.gtkrc-2.0 b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.gtkrc-2.0
deleted file mode 100644
index 2524421c0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/media-gfx/dm-themes-calculate-14/.gtkrc-2.0
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate path=/root
-
-#?pkg(kde-plasma/breeze-gtk)!=#
-include "/usr/share/themes/Breeze/gtk-2.0/gtkrc"
-#pkg#
-#?pkg(kde-plasma/breeze-gtk)==&&pkg(x11-themes/gnome-breeze)!=#
-include "/usr/share/themes/Breeze-dark-gtk/gtk-2.0/gtkrc"
-#pkg#
-#?pkg(kde-plasma/breeze-gtk)==&&pkg(x11-themes/gnome-breeze)==#
-include "/usr/share/themes/Calculate/gtk-2.0/gtkrc"
-#pkg#
-include "/etc/gtk-2.0/gtkrc"
-
-#?pkg(media-fonts/droid)!=#
-style "user-font"
-{
-    font_name="Droid Sans"
-}
-#pkg#
-widget_class "*" style "user-font"
-#?pkg(media-fonts/droid)!=#
-gtk-font-name="Droid Sans 10"
-#pkg#
-gtk-theme-name="Calculate"
-gtk-icon-theme-name="Calculate"
-gtk-fallback-icon-theme="Calculate"
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-menu-images=1
-gtk-button-images=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
deleted file mode 100644
index 4dc684148..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
+++ /dev/null
@@ -1,62 +0,0 @@
-! дл� применени� на�троек в текущей �е��ии и�пользуйте `xrdb -load ~/.Xresources`
-
-Xft.antialias: true
-Xft.dpi: 96
-Xft.rgba: none
-Xft.hinting: true
-Xft.hintstyle: hintslight
-
-URxvt.perl-ext-common: default,tabbed,matcher
-
-URxvt.url-launcher: /usr/bin/chromium
-URxvt.matcher.button: 2
-URxvt.colorUL: #cacc46
-URxvt.underlineURLs: true
-URxvt.underlineColor: #cacc46
-
-URxvt.font: xft:Droid Sans Mono Slashed:pixelsize=13
-URxvt.boldFont: xft:Droid Sans Mono Slashed:bold
-
-URxvt.saveLines: 5000
-URxvt.geometry: 100x35
-URxvt.termName: rxvt
-
-URxvt.scrollBar: true
-URxvt.scrollstyle: plain
-URxvt.scrollBar_right: true
-URxvt.scrollColor: #1A1A1A
-
-! color the man
-URxvt.colorMode: on
-URxvt.boldColors: on
-URxvt.dynamicColors: on
-URxvt.colorULMode: on
-URxvt.underLine: off
-URxvt.colorBDMode: on
-URxvt.colorBD:  cyan
-
-URxvt.background: #2c2c2c
-URxvt.foreground: #dcdccc
-URxvt.color0: #2c2c2c
-URxvt.color1: #705050
-URxvt.color2: #60b48a
-URxvt.color3: #dfaf8f
-URxvt.color4: #9ab8d7
-URxvt.color5: #dc8cc3
-URxvt.color6: #8cd0d3
-URxvt.color7: #dcdccc
-URxvt.color8: #709080
-URxvt.color9: #dca3a3
-URxvt.color10: #72d5a3
-URxvt.color11: #f0dfaf
-URxvt.color12: #94bff3
-URxvt.color13: #ec93d3
-URxvt.color14: #93e0e3
-URxvt.color15: #ffffff
-
-URxvt.tabbed.tabbar-fg: 2
-URxvt.tabbed.tabbar-bg: 0
-URxvt.tabbed.tab-fg: 3
-URxvt.tabbed.tab-bg: 0
-
-! URxvt.iconFile: /usr/share/pixmaps/terminal.xpm
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
deleted file mode 100644
index 9d13d2ecc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-urxvt = 9.16
-
-[update]
-urxvt = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
deleted file mode 100644
index 9e572090c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.urxvt)!=off&&ini(ver.urxvt)==&&pkg()>=9.16
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
deleted file mode 100644
index 3f8f2e033..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-openbox = 3.5
-
-[update]
-openbox = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
deleted file mode 100644
index 4938ebd6f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.openbox)!=off&&ini(ver.openbox)==&&pkg()>=3.5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
deleted file mode 100644
index 57320e2df..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate chmod=0755
-xrdb -merge ~/.Xresources
-#?pkg(x11-terms/rxvt-unicode)!=#
-urxvt -geometry 80x24+30+30 &
-#?pkg(x11-apps/xsetroot)!=#
-xsetroot -solid rgb:60/99/BB
-#pkg#
-openbox
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/.calculate_directory
deleted file mode 100644
index 6e560231d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ur_login!=root&&ini(main.update)!=off
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/.calculate_directory
deleted file mode 100644
index 08101fbec..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<4
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/ini.env
deleted file mode 100644
index c0122636c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 4
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/xsettings.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/xsettings.xml
deleted file mode 100644
index 9f0e713a1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-04/xsettings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate ini(ver.xfce)!= path=~/.config/xfce4/xfconf/xfce-perchannel-xml format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Gtk" type="empty">
-    <property name="IconSizes" type="string" value="panel-applications-menu=22,22:gtk-menu=22,22:panel-directory=22,22:panel-directory-menu=22,22"/>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/.calculate_directory
deleted file mode 100644
index 99163a552..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<5&&main.os_linux_ver>=13
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/datetime-5.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/datetime-5.rc
deleted file mode 100644
index 666306dc0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/datetime-5.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate ini(ver.xfce)!= path=~/.config/xfce4/panel format=procmail
-layout=3
-date_font=Droid Sans 8
-time_font=Droid Sans 22
-date_format=%Y-%m-%d
-time_format=%H:%M
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/ini.env
deleted file mode 100644
index 8a15a0b75..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 5
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/xsettings.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/xsettings.xml
deleted file mode 100644
index 55a9f58d5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-05/xsettings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(ver.xfce)!= path=~/.config/xfce4/xfconf/xfce-perchannel-xml format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Calculate"/>
-    <property name="IconThemeName" type="string" value="Calculate"/>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-06/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-06/.calculate_directory
deleted file mode 100644
index c17f50bc2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-06/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13||merge(gnome-base/gnome-shell)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13||merge(gnome-base/libgnome)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-06/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-06/ini.env
deleted file mode 100644
index 53f57e7c9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-06/ini.env
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 6
-#?ini(ver.gnome)!=#
-gnome-shell = #-ini(ver.gnome)-#
-!gnome =
-#ini#
-
-[update]
-patch = on
-#?ini(update.gnome)!=#
-gnome-shell = #-ini(update.gnome)-#
-!gnome =
-#ini#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/.calculate_directory
deleted file mode 100644
index 7e2b09805..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<7 path=~/.local/share name=applications
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/00-Home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/00-Home.desktop
deleted file mode 100644
index 12098707b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/00-Home.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate format=samba name=Home.desktop chmod=0755 append=replace pkg(gnome-extra/cinnamon)!=
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Home
-Comment=Browser Home
-Categories=Application;
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-Exec=nemo /home/#-ur_login-#/Home
-#env#
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-Exec=nemo /home/#-ur_login-#
-#env#
-Icon=user-home
-Terminal=false
-StartupNotify=false
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/00-Home.desktop.remove b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/00-Home.desktop.remove
deleted file mode 100644
index b482562ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/00-Home.desktop.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=00-Home.desktop
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/01-Share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/01-Share.desktop
deleted file mode 100644
index b7905ccaf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/01-Share.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=samba name=Share.desktop env(client.os_remote_auth)!=&&ur_domain_set==on&&pkg(gnome-extra/cinnamon)!= chmod=0755 append=replace
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Share
-Comment=Browser Share
-Categories=Application;
-Exec=nemo /home/#-ur_login-#/Share
-Icon=folder-remote
-Terminal=false
-StartupNotify=false
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/01-Share.desktop.remove b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/01-Share.desktop.remove
deleted file mode 100644
index dcf7d9eef..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/01-Share.desktop.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=01-Share.desktop
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/02-FTP.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/02-FTP.desktop
deleted file mode 100644
index d372a4001..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/02-FTP.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=samba name=FTP.desktop env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=&&pkg(gnome-extra/cinnamon)!= chmod=0755 append=replace
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=FTP
-Comment=Browser FTP
-Categories=Application;
-Exec=nemo /home/#-ur_login-#/FTP
-Icon=folder-download
-Terminal=false
-StartupNotify=false
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/02-FTP.desktop.remove b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/02-FTP.desktop.remove
deleted file mode 100644
index 060421d6e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/02-FTP.desktop.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove name=02-FTP.desktop
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/ini.env
deleted file mode 100644
index ddf7e4fc1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-07/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 7
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/%gconf.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/%gconf.xml
deleted file mode 100644
index 0b34d0b1a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/%gconf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=xml_gconf
-<?xml version="1.0"?>
-<gconf>
-	<entry name="gtk_theme" type="string">
-		<stringvalue>Calculate</stringvalue>
-	</entry>
-</gconf>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/.calculate_directory
deleted file mode 100644
index 45c026b8c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(gnome-base/libgnome)!=&&merge(x11-themes/gnome-themes-standard)!=&&ini(update.patch)!=off&&ini(ver.patch)<8 path=~/.gconf/desktop/gnome name=interface
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/ini.env
deleted file mode 100644
index 7b58c0d9a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-08/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 8
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-09/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-09/.calculate_directory
deleted file mode 100644
index 50a42c8f5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-09/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<9
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-09/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-09/ini.env
deleted file mode 100644
index fa771ad0a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-09/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate pkg(kde-base/kdelibs)!= format=samba path=~/.calculate merge=kde-base/kdelibs,kde-base/plasma-workspace
-
-[ver]
-patch = 9
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/.calculate_directory
deleted file mode 100644
index ec1581318..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(kde-base/kdelibs)!=&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<10 path=~/.kde4/share name=config
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/ini.env
deleted file mode 100644
index 3b6edb028..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 10
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/plasmarc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/plasmarc
deleted file mode 100644
index b11d0da02..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-10/plasmarc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=plasma
-
-[Theme]
-name=Calculate
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/.calculate_directory
deleted file mode 100644
index ca3832158..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(xfce-base/xfce4-panel)!=&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<11 path=~/.config/xfce4/xfconf name=xfce-perchannel-xml
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/ini.env
deleted file mode 100644
index 1ed5f1f31..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 11
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/xfce4-panel.xml
deleted file mode 100644
index 1ad4a07e0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-11/xfce4-panel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="plugins" type="empty">
-    <property name="plugin-6" type="string" value="systray">
-      <property name="size-max" type="uint" value="24"/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/.calculate_directory
deleted file mode 100644
index 0aad0ade4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(xfce-base/xfce4-panel)!=&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<12
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/ini.env
deleted file mode 100644
index 09724e61b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 12
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/launcher-7/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/launcher-7/.calculate_directory
deleted file mode 100644
index 228ec6ddd..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/launcher-7/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.config/xfce4/panel
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/launcher-7/lock.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/launcher-7/lock.desktop
deleted file mode 100644
index be8ac6135..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/launcher-7/lock.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate name=10000000007.desktop
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Lock Screen
-Name[ru]=Блокирование �еан�а
-Comment=
-Exec=xflock4
-Icon=system-lock-screen
-Path=
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/xfce4-panel.xml
deleted file mode 100644
index 205136785..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-13/xfce4-panel.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="plugins" type="empty">
-    <property name="plugin-7" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000007.desktop"/>
-      </property>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/.calculate_directory
deleted file mode 100644
index 6f2075388..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<14
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/config b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/config
deleted file mode 100644
index 22a93720b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/config
+++ /dev/null
@@ -1,35 +0,0 @@
-# Calculate format=samba path=~/.config/audacious pkg(media-sound/audacious)>=3.2
-[globalHotkey]
-Hotkey_0_key=173
-Hotkey_0_mask=0
-Hotkey_0_type=0
-Hotkey_0_event=0
-Hotkey_1_key=172
-Hotkey_1_mask=0
-Hotkey_1_type=0
-Hotkey_1_event=2
-Hotkey_2_key=174
-Hotkey_2_mask=0
-Hotkey_2_type=0
-Hotkey_2_event=3
-Hotkey_3_key=171
-Hotkey_3_mask=0
-Hotkey_3_type=0
-Hotkey_3_event=4
-Hotkey_4_key=121
-Hotkey_4_mask=0
-Hotkey_4_type=0
-Hotkey_4_event=7
-Hotkey_5_key=123
-Hotkey_5_mask=0
-Hotkey_5_type=0
-Hotkey_5_event=8
-Hotkey_6_key=122
-Hotkey_6_mask=0
-Hotkey_6_type=0
-Hotkey_6_event=9
-Hotkey_7_key=122
-Hotkey_7_mask=0
-Hotkey_7_type=0
-Hotkey_7_event=9
-NumHotkeys=7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/ini.env
deleted file mode 100644
index dddda2f5c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 14
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/kglobalshortcutsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/kglobalshortcutsrc
deleted file mode 100644
index f19e5ad4d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/kglobalshortcutsrc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config pkg(kde-base/kdelibs)>=4.10
-
-[khotkeys]
-_k_friendly_name=khotkeys
-{d03619b6-9b3c-48cc-9d9c-a2aadb485550}=none,none,Пои�к
-{5af6f317-bd75-4e8d-939c-e42133a709da}=Search,none,Search
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/plugin-registry b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/plugin-registry
deleted file mode 100644
index ff4aa2c15..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/plugin-registry
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=raw path=~/.config/audacious pkg(media-sound/audacious)>=3.2
-format 8
-#?os_arch_machine!=x86_64#
-general /usr/lib/audacious/General/statusicon.so
-#os_arch_machine#
-#?os_arch_machine==x86_64#
-general /usr/lib64/audacious/General/statusicon.so
-#os_arch_machine#
-stamp 1337861282
-name Status Icon
-priority 0
-about 1
-config 1
-enabled 1
-#?os_arch_machine!=x86_64#
-general /usr/lib/audacious/General/hotkey.so
-#os_arch_machine#
-#?os_arch_machine==x86_64#
-general /usr/lib64/audacious/General/hotkey.so
-#os_arch_machine#
-stamp 1371068438
-name Global Hotkeys
-priority 0
-about 1
-config 1
-enabled 1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index f61d2e2d0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-14/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml pkg(xfce-base/xfdesktop)>=4.10
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="XF86Search" type="string" value="xdg-open /usr/share/applications/catfish.desktop"/>
-      <property name="XF86Tools" type="string" value="xdg-open /usr/share/applications/calculate-audioplayer.desktop"/>
-      <property name="XF86Calculator" type="string" value="xdg-open /usr/share/applications/calculate-calculator.desktop"/>
-      <property name="XF86HomePage" type="string" value="wmctrl -s 0"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="XF86Search" type="string" value="xdg-open /usr/share/applications/catfish.desktop"/>
-      <property name="XF86Tools" type="string" value="xdg-open /usr/share/applications/calculate-audioplayer.desktop"/>
-      <property name="XF86Calculator" type="string" value="xdg-open /usr/share/applications/calculate-calculator.desktop"/>
-      <property name="XF86HomePage" type="string" value="wmctrl -s 0"/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-15/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-15/.calculate_directory
deleted file mode 100644
index d43548ca0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-15/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<15
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-15/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-15/ini.env
deleted file mode 100644
index 1d70416f3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-15/ini.env
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[main]
-lock = on
-
-[ver]
-patch = 15
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/.calculate_directory
deleted file mode 100644
index f58943fbc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(net-im/pidgin)!=&&ini(update.patch)!=off&&ini(ver.patch)<16
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/ini.env
deleted file mode 100644
index 44668b3d9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 16
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/prefs.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/prefs.xml
deleted file mode 100644
index ff7a400aa..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-16/prefs.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch path=~/.purple
-<reg>pref name='idle_reporting' type='string' value='[^']*'</reg>
-<text>pref name='idle_reporting' type='string' value='system'</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/.calculate_directory
deleted file mode 100644
index b1a80f602..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(mail-client/claws-mail-fancy)!=&&ini(update.patch)!=off&&ini(ver.patch)<17
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/clawsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/clawsrc
deleted file mode 100644
index f0b36de30..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/clawsrc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=patch dotall pkg(mail-client/claws-mail-fancy)!= path=~/.claws-mail
-<reg>/usr/lib(64)?/claws-mail/plugins/fancy\.so
-</reg>
-<text></text>
-<reg>(\[fancy\])([^\[]+|$)</reg>
-<text></text>
-<reg>(\[Plugins_GTK2\])([^\[]+|$)</reg>
-<text>[fancy]
-auto_load_images=1
-open_external=1
-
-\1
-/usr/lib/claws-mail/plugins/fancy.so\2</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/ini.env
deleted file mode 100644
index 58768172d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-17/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 17
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/.calculate_directory
deleted file mode 100644
index f5df41885..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(mail-client/claws-mail-fancy)!=&&ini(update.patch)!=off&&ini(ver.patch)<18
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/clawsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/clawsrc
deleted file mode 100644
index 4bff0c581..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/clawsrc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=patch dotall pkg(mail-client/claws-mail-fancy)!= path=~/.claws-mail
-<reg>/usr/lib(64)?/claws-mail/plugins/fancy\.so
-</reg>
-<text></text>
-<reg>(\[fancy\])([^\[]+|$)</reg>
-<text></text>
-<reg>(\[Plugins_GTK2\])([^\[]+|$)</reg>
-<text>[fancy]
-auto_load_images=1
-open_external=1
-block_extern_content=0
-
-\1
-/usr/lib/claws-mail/plugins/fancy.so\2</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/ini.env
deleted file mode 100644
index b8e4a631f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-18/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 18
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/.calculate_directory
deleted file mode 100644
index 4c17fe520..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-sound/pnmixer)!=&&merge(xfce-base/xfce4-panel)!=&&ini(update.patch)!=off&&ini(ver.patch)<19
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/ini.env
deleted file mode 100644
index 92e1c4e4e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 19
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/xfce4-panel.xml
deleted file mode 100644
index b6a47a52f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-19/xfce4-panel.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate multiline format=patch path=~/.config/xfce4/xfconf/xfce-perchannel-xml
-<reg>^.*value type="int" value="11".*$\n</reg>
-<text></text>
-<reg>^.*value="xfce4-mixer-plugin"/$\n</reg>
-<text></text>
-<reg>^.*value="mixer"[\S\s]*?&lt;/property.*$\n</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/.calculate_directory
deleted file mode 100644
index 90007b129..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfce4-panel)!=&&ini(update.patch)!=off&&ini(ver.patch)<20
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/ini.env
deleted file mode 100644
index e7f1f11a3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 20
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/xfce4-notifyd.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/xfce4-notifyd.xml
deleted file mode 100644
index 9f174022a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-20/xfce4-notifyd.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-notifyd" version="1.0">
-  <property name="expire-timeout" type="int" value="2"/>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/.calculate_directory
deleted file mode 100644
index 69a348a36..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfce4-panel)!=&&ini(update.patch)!=off&&ini(ver.patch)<21
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/ini.env
deleted file mode 100644
index 7a383663a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 21
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/xfce4-panel.xml
deleted file mode 100644
index 8aaa3cc5d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-21/xfce4-panel.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate multiline format=patch path=~/.config/xfce4/xfconf/xfce-perchannel-xml
-<reg>^.*value type="int" value="38".*$\n</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-22/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-22/.calculate_directory
deleted file mode 100644
index df727ea4d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-22/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ini(update.patch)!=off&&ini(ver.patch)<22
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-22/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-22/ini.env
deleted file mode 100644
index 7a804c232..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-22/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 22
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/.calculate_directory
deleted file mode 100644
index 2454a9af3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<23
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/ini.env
deleted file mode 100644
index 82338c3c8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 23
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index 602d46f67..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-23/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml pkg(xfce-base/xfdesktop)>=4.10
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="XF86Display" type="string" value=""/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="XF86Display" type="string" value=""/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/.calculate_directory
deleted file mode 100644
index 97713c086..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<24
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/gtk-3.0 b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/gtk-3.0
deleted file mode 100644
index 16dbb6516..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/gtk-3.0
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.config append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/ini.env
deleted file mode 100644
index af2419876..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-24/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 24
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/.calculate_directory
deleted file mode 100644
index 39a3b5fe0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(mail-client/claws-mail)!=&&ini(update.patch)!=off&&ini(ver.patch)<25
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/clawsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/clawsrc
deleted file mode 100644
index 2ba99d612..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/clawsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=patch dotall pkg(mail-client/claws-mail)!= path=~/.claws-mail
-<reg>reply_quote_format=On %d\\n%f wrote:\\n\\n%q\\n%X
-</reg>
-<text>reply_quote_format=%X\\n\\nOn %d\\n%f wrote:\\n\\n%q
-</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/ini.env
deleted file mode 100644
index 9fe10d8ed..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-25/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 25
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/.calculate_directory
deleted file mode 100644
index 8c5946ecf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfce4-panel)!=&&ini(update.patch)!=off&&ini(ver.patch)<26
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/ini.env
deleted file mode 100644
index 1934552ac..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 26
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/xfce4-notifyd.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/xfce4-notifyd.xml
deleted file mode 100644
index e37b4b0f0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-26/xfce4-notifyd.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-notifyd" version="1.0">
-  <property name="theme" type="string" value="lightdm-calculate"/>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/.calculate_directory
deleted file mode 100644
index a6c416289..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfconf)!=&&ini(update.patch)!=off&&ini(ver.patch)<27
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/ini.env
deleted file mode 100644
index 81c553e1f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 27
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/thunar.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/thunar.xml
deleted file mode 100644
index 0d0065902..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-27/thunar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="thunar" version="1.0">
-  <property name="misc-single-click-timeout" type="uint" value="0"/>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/.calculate_directory
deleted file mode 100644
index 3f4dcf66d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfce4-panel)!=&&ini(update.patch)!=off&&ini(ver.patch)<28
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/ini.env
deleted file mode 100644
index 56c7f2280..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 28
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/xfce4-panel.xml
deleted file mode 100644
index d13a74784..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-28/xfce4-panel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="panels" type="uint" value="2">
-    <property name="panel-1" type="empty">
-      <property name="size" type="uint" value="56"/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/.calculate_directory
deleted file mode 100644
index 56e3e623e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-base/kdelibs)!=&&ini(update.patch)!=off&&ini(ver.patch)<30
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/baloofilerc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/baloofilerc
deleted file mode 100644
index 8eeb753bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/baloofilerc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde pkg(kde-base/kdelibs)!= desktop.ur_domain_set==on path=~/.kde4/share/config
-
-[Basic Settings]
-Indexing-Enabled=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/ini.env
deleted file mode 100644
index 73c3cfc45..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-30/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 30
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/.calculate_directory
deleted file mode 100644
index 501951d0d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<31
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/fix-catfish.patch b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/fix-catfish.patch
deleted file mode 100644
index 96c50cceb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/fix-catfish.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate path=~/.config/Thunar name=uca.xml format=patch pkg(xfce-base/thunar)!=
-<reg>catfish.*?&lt;/command</reg>
-<text>catfish %f&lt;/command</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/ini.env
deleted file mode 100644
index d13b8ea12..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 31
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/remove_fixfile b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/remove_fixfile
deleted file mode 100644
index 1abd75c51..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-31/remove_fixfile
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=~ name=fix-catfish.patch exists(~/fix-catfish.patch)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/.calculate_directory
deleted file mode 100644
index ccbebfc8d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<32
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/ini.env
deleted file mode 100644
index 032fe976b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 32
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/kde-apps/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/kde-apps/.calculate_directory
deleted file mode 100644
index 806af2f57..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-32/kde-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=~ 
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/.calculate_directory
deleted file mode 100644
index 81a88d91e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sys-apps/calculate-utils)>=3.4.1&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<33
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/Preferences b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/Preferences
deleted file mode 100644
index da07ebca8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/Preferences
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=json path=~/.config/chromium/Default exists(~/.config/chromium/Default/Preferences)!=
-{
-     "local_discovery": {
-        "notifications_enabled": false
-     } 
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/ini.env
deleted file mode 100644
index cf07c4fe3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-33/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 33
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/.calculate_directory
deleted file mode 100644
index e542c4557..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sys-apps/calculate-utils)>=3.4.1&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<34
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/icons.index.theme b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/icons.index.theme
deleted file mode 100644
index 1fb898f48..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/icons.index.theme
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=~/.icons/default format=kde name=index.theme
-
-[icon theme]
-Inherits=Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/index.theme b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/index.theme
deleted file mode 100644
index 2418890fe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/index.theme
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=~/.themes/Calculate  pkg(mate-base/mate-session-manager)>=1.8
-
-[X-GNOME-Metatheme]
-CursorTheme=Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/ini.env
deleted file mode 100644
index e70c1d551..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 34
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/kcminputrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/kcminputrc
deleted file mode 100644
index 5e5db3a1a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/kcminputrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config pkg(kde-base/kdelibs)>=4.10&&pkg(kde-plasma/kwin)<5
-
-[Mouse]
-cursorTheme=Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/mate b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/mate
deleted file mode 100644
index 382f1fda3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/mate
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=dconf dconf=/org/mate pkg(mate-base/mate-session-manager)>=1.8
-[desktop/peripherals/keyboard]
-cursor-theme='Calculate'
-
-[desktop/peripherals/mouse]
-cursor-theme='Calculate'
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/xsettings.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/xsettings.xml
deleted file mode 100644
index 2a53df2cf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-34/xsettings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate ini(ver.xfce)!= path=~/.config/xfce4/xfconf/xfce-perchannel-xml format=xml_xfce pkg(xfce-base/xfdesktop)>=4.10
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Gtk" type="empty">
-    <property name="CursorThemeName" type="string" value="Calculate"/>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
deleted file mode 100644
index 4f47dfe29..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sys-apps/calculate-utils)>=3.4.1&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<35
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
deleted file mode 100644
index fcb61f5e2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 35
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
deleted file mode 100644
index 138f869fb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde path=~/.config
-[Desktop Entry]
-DefaultProfile=Shell.profile
-
-[Favorite Profiles]
-Favorites=Shell.profile
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
deleted file mode 100644
index 6745c7ab9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(sys-apps/calculate-utils)>=3.4.1&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<36
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
deleted file mode 100644
index 140e59bad..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 36
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
deleted file mode 100644
index 8244ff25b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-[Wallet]
-Enabled=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
deleted file mode 100644
index 715880ac5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(kde-plasma/kscreenlocker)>=5.8&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<37
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
deleted file mode 100644
index d4f74abf7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-patch = 37
-
-[update]
-patch = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
deleted file mode 100644
index 5e6441dfb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=kde path=~/.config
-[Greeter]
-WallpaperPlugin=org.kde.image
-
-[Greeter][Wallpaper][org.kde.image][General]
-Image=file:///usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
deleted file mode 100644
index 76a5686c3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ur_login!=guest
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
deleted file mode 100644
index 0a4cd42d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ur_domain_set==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
deleted file mode 100644
index 48b69dffc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/var/calculate/remote/share/faces/#-ur_login-#.face mirror name=.face exists(/var/calculate/remote/share/faces/#-ur_login-#.face)!=&&pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
deleted file mode 100644
index afd17c061..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-ur_home_path-#/.face symbolic name=.face.icon pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/ini.env
deleted file mode 100644
index 1d83a8117..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/ini.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=samba path=~/.calculate ini(ver.faceicon)<1&&cl_desktop_hash_face!=
-[ver]
-faceicon = 1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
deleted file mode 100644
index 306a0f030..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ur_domain_set==off
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
deleted file mode 100644
index cf4b93865..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip exists(~/.ecryptfs,root)!=&&exists(~/.face,root)!=&&exists(~/.ecryptfs/.face)==&&pkg(x11-misc/lightdm)!=&&cl_desktop_hash_face!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
deleted file mode 100644
index 1915b477f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=~/.face path=~/.ecryptfs name=.face mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
deleted file mode 100644
index 772063a05..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=~ name=.face
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
deleted file mode 100644
index c93afcd8b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip pkg(x11-misc/lightdm)!=&&cl_desktop_hash_face!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
deleted file mode 100644
index 3b2e75850..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(~/.ecryptfs)!=&&exists(~/.face)== link=.ecryptfs/.face name=.face symbolic
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
deleted file mode 100644
index 813d811b9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_desktop_hash_face-# mirror path=~/.ecryptfs name=.face exists(~/.ecryptfs)!=&&exists(~/.ecryptfs/.face)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
deleted file mode 100644
index 35ce8d290..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_desktop_hash_face-# mirror name=.face exists(~/.ecryptfs)==&&exists(~/.face)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/kdm_create_face.icon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/kdm_create_face.icon
deleted file mode 100644
index 97e9af722..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/kdm_create_face.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_desktop_hash_face-# mirror name=.face.icon exists(~/.face.icon)==&&pkg(kde-base/kdm)!=&&cl_desktop_hash_face!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
deleted file mode 100644
index b3131ec91..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_desktop_hash_face-# mirror name=.face exists(~/.face.icon)==&&pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=&&cl_desktop_hash_face!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
deleted file mode 100644
index afd17c061..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-ur_home_path-#/.face symbolic name=.face.icon pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
deleted file mode 100644
index c0964cc25..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.leafpad)!=off&&ini(ver.leafpad)==&&pkg()>=0.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
deleted file mode 100644
index 3e0f42143..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-leafpad = 0.8
-
-[update]
-leafpad = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
deleted file mode 100644
index 6a7080d56..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate path=~/.config/leafpad
-0.8.17
-600
-400
-Droid Sans Mono Slashed 10
-1
-0
-0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
deleted file mode 100644
index 40fc23a0c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(app-emulation/virtualbox-bin)!=&&ini(update.virtualbox)!=off&&ini(ver.virtualbox)==&&pkg(app-emulation/virtualbox-bin)>=4.3&&exists(~/.config/VirtualBox)==||merge(app-emulation/virtualbox)!=&&ini(update.virtualbox)!=off&&ini(ver.virtualbox)==&&pkg(app-emulation/virtualbox)>=4.3&&exists(~/.config/VirtualBox)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
deleted file mode 100644
index f92530a67..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate path=~/.config/VirtualBox
-<?xml version="1.0"?>
-<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.12-linux">
-  <Global>
-    <ExtraData>
-      <ExtraDataItem name="GUI/UpdateDate" value="never"/>
-    </ExtraData>
-  </Global>
-</VirtualBox>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
deleted file mode 100644
index b9b1652c0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-virtualbox = 4.3
-
-[update]
-virtualbox = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
deleted file mode 100644
index fa7b98a24..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.mc)!=off&&ini(ver.mc)==&&pkg()>=4.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
deleted file mode 100644
index ac2198fea..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde path=~/.config/mc
-
-[Midnight-Commander]
-skin=/home/#-ur_login-#/.config/mc/skins/modarcon16-defbg.ini
-
-[Layout]
-menubar_visible=0
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
deleted file mode 100644
index de802a967..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-mc = 4.8
-
-[update]
-mc = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
deleted file mode 100644
index fc292cec3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
+++ /dev/null
@@ -1,183 +0,0 @@
-# Calculate format=raw path=~/.config/mc/skins
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-  description=MoDarCon16-DefaultBG (user)
-  256colors=false
-
-[Lines]
-  horiz=─
-  vert=│
-  lefttop=┌
-  righttop=�
-  leftbottom=â””
-  rightbottom=┘
-  topmiddle=─
-  bottommiddle=─
-  leftmiddle=├
-  rightmiddle=┤
-  cross=┼
-  dhoriz=─
-  dvert=│
-  dlefttop=┌
-  drighttop=�
-  dleftbottom=â””
-  drightbottom=┘
-  dtopmiddle=─
-  dbottommiddle=─
-  dleftmiddle=├
-  drightmiddle=┤
-
-[core]
-  _default_=color7;default
-  selected=color15;color2
-  marked=color11;;bold
-  markselect=color8;color2;bold
-  gauge=color15;color2
-  input=color15;color0
-  inputmark=color8;color2;bold
-  inputunchanged=;color0
-  commandlinemark=color8;color2;bold
-  reverse=color0;color10
-  header=color3
-  disabled=color8;color7
-  #inputhistory=
-  #commandhistory=
-
-[dialog]
-  _default_=color0;color7
-  dhotnormal=color3
-  dfocus=color8;color2;bold
-  dhotfocus=color3;color2
-  dtitle=color8;;bold
-
-[error]
-  _default_=color15;color1
-  errdfocus=color8;color2;bold
-  errdhotnormal=color13
-  errdhotfocus=color13;color2
-  errdtitle=color8;;bold
-
-[filehighlight]
-  directory=color15
-  executable=color10
-  symlink=color12
-  hardlink=
-  stalelink=color9
-  device=color13
-  special=color3
-  core=color1
-  temp=color8
-  archive=color3
-  doc=color14
-  source=color6
-  media=color5
-  graph=color13
-  database=color2
-
-[menu]
-  _default_=color7;default
-  menuhot=color3
-  menusel=color8;color2;bold
-  menuhotsel=color3;color2
-  menuinactive=color8
-
-[popupmenu]
-  _default_=color7;default
-  menusel=color8;color2;bold
-  menutitle=color8;;bold
-
-[buttonbar]
-  button=color7
-  hotkey=color15;color3
-
-[statusbar]
-  _default_=color15;color2
-
-[help]
-  _default_=color0;color7
-  helpitalic=color10;;bold
-  helpbold=color5
-  helplink=color2
-  helpslink=color8;color2;bold
-
-[editor]
-  _default_=color7;default
-  editbold=color15;;bold
-  editmarked=color8;color2;bold
-  editwhitespace=color12;color4
-  editlinestate=color2;color0
-  bookmark=color0;color7
-  bookmarkfound=color0;color7
-  editrightmargin=color0;color7
-
-[viewer]
-  _default_=color7;default
-  viewunderline=;;underline
-
-[diffviewer]
-  changedline=color15;color4
-  changednew=color15;color2
-  changed=color15;color6
-  added=color0;color7
-  removed=color8;color0
-  folder=color8;color0;bold
-  error=color15;color1
-
-[widget-common]
-  sort-sign-up=↓
-  sort-sign-down=↑
-
-[widget-panel]
-  hiddenfiles-sign-show=•
-  hiddenfiles-sign-hide=â—‹
-  history-prev-item-sign=«
-  history-next-item-sign=»
-  history-show-list-sign=^
-
-[widget-scollbar]
-  first-vert-char=↑
-  last-vert-char=↓
-  first-horiz-char=«
-  last-horiz-char=»
-  current-char=â– 
-  background-char=â–’
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
deleted file mode 100644
index c0e7d1074..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=kde path=~/.config/mc
-
-[New Left Panel]
-list_mode=brief
-
-[New Right Panel]
-list_mode=brief
-
-[Dirs]
-other_dir=/
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/.calculate/ini.env
deleted file mode 100644
index fa58a9d06..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-akonadi = 1.6
-
-[update]
-akonadi = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/.calculate_directory
deleted file mode 100644
index 8a17a3450..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.akonadi)!=off&&ini(ver.akonadi)==&&pkg()>=1.6
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.calculate_directory
deleted file mode 100644
index 40c3a7386..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env(client.os_remote_auth)!=&&ur_domain_set==on&&server(mail.type)==imap
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.config/akonadi/agent_config_akonadi_imap_resource_0 b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.config/akonadi/agent_config_akonadi_imap_resource_0
deleted file mode 100644
index e212955ac..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.config/akonadi/agent_config_akonadi_imap_resource_0
+++ /dev/null
@@ -1,3 +0,0 @@
-[Agent]
-Name=IMAP Account 1
-Online=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.config/akonadi/agentsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.config/akonadi/agentsrc
deleted file mode 100644
index cdc2a1a97..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.config/akonadi/agentsrc
+++ /dev/null
@@ -1,11 +0,0 @@
-[Instances]
-akonadi_nepomuk_calendar_feeder\AgentType=akonadi_nepomuk_calendar_feeder
-akonadi_nepomuk_email_feeder\AgentType=akonadi_nepomuk_email_feeder
-akonadi_nepomuk_contact_feeder\AgentType=akonadi_nepomuk_contact_feeder
-akonadi_maildispatcher_agent\AgentType=akonadi_maildispatcher_agent
-akonadi_maildir_resource_0\AgentType=akonadi_maildir_resource
-akonadi_contacts_resource_0\AgentType=akonadi_contacts_resource
-akonadi_ical_resource_0\AgentType=akonadi_ical_resource
-akonadi_akonotes_resource_0\AgentType=akonadi_akonotes_resource
-akonadi_contacts_resource_1\AgentType=akonadi_contacts_resource
-akonadi_imap_resource_0\AgentType=akonadi_imap_resource
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.kde4/share/config/akonadi_imap_resource_0rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.kde4/share/config/akonadi_imap_resource_0rc
deleted file mode 100644
index 09cf2a207..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.kde4/share/config/akonadi_imap_resource_0rc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde
-[idle]
-IdleRidPath=.INBOX,imap://#-ur_login-#@#-server(mail.host)-#/
-
-[network]
-ImapPort=143
-ImapServer=#-server(mail.host)-#
-Safety=STARTTLS
-UserName=#-ur_login-#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.kde4/share/config/specialmailcollectionsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.kde4/share/config/specialmailcollectionsrc
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-office/akonadi-server-1.6/IMAP_on_CDS/.kde4/share/config/specialmailcollectionsrc
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
deleted file mode 100644
index 002fb9e72..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate os_root_type==livecd&&pkg(app-admin/sudo)!=
-alias su="sudo su -"
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
deleted file mode 100644
index 002fb9e72..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate os_root_type==livecd&&pkg(app-admin/sudo)!=
-alias su="sudo su -"
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
deleted file mode 100644
index 01cd32fb2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-bash = 3.0
-
-[update]
-bash = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
deleted file mode 100644
index cf8faf44c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.bash)!=off&&ini(ver.bash)==&&pkg()>=3.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
deleted file mode 100644
index 10e1cd4b8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.fbreader)!=off&&ini(ver.fbreader)==&&pkg()>=0.12
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
deleted file mode 100644
index 4436c6dd7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=.FBReader
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
deleted file mode 100644
index a70ff817a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate pkg(xfce-base/exo)!=||pkg(www-client/qupzilla)!=||pkg(www-client/chromium)!=||pkg(www-client/firefox)!=
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-#?os_locale_language!=ru#
-  <group name="Browser">
-#os_locale_language#
-#?os_locale_language==ru#
-  <group name="браузере">
-#os_locale_language#
-#?pkg(xfce-base/exo)!=#
-    <option name="command" value="exo-open %1 &amp;"/>
-#pkg#
-#?pkg(www-client/qupzilla)!=&&pkg(xfce-base/exo)==&&pkg(www-client/chromium)==&&pkg(www-client/firefox)==#
-    <option name="command" value="qupzilla %1 &amp;"/>
-#pkg#
-#?pkg(www-client/chromium)!=&&pkg(xfce-base/exo)==&&pkg(www-client/qupzilla)==&&pkg(www-client/firefox)==#
-    <option name="command" value="chromium %1 &amp;"/>
-#pkg#
-#?pkg(www-client/firefox)!=&&pkg(xfce-base/exo)==&&pkg(www-client/qupzilla)==&&pkg(www-client/chromium)==#
-    <option name="command" value="firefox %1 &amp;"/>
-#pkg#
-  </group>
-</config>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
deleted file mode 100644
index d49e6641b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-  <group name="Options">
-    <option name="DownloadDirectory" value="#-ini(resource.documents)-#/Books"/>
-  </group>
-</config>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
deleted file mode 100644
index bc704cadc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calculate
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-  <group name="Format">
-    <option name="DefaultLanguageS" value="#-os_locale_language-#"/>
-  </group>
-  <group name="Options">
-    <option name="BookPath" value="~/FBooks:~/Books:#-ini(resource.documents)-#"/>
-    <option name="ScanSubdirs" value="true"/>
-  </group>
-  <group name="TapScrolling">
-    <option name="Enabled" value="false"/>
-  </group>
-#?os_locale_language!=ru#
-  <group name="Web Browser">
-    <option name="Name" value="Browser"/>
-  </group>
-#os_locale_language#
-#?os_locale_language==ru#
-  <group name="Web Browser">
-    <option name="Name" value="браузере"/>
-  </group>
-#os_locale_language#
-</config>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
deleted file mode 100644
index 5b2493319..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-  <group name="Version">
-    <option name="FBReaderVersion" value="0.12.10"/>
-  </group>
-</config>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
deleted file mode 100644
index f6090ede7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-  <group name="Colors">
-    <option name="SelectionBackground" value="11852031"/>
-  </group>
-  <group name="Options">
-    <option name="AutoHyphenation" value="false"/>
-  </group>
-  <group name="Style">
-    <option name="Base:fontFamily" value="Droid Serif"/>
-    <option name="Base:fontSize" value="10"/>
-  </group>
-</config>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
deleted file mode 100644
index b863bdb9a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-fbreader = 0.12
-
-[update]
-fbreader = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
deleted file mode 100644
index fe7d1183d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.qpdfview)!=off&&ini(ver.qpdfview)==&&pkg()>=0.4
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
deleted file mode 100644
index a132fce66..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-qpdfview = 0.4
-
-[update]
-qpdfview = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
deleted file mode 100644
index 30e2f263c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde path=~/.config/qpdfview
-[mainWindow]
-state="@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x3\0\0\0\0\0\0\0\xde\0\0\x2{\xfc\x2\0\0\0\x2\xfb\0\0\0\x16\0o\0u\0t\0l\0i\0n\0\x65\0\x44\0o\0\x63\0k\x1\0\0\0=\0\0\x2{\0\0\0m\0\xff\xff\xff\xfb\0\0\0\x1c\0p\0r\0o\0p\0\x65\0r\0t\0i\0\x65\0s\0\x44\0o\0\x63\0k\0\0\0\x2$\0\0\0\xa1\0\0\0m\0\xff\xff\xff\0\0\0\x1\0\0\0\x94\0\0\x2{\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0t\0h\0u\0m\0\x62\0n\0\x61\0i\0l\0s\0\x44\0o\0\x63\0k\x1\0\0\0=\0\0\x2{\0\0\0m\0\xff\xff\xff\0\0\0\x3\0\0\0\0\0\0\0\0\xfc\x1\0\0\0\x1\xfb\0\0\0\x14\0s\0\x65\0\x61\0r\0\x63\0h\0\x44\0o\0\x63\0k\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xa4\0\xff\xff\xff\0\0\x2\x66\0\0\x2{\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x42\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x42\0\x61\0r\x1\0\0\0U\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0v\0i\0\x65\0w\0T\0o\0o\0l\0\x42\0\x61\0r\x1\0\0\0\xd5\xff\xff\xff\xff\0\0\0\0\0\0\0\0)"
-geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1\x41\0\0\0i\0\0\x5,\0\0\x3:\0\0\x1\x45\0\0\0\x7f\0\0\x5(\0\0\x3\x36\0\0\0\0\0\0)"
-openPath=/home/alex/Home/\x414\x43e\x43a\x443\x43c\x435\x43d\x442\x44b
-restoreTabs=true
-
-[documentView]
-continuousMode=true
-scaleMode=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.calculate/ini.env
deleted file mode 100644
index bf4cfbd88..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-stardict = 3.0
-
-[update]
-stardict = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.calculate_directory
deleted file mode 100644
index c6c55c2ac..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.stardict)!=off&&ini(ver.stardict)==&&pkg()>=3.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.gconf/apps/stardict/preferences/dictionary/%gconf.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.gconf/apps/stardict/preferences/dictionary/%gconf.xml
deleted file mode 100644
index e894f00eb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.gconf/apps/stardict/preferences/dictionary/%gconf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=xml_gconf
-<?xml version="1.0"?>
-<gconf>
-	<entry name="custom_font" mtime="1295511148" type="string">
-		<stringvalue>Droid Sans 10</stringvalue>
-	</entry>
-	<entry name="use_custom_font" mtime="1295511141" type="bool" value="true"/>
-	<entry name="only_scan_while_modifier_key" mtime="1295511139" type="bool" value="true"/>
-</gconf>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.local/share/applications/stardict.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.local/share/applications/stardict.desktop
deleted file mode 100644
index 85453965b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.local/share/applications/stardict.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=compiz link=/usr/share/applications/stardict.desktop mirror
-[Desktop Entry]
-Categories=Office
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.stardict/stardict.cfg b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.stardict/stardict.cfg
deleted file mode 100644
index 789a7a9bc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/app-text/stardict-3.0/.stardict/stardict.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-[/apps/stardict/preferences/dictionary]
-#�канировать, только е�ли модификатор нажат
-only_scan_while_modifier_key=true
-
-use_custom_font=true
-custom_font=Droid Sans 10
-
-[/apps/stardict/preferences/network]
-#включить �етевые �ловари
-enable_netdict=false
-
-[/apps/stardict/manage_dictionaries]
-#отключим пу�той китай�кий �ловарь
-dict_config_xml=<dictgroup name="Default Group"><querydict><netdict enable="false" id="/usr/lib64/stardict/plugins/stardict_dictdotcn.so"/></querydict><scandict><netdict enable="false" id="/usr/lib64/stardict/plugins/stardict_dictdotcn.so"/></scandict></dictgroup>
-
-[/apps/stardict/preferences/main_window]
-#пр�тать главное окно при �тарте
-hide_on_startup=false
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
deleted file mode 100644
index bbf374e48..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-qtgui = 4.8.6
-
-[update]
-qtgui = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
deleted file mode 100644
index b12325610..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.qtgui)!=off&&ini(ver.qtgui)<4.8.6&&pkg()>=4.8.4
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
deleted file mode 100644
index e911aa8b9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=raw path=~/.config
-[qt]
-font="Droid Sans,10,-1,5,50,0,0,0,0,0"
-#?pkg(gnome-base/gnome-core-libs)!=||pkg(xfce-base/xfdesktop)!=||pkg(mate-base/mate-settings-daemon)!=#
-style=GTK+
-#pkg#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
deleted file mode 100644
index 8a1a0cdef..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-geany = 1.22
-
-[update]
-geany = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
deleted file mode 100644
index 767adffc3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.geany)!=off&&ini(ver.geany)==&&pkg()>=1.22
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
deleted file mode 100644
index 57cdb871e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate format=kde
-
-[geany]
-pref_main_load_session=false
-editor_font=Droid Sans Mono Slashed 10
-tagbar_font=Droid Sans 9
-msgwin_font=Droid Sans 9
-pref_editor_default_open_encoding=WINDOWS-1251
-pref_editor_trail_space=true
-pref_template_developer=name=#-ur_fullname-#
-pref_template_company=#-server(mail.organization)-#
-pref_template_mail=#-ur_mail-#
-pref_template_initial=
-
-[tools]
-term_cmd=terminal
-browser_cmd=chromium
-
-[VTE]
-font=Droid Sans Mono Slashed 10
-ignore_menu_bar_accel=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
deleted file mode 100644
index 2ccbdee7f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-git = 1.7.0
-
-[update]
-git = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
deleted file mode 100644
index e697ff501..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.git)!=off&&ini(ver.git)==&&pkg()>=1.7.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
deleted file mode 100644
index 7486b3664..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=samba
-#?ur_mail!=&&ur_fullname!=#
-[user]
-	name = #-ur_fullname-#
-	email = #-ur_mail-#
-#ur_mail#
-[color]
-	diff = auto
-	branch = auto
-	interactive = auto
-	status = auto
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
deleted file mode 100644
index 5889e3cd1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.gnome-keyring)!=off&&ini(ver.gnome-keyring)==&&pkg()>=3.18
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
deleted file mode 100644
index d0120f626..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-gnome-keyring = 3.18
-
-[update]
-gnome-keyring = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
deleted file mode 100644
index 03067b0e0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.local/share
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
deleted file mode 100644
index a9420b4b5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-[keyring]
-display-name=Default keyring
-mtime=0
-lock-on-idle=false
-lock-after=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
deleted file mode 100644
index 5b1003763..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
+++ /dev/null
@@ -1 +0,0 @@
-Default_keyring
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
deleted file mode 100644
index a1449523c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(gnome-extra/cinnamon-session)!=&&ini(update.cinnamon)!=off&&ini(ver.cinnamon)==&&exists(~/.config/cinnamon-session)==&&pkg(gnome-extra/cinnamon-session)>=3.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
deleted file mode 100644
index 879d99897..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
deleted file mode 100644
index 9a453681c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
-[Desktop Entry]
-Version=1.0
-Name=FTP
-Comment=Open FTP network folder
-Comment[ru_RU]=Открыть �етевой ди�к FTP
-#?pkg(x11-themes/elementary-icon-theme)!=#
-Icon=folder-download
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)==#
-Icon=update-manager
-#pkg#
-URL=file:////home/#-ur_login-#/FTP
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
deleted file mode 100644
index 29c5bc16e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on append=replace
-[Desktop Entry]
-Version=1.0
-Name=Home
-Comment=Open home network folder
-Comment[ru_RU]=Открыть �етевой ди�к � личными файлами
-Icon=user-home
-URL=file:////home/#-ur_login-#/Home
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
deleted file mode 100644
index 3e286ae40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate chmod=755 os_root_type==livecd
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name[bg]=Ръковод�тво за ин�талиране
-Name[ru]=Руковод�тво по у�тановке
-Name=Installation Guide
-Comment=
-Categories=Application;
-#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
-#os_locale_language#
-#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
-#os_locale_language#
-Icon=help-contents
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
deleted file mode 100644
index 18f2a6e92..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Version=1.0
-Name=Share
-Comment=Open share network folder
-Comment[ru_RU]=Открыть �етевой ди�к � �етевыми ре�ур�ами
-Icon=folder-remote
-URL=file:////home/#-ur_login-#/Share
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
deleted file mode 100644
index c58ec7438..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/calculate-chat.desktop mirror os_root_type==livecd
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
deleted file mode 100644
index b65a60076..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/cl-console-gui-install.desktop os_root_type==livecd mirror
-[Desktop Entry]
-NoDisplay=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
deleted file mode 100644
index fadd87f4d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/gparted.desktop mirror os_root_type==livecd
-[Desktop Entry]
-Exec=sudo /usr/sbin/gparted %f
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
deleted file mode 100644
index 43175451d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
+++ /dev/null
@@ -1,82 +0,0 @@
-# Calculate format=dconf dconf=/org
-[cinnamon]
-alttab-switcher-style='icons+preview'
-
-[cinnamon/desktop/background]
-picture-uri='file:///usr/share/backgrounds/calculate/Calculate Linux'
-
-[cinnamon/desktop/background/slideshow]
-image-source='directory:///usr/share/backgrounds/calculate'
-
-[cinnamon/desktop/interface]
-cursor-theme='Calculate'
-font-name='Droid Sans 10'
-icon-theme='Calculate'
-
-[cinnamon/desktop/keybindings/wm]
-switch-to-workspace-1=['<Primary>F1']
-switch-to-workspace-2=['<Primary>F2']
-switch-to-workspace-3=['<Primary>F3']
-switch-to-workspace-4=['<Primary>F4']
-switch-to-workspace-5=['<Primary>F5']
-switch-to-workspace-6=['<Primary>F6']
-switch-to-workspace-7=['<Primary>F7']
-switch-to-workspace-8=['<Primary>F8']
-switch-to-workspace-9=['<Primary>F9']
-switch-to-workspace-10=['<Primary>F10']
-switch-to-workspace-11=['<Primary>F11']
-switch-to-workspace-12=['<Primary>F12']
-
-[cinnamon/desktop/media-handling]
-automount=false
-
-[cinnamon/desktop/screensaver]
-lock-delay=uint32 15
-default-message='Calculate Linux Desktop'
-font-message='Droid Sans 14'
-font-time='Droid Sans 64'
-font-date='Droid Sans 24'
-#?os_root_type==livecd#
-lock-enabled=false
-#os_root_type#
-
-[cinnamon/desktop/wm/preferences]
-titlebar-font='Droid Sans Bold 10'
-
-[cinnamon/muffin]
-edge-tiling=false
-placement-mode='automatic'
-
-[cinnamon/settings-daemon/plugins/power]
-button-power='interactive'
-lid-close-ac-action='nothing'
-sleep-display-ac=900
-sleep-display-battery=900
-#?os_root_type==livecd#
-lock-on-suspend=true
-#os_root_type#
-
-[cinnamon/settings-daemon/plugins/xsettings]
-buttons-have-icons=true
-menus-have-icons=true
-
-[cinnamon/theme]
-name='Calculate'
-
-[nemo/desktop]
-font='Droid Sans 10'
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-home-icon-visible=true
-#env#
-
-[nemo/preferences]
-click-policy='single'
-
-[gnome/desktop/interface]
-document-font-name='Droid Sans 10'
-monospace-font-name='Droid Sans Mono Slashed 10'
-
-[gnome/libgnomekbd/desktop]
-default-group=0
-group-per-window=true
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
deleted file mode 100644
index f47aa69ad..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=dconf dconf=/org/gnome/terminal
-[legacy]
-menu-accelerator-enabled=false
-
-[legacy/keybindings]
-help='disabled'
-
-[legacy/profiles:/:b1dcc9dd-5262-4d8d-a863-c897e6d979b9]
-visible-name='Calculate'
-use-system-font=false
-font='Droid Sans Mono Slashed 10'
-background-color='#2C2C2C2C2C2C'
-palette='#2C2C2C2C2C2C:#707050505050:#6060B4B48A8A:#DFDFAFAF8F8F:#9A9AB8B8D7D7:#DCDC8C8CC3C3:#8C8CD0D0D3D3:#DCDCDCDCCCCC:#707090908080:#DCDCA3A3A3A3:#7272D5D5A3A3:#F0F0DFDFAFAF:#9494BFBFF3F3:#ECEC9393D3D3:#9393E0E0E3E3:#FFFFFFFFFFFF'
-foreground-color='#DCDCDCDCCCCC'
-use-theme-colors=false
-scrollback-lines=5000
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
deleted file mode 100644
index 897479680..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate path=~/.themes/Calculate
-[Desktop Entry]
-Name=Calculate2
-Type=X-GNOME-Metatheme
-Comment=
-
-[X-GNOME-Metatheme]
-GtkTheme=Calculate2
-MetacityTheme=Dopple-Left
-IconTheme=Calculate2
-GtkColorScheme=base_color:#ffffff,fg_color:#000000,tooltip_fg_color:#000000,selected_bg_color:#86ABD9,selected_fg_color:#ffffff,text_color:#1A1A1A,bg_color:#EDECEB,tooltip_bg_color:#F5F5B5
-CursorTheme=Calculate2
-CursorSize=32
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
deleted file mode 100644
index a244f62e7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-cinnamon = 1.8
-
-[update]
-cinnamon = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
deleted file mode 100644
index 754fd4500..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.cinnamon/configs
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/13.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/13.json
deleted file mode 100644
index f0d8a9fce..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/13.json
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=json
-{
-    "use-flags": {
-        "type": "checkbox",
-        "default": true,
-        "description": "Use flags to display keyboard layouts",
-        "value": false
-    }
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
deleted file mode 100644
index 754fd4500..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.cinnamon/configs
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
deleted file mode 100644
index c47c783b9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
+++ /dev/null
@@ -1,22 +0,0 @@
-# Calculate format=json
-{
-    "overlay-key": {
-        "type": "keybinding",
-        "value": "<Alt>F1::Super_R"
-    },
-    "menu-icon-custom": {
-        "type": "checkbox",
-        "value": true
-    },
-    "menu-icon": {
-        "type": "iconfilechooser",
-        "dependency": "menu-icon-custom",
-        "indent": "true",
-        "value": "/usr/share/pixmaps/calculate/start-here-brown.svg"
-    },
-    "menu-label": {
-        "type": "entry",
-        "value": ""
-    }
-}
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
deleted file mode 100644
index 36abbbfe9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.cinnamon
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
deleted file mode 100644
index 901846931..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde
-[Desktop Entry]
-Name=Home
-Comment=Home
-Exec=nemo %U
-Icon=folder_home
-Terminal=false
-Type=Application
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
deleted file mode 100644
index 6e5fc02eb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde
-[Desktop Entry]
-Name=Lock Session
-Comment=Lock Session
-Exec=cinnamon-screensaver-command --lock
-Icon=gnome-lockscreen
-Terminal=false
-Type=Application
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
deleted file mode 100644
index b0a078064..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-Name=Power off
-Comment=Power off
-Exec=cinnamon-session-quit --power-off
-Icon=gnome-shutdown
-Terminal=false
-Type=Application
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
deleted file mode 100644
index 754fd4500..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.cinnamon/configs
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
deleted file mode 100644
index c29edfbd0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=json
-{
-    "launcherList": {
-        "type": "generic",
-        "value": [
-            "homedir.desktop"
-        ]
-    },
-    "allow-dragging": {
-        "type": "checkbox",
-        "default": true,
-        "description": "Allow dragging of launchers",
-        "value": true
-    }
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
deleted file mode 100644
index 4a9fbed2a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=json
-{
-    "launcherList": {
-        "type": "generic",
-        "value": [
-            "lockscreen.desktop",
-            "poweroff.desktop"
-        ]
-    },
-    "allow-dragging": {
-        "type": "checkbox",
-        "default": true,
-        "description": "Allow dragging of launchers",
-        "value": true
-    }
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/14.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/14.json
deleted file mode 100644
index e38ef0a26..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/14.json
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate format=json
-{
-    "launcherList": {
-        "type": "generic",
-        "value": [
-            "calculate-browser.desktop",
-            "calculate-mail.desktop",
-            "calculate-chat.desktop",
-            "calculate-im.desktop",
-            "calculate-writer.desktop",
-            "calculate-calc.desktop",
-            "calculate-calculator.desktop",
-            "calculate-imageedit.desktop",
-            "calculate-imageview.desktop",
-            "calculate-audioplayer.desktop",
-            "calculate-videoplayer.desktop",
-#?hr_cdrom_set==on#
-            "calculate-imageburn.desktop",
-#hr_cdrom_set#
-            "calculate-textedit.desktop",
-            "calculate-terminal.desktop"
-        ]
-    },
-    "allow-dragging": {
-        "type": "checkbox",
-        "default": true,
-        "description": "Allow dragging of launchers",
-        "value": true
-    }
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
deleted file mode 100644
index f96d037c0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=dconf dconf=/org
-
-[cinnamon]
-enabled-applets=['panel1:left:0:menu@cinnamon.org:0', 'panel1:left:1:panel-launchers@cinnamon.org:1', 'panel1:left:2:workspace-switcher@cinnamon.org:2', 'panel1:left:3:show-desktop@cinnamon.org:3', 'panel1:left:4:window-list@cinnamon.org:4', 'panel1:right:0:trash@cinnamon.org:5', 'panel1:right:1:sound@cinnamon.org:6', 'panel1:right:2:network@cinnamon.org:7', 'panel1:right:3:removable-drives@cinnamon.org:8', 'panel1:right:4:power@cinnamon.org:9', 'panel1:right:5:systray@cinnamon.org:10', 'panel1:right:6:calendar@cinnamon.org:11', 'panel1:right:7:panel-launchers@cinnamon.org:12', 'panel1:right:0:keyboard@cinnamon.org:13', 'panel2:center:0:panel-launchers@cinnamon.org:14']
-next-applet-id=15
-panel-launchers=['DEPRECATED']
-panels-autohide=['1:false', '2:true']
-panels-enabled=['1:0:top','2:0:bottom']
-panels-height=['1:32', '2:56']
-panels-resizable=['1:true', '2:true']
-panels-hide-delay=['1:0', '2:200']
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
deleted file mode 100644
index 3b6153781..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=~/.cinnamon/backgrounds
-/usr/share/backgrounds/calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
deleted file mode 100644
index 04f0ce03f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-plasma/plasma-desktop)!=&&ini(update.kde)!=off&&ini(ver.kde)<5&&pkg(kde-plasma/plasma-desktop)>=5.4
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/KDE/Sonnet.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/KDE/Sonnet.conf
deleted file mode 100644
index f8dca2133..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/KDE/Sonnet.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde
-[General]
-checkerEnabledByDefault=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
deleted file mode 100644
index a640fe105..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-[Qt%20Plugin%20Cache%204.8.false]
-usr\lib64\kde4\plugins\gui_platform\libkde.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-08T18:18:03
-usr\lib64\qt4\plugins\inputmethods\libqimsw-multi.so=40806, 0, x86_64 linux g++-4 full-config, 2015-06-17T02:33:46
-usr\lib64\qt4\plugins\imageformats\libqgif.so=40806, 0, x86_64 linux g++-4 full-config, 2015-06-17T02:33:46
-usr\lib64\qt4\plugins\imageformats\libqico.so=40806, 0, x86_64 linux g++-4 full-config, 2015-06-17T02:33:46
-usr\lib64\qt4\plugins\imageformats\libqjpeg.so=40806, 0, x86_64 linux g++-4 full-config, 2015-06-17T02:33:46
-usr\lib64\qt4\plugins\imageformats\libqmng.so=40806, 0, x86_64 linux g++-4 full-config, 2015-06-17T02:33:46
-usr\lib64\qt4\plugins\imageformats\libqsvg.so=40806, 0, x86_64 linux g++-4 full-config, 2015-07-24T01:43:02
-usr\lib64\qt4\plugins\imageformats\libqtga.so=40806, 0, x86_64 linux g++-4 full-config, 2015-06-17T02:33:46
-usr\lib64\qt4\plugins\imageformats\libqtiff.so=40806, 0, x86_64 linux g++-4 full-config, 2015-06-17T02:33:46
-usr\lib64\kde4\plugins\imageformats\kimg_dds.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_eps.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_exr.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_jp2.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_pcx.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_pic.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_psd.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_ras.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_rgb.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_tga.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_xcf.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\kde4\plugins\imageformats\kimg_xview.so=40806, 0, x86_64 linux g++-4 full-config, 2015-09-24T11:28:12
-usr\lib64\qt4\plugins\iconengines\libqsvgicon.so=40806, 0, x86_64 linux g++-4 full-config, 2015-07-24T01:43:02
-
-[Qt%20Factory%20Cache%204.8]
-com.nokia.qt.QGuiPlatformPluginInterface%3A\usr\lib64\kde4\plugins\gui_platform\libkde.so=2015-09-08T18:18:03, kde
-com.trolltech.Qt.QInputContextFactoryInterface%3A\usr\lib64\qt4\plugins\inputmethods\libqimsw-multi.so=2015-06-17T02:33:46, imsw-multi
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\qt4\plugins\imageformats\libqgif.so=2015-06-17T02:33:46, gif
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\qt4\plugins\imageformats\libqico.so=2015-06-17T02:33:46, ico
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\qt4\plugins\imageformats\libqjpeg.so=2015-06-17T02:33:46, jpeg, jpg
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\qt4\plugins\imageformats\libqmng.so=2015-06-17T02:33:46, mng
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\qt4\plugins\imageformats\libqsvg.so=2015-07-24T01:43:02, svg, svgz
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\qt4\plugins\imageformats\libqtga.so=2015-06-17T02:33:46, tga
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\qt4\plugins\imageformats\libqtiff.so=2015-06-17T02:33:46, tiff, tif
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_dds.so=2015-09-24T11:28:12, dds
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_eps.so=2015-09-24T11:28:12, eps, EPS, epsi, EPSI, epsf, EPSF
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_exr.so=2015-09-24T11:28:12, exr, EXR
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_jp2.so=2015-09-24T11:28:12, jp2
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_pcx.so=2015-09-24T11:28:12, pcx, PCX
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_pic.so=2015-09-24T11:28:12, pic
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_psd.so=2015-09-24T11:28:12, psd, PSD
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_ras.so=2015-09-24T11:28:12, ras, RAS
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_rgb.so=2015-09-24T11:28:12, rgb, RGB, rgba, RGBA, bw, BW, sgi, SGI
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_tga.so=2015-09-24T11:28:12, tga, TGA
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_xcf.so=2015-09-24T11:28:12, xcf, XCF
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib64\kde4\plugins\imageformats\kimg_xview.so=2015-09-24T11:28:12, xv
-com.trolltech.Qt.QIconEngineFactoryInterfaceV2%3A\usr\lib64\qt4\plugins\iconengines\libqsvgicon.so=2015-07-24T01:43:02, svg, svgz, svg.gz
-
-[Qt]
-font="Droid Sans,10,-1,5,50,0,0,0,0,0"
-Palette\active=#31363b, #eff0f1, #ffffff, #f7f7f8, #888e93, #c4c9cd, #31363b, #ffffff, #31363b, #fcfcfc, #eff0f1, #474a4c, #3daee9, #eff0f1, #2980b9, #7f8c8d, #eff0f1, #000000, #31363b, #eff0f1
-Palette\inactive=#31363b, #eff0f1, #ffffff, #f7f7f8, #888e93, #c4c9cd, #31363b, #ffffff, #31363b, #fcfcfc, #eff0f1, #474a4c, #c2e0f5, #31363b, #2980b9, #7f8c8d, #eff0f1, #000000, #31363b, #eff0f1
-Palette\disabled=#a5a7a9, #e3e5e7, #ffffff, #ecedee, #82878c, #bcc0c5, #acaeb0, #ffffff, #a5a7a9, #f1f1f1, #e3e5e7, #47494c, #e3e5e7, #a5a7a9, #a2c8e0, #c7cbcb, #e3e5e7, #000000, #31363b, #eff0f1
-fontPath=@Invalid()
-embedFonts=true
-style=GTK+
-doubleClickInterval=400
-cursorFlashTime=1000
-wheelScrollLines=3
-resolveSymlinks=false
-globalStrut\width=0
-globalStrut\height=0
-useRtlExtensions=false
-XIMInputStyle=On The Spot
-DefaultInputMethod=xim
-audiosink=Auto
-videomode=Auto
-GUIEffects=none
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/kres-migrator.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/kres-migrator.desktop
deleted file mode 100644
index d2f19d65d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/kres-migrator.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=kde ur_domain_set==on
-[Desktop Entry]
-Comment=Resources migrator
-Exec=/usr/bin/kres-migrator
-GenericName=Resources migrator
-Icon=accessories-text-editor
-Name=Resources migrator
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
deleted file mode 100644
index 5db8dc224..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-[Basic Settings]
-Indexing-Enabled=false
-
-[General]
-exclude folders[$e]=/var/calculate/remote/,$HOME/Home/,$HOME/Share/,$HOME/FTP/
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
deleted file mode 100644
index 777e08f8c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=kde
-[General]
-GlobalViewProps=true
-
-[IconsMode]
-FontWeight=50
-IconSize=48
-PreviewSize=48
-
-[PreviewSettings]
-Plugins=ffmpegthumbs,imagethumbnail,exrthumbnail,jpegthumbnail,windowsimagethumbnail,svgthumbnail,directorythumbnail,fontthumbnail,rawthumbnail
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
deleted file mode 100644
index 99df8445c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate comment=# chmod=0600 pkg(x11-themes/gnome-breeze)!=
-[Settings]
-#?pkg(media-fonts/droid)!=#
-gtk-font-name=Droid Sans 10
-#pkg#
-gtk-theme-name=oxygen-gtk
-gtk-icon-theme-name= oxygen
-gtk-fallback-icon-theme=oxygen
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-menu-images=0
-gtk-button-images=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
deleted file mode 100644
index 1a46101c9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
+++ /dev/null
@@ -1,6 +0,0 @@
-[activities]
-e3636f6e-fe82-4aaa-aa2f-d981b9e02c13=�ачальна� комната
-
-[main]
-currentActivity=e3636f6e-fe82-4aaa-aa2f-d981b9e02c13
-runningActivities=e3636f6e-fe82-4aaa-aa2f-d981b9e02c13
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
deleted file mode 100644
index 56c5d5914..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[Keyboard]
-NumLock=2
-RepeatDelay=330
-RepeatRate=30
-
-[Mouse]
-cursorTheme=Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
deleted file mode 100644
index 56d061326..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=kde
-[General]
-fixed=Droid Sans Mono Slashed,10,-1,0,50,0,0,0,0,0
-font=Droid Sans,10,-1,0,50,0,0,0,0,0
-menuFont=Droid Sans,10,-1,0,50,0,0,0,0,0
-smallestReadableFont=Droid Sans,9,-1,0,50,0,0,0,0,0
-toolBarFont=Droid Sans,10,-1,0,50,0,0,0,0,0
-
-[Icons]
-Theme=Calculate
-
-[WM]
-activeFont=Droid Sans,10,-1,0,50,0,0,0,0,0
-
-[KDE]
-LookAndFeelPackage=org.kde.calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
deleted file mode 100644
index 0968947e7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-[ksmserver]
-Lock Session=ScrollLock,none,none
-
-[plasmashell]
-show-on-mouse-pos=Ctrl+Alt+V,none,none
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
deleted file mode 100644
index 4a009cb35..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=kde
-[Desktop Entry]
-DefaultProfile=Shell.profile
-
-[Favorite Profiles]
-Favorites=Shell.profile
-
-[Notification Messages]
-CloseAllTabs=true
-
-[TabBar]
-ShowQuickButtons=true
-TabBarPosition=Top
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
deleted file mode 100644
index c24353f3b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=kde
-#?os_root_type==livecd#
-[Daemon]
-Autolock=false
-LockOnResume=false
-#os_root_type#
-Timeout=10
-
-#?pkg(kde-plasma/kscreenlocker)<5.8#
-[Greeter]
-Theme=org.kde.calculate
-ThemeBackground=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(kde-plasma/kscreenlocker)>=5.8#
-[Greeter]
-WallpaperPlugin=org.kde.image
-
-[Greeter][Wallpaper][org.kde.image][General]
-Image=file:///usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
deleted file mode 100644
index 3eeed48a9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[General]
-loginMode=default
-shutdownType=2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
deleted file mode 100644
index 2cf350ab4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate format=kde
-[Desktops]
-Number=4
-Rows=1
-
-[Effect-PresentWindows]
-BorderActivateAll=9
-
-[MouseBindings]
-CommandActiveTitlebar2=Lower
-CommandInactiveTitlebar2=Lower
-CommandWindow2=Activate, raise and pass click
-
-[Plugins]
-cubeEnabled=true
-screenedgeEnabled=false
-
-[TabBox]
-LayoutName=thumbnails
-
-[Windows]
-ElectricBorderCooldown=450
-ElectricBorderDelay=400
-ElectricBorderMaximize=false
-ElectricBorders=1
-ElectricBorderTiling=false
-FocusStealingPreventionLevel=0
-
-[org.kde.kdecoration2]
-CloseOnDoubleClickOnMenu=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
deleted file mode 100644
index 0993af9d4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde
-[Layout]
-SwitchMode=WinClass
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
deleted file mode 100644
index fe1d75569..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
+++ /dev/null
@@ -1,512 +0,0 @@
-[ActionPlugins][0]
-MidButton;NoModifier=org.kde.paste
-RightButton;NoModifier=org.kde.contextmenu
-
-[ActionPlugins][1]
-MidButton;NoModifier=org.kde.paste
-RightButton;NoModifier=org.kde.contextmenu
-
-[ActionPlugins][127]
-RightButton;NoModifier=org.kde.contextmenu
-
-[Containments][42]
-activityId=
-formfactor=2
-immutability=1
-lastScreen=0
-location=3
-plugin=org.kde.panel
-wallpaperplugin=org.kde.image
-
-[Containments][42][Applets][44]
-immutability=1
-plugin=org.kde.plasma.kicker
-
-[Containments][42][Applets][44][Configuration][ConfigDialog]
-DialogHeight=480
-DialogWidth=640
-
-[Containments][42][Applets][44][Configuration][General]
-appNameFormat=2
-favoriteApps=preferred://browser,systemsettings.desktop
-#showRecentApps=false
-#showRecentDocs=false
-
-[Containments][42][Applets][45]
-activityId=
-formfactor=0
-immutability=1
-lastScreen=-1
-location=0
-plugin=org.kde.plasma.folder
-wallpaperplugin=
-
-[Containments][42][Applets][45][Configuration]
-activityId=
-formfactor=0
-immutability=1
-lastScreen=-1
-location=0
-plugin=org.kde.plasma.folder
-wallpaperplugin=
-
-[Containments][42][Applets][45][Configuration][General]
-icon=user-home
-iconSize=3
-popups=false
-selectionMarkers=false
-previews=false
-#?ur_domain_set==on#
-url=file:///home/#-ur_login-#/Home
-#ur_domain_set#
-#?ur_domain_set!=on#
-url=file:///home/#-ur_login-#
-#ur_domain_set#
-useCustomIcon=true
-viewMode=1
-
-[Containments][42][Applets][46]
-immutability=1
-plugin=org.kde.plasma.pager
-
-[Containments][42][Applets][46][Configuration][General]
-#currentDesktopSelected=ShowDesktop
-displayedText=Number
-showWindowIcons=true
-
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-[Containments][42][Applets][47]
-activityId=
-formfactor=0
-immutability=1
-lastScreen=-1
-location=0
-plugin=org.kde.plasma.folder
-wallpaperplugin=
-
-[Containments][42][Applets][47][Configuration]
-activityId=
-formfactor=0
-immutability=1
-lastScreen=-1
-location=0
-plugin=org.kde.plasma.folder
-wallpaperplugin=
-
-[Containments][42][Applets][47][Configuration][General]
-icon=folder-public
-iconSize=3
-popups=false
-selectionMarkers=false
-previews=false
-url=file:///home/#-ur_login-#/Share
-useCustomIcon=true
-viewMode=1
-#env#
-
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=#
-[Containments][42][Applets][48]
-activityId=
-formfactor=0
-immutability=1
-lastScreen=-1
-location=0
-plugin=org.kde.plasma.folder
-wallpaperplugin=
-
-[Containments][42][Applets][48][Configuration]
-activityId=
-formfactor=0
-immutability=1
-lastScreen=-1
-location=0
-plugin=org.kde.plasma.folder
-wallpaperplugin=
-
-[Containments][42][Applets][48][Configuration][General]
-icon=folder-remote
-iconSize=3
-popups=false
-selectionMarkers=false
-previews=false
-url=file:///home/#-ur_login-#/FTP
-useCustomIcon=true
-viewMode=1
-#env#
-
-[Containments][42][Applets][54]
-immutability=1
-plugin=org.kde.plasma.showdesktop
-
-[Containments][42][Applets][55]
-immutability=1
-plugin=org.kde.plasma.systemtray
-
-[Containments][42][Applets][55][Configuration][Containments][56]
-formfactor=2
-location=3
-
-[Containments][42][Applets][55][Configuration][Containments][56][Applets][57]
-immutability=1
-plugin=org.kde.plasma.clipboard
-
-[Containments][42][Applets][55][Configuration][Containments][56][Applets][58]
-immutability=1
-plugin=org.kde.plasma.volume
-
-[Containments][42][Applets][55][Configuration][Containments][56][Applets][58][Configuration][ConfigDialog]
-DialogHeight=480
-DialogWidth=640
-
-[Containments][42][Applets][55][Configuration][Containments][56][Applets][59]
-immutability=1
-plugin=org.kde.plasma.devicenotifier
-
-[Containments][42][Applets][55][Configuration][Containments][56][Applets][61]
-immutability=1
-plugin=org.kde.plasma.battery
-
-[Containments][42][Applets][55][Configuration][Containments][56][Applets][62]
-immutability=1
-plugin=org.kde.plasma.bluetooth
-
-[Containments][42][Applets][63]
-immutability=1
-plugin=org.kde.plasma.digitalclock
-
-[Containments][42][Applets][63][Configuration][Appearance]
-#?exists(/usr/lib/qt5/plugins/plasmacalendarplugins/holidaysevents.so)!=#
-enabledCalendarPlugins=/usr/lib/qt5/plugins/plasmacalendarplugins/holidaysevents.so
-#exists#
-fontFamily=Droid Sans
-showWeekNumbers=true
-
-[Containments][42][Applets][63][Configuration][ConfigDialog]
-DialogHeight=480
-DialogWidth=640
-
-[Containments][42][Applets][64]
-immutability=1
-plugin=org.kde.plasma.lock_logout
-
-[Containments][42][Applets][64][Configuration][General]
-show_lockScreen=true
-show_requestShutDown=true
-
-[Containments][42][Applets][67]
-immutability=1
-plugin=org.kde.plasma.taskmanager
-
-[Containments][42][Applets][67][Configuration][ConfigDialog]
-DialogHeight=628
-DialogWidth=807
-
-[Containments][42][Applets][67][Configuration][General]
-groupingStrategy=0
-#highlightWindows=true
-maxStripes=1
-middleClickAction=Close
-showOnlyCurrentDesktop=true
-showToolTips=false
-sortingStrategy=1
-
-[Containments][42][Applets][70]
-immutability=1
-plugin=org.kde.plasma.trash
-
-[Containments][42][ConfigDialog]
-DialogHeight=81
-DialogWidth=#-os_x11_width-#
-
-[Containments][42][General]
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)==#
-AppletOrder=44;45;47;46;54;67;70;55;63;64
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=#
-AppletOrder=44;45;47;48;46;54;67;70;55;63;64
-#env#
-#?env(client.os_remote_auth)==||ur_domain_set!=on#
-AppletOrder=44;45;46;54;67;70;55;63;64
-#env#
-
-[Containments][53]
-activityId=e3636f6e-fe82-4aaa-aa2f-d981b9e02c13
-formfactor=0
-immutability=1
-lastScreen=0
-location=0
-plugin=org.kde.plasma.folder
-wallpaperplugin=org.kde.image
-
-[Containments][53][ConfigDialog]
-DialogHeight=480
-DialogWidth=640
-
-[Containments][53][General]
-ToolBoxButtonState=bottomright
-iconSize=3
-popups=false
-selectionMarkers=false
-showToolbox=false
-positions=3,9,desktop:/calculate-install.desktop,1,0,desktop:/partitionmanager.desktop,1,1,desktop:/calculate-community.desktop,2,1,desktop:/Home.desktop,0,0,desktop:/README.desktop,2,0
-previewPlugins=ffmpegthumbs,imagethumbnail,exrthumbnail,jpegthumbnail,windowsimagethumbnail,svgthumbnail,fontthumbnail,rawthumbnail
-sortMode=-1
-
-[Containments][53][Wallpaper][org.kde.image][General]
-Image=file:///usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-#
-height=#-os_x11_height-#
-width=#-os_x11_width-#
-
-[Containments][69]
-activityId=
-formfactor=2
-immutability=1
-lastScreen=0
-location=4
-plugin=org.kde.panel
-wallpaperplugin=org.kde.image
-
-[Containments][69][Applets][71]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][71][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-browser.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-browser.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-browser.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-browser.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-browser.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-browser.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-browser.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-browser.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-browser.desktop
-
-[Containments][69][Applets][72]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][72][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-mail.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-mail.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-mail.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-mail.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-mail.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-mail.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-mail.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-mail.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-mail.desktop
-
-[Containments][69][Applets][73]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][73][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-chat.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-chat.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-chat.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-chat.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-chat.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-chat.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-chat.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-chat.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-chat.desktop
-
-[Containments][69][Applets][74]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][74][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-im.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-im.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-im.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-im.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-im.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-im.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-im.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-im.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-im.desktop
-
-[Containments][69][Applets][75]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][75][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-writer.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-writer.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-writer.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-writer.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-writer.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-writer.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-writer.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-writer.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-writer.desktop
-
-[Containments][69][Applets][76]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][76][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-calc.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-calc.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-calc.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-calc.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-calc.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-calc.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-calc.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-calc.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-calc.desktop
-
-[Containments][69][Applets][77]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][77][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-calculator.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-calculator.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-calculator.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-calculator.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-calculator.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-calculator.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-calculator.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-calculator.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-calculator.desktop
-
-[Containments][69][Applets][78]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][78][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-imageedit.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-imageedit.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-imageedit.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-imageedit.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-imageedit.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-imageedit.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-imageedit.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-imageedit.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-imageedit.desktop
-
-[Containments][69][Applets][79]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][79][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-imageview.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-imageview.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-imageview.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-imageview.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-imageview.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-imageview.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-imageview.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-imageview.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-imageview.desktop
-
-[Containments][69][Applets][80]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][80][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-audioplayer.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-audioplayer.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-audioplayer.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-audioplayer.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-audioplayer.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-audioplayer.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-audioplayer.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-audioplayer.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-audioplayer.desktop
-
-[Containments][69][Applets][81]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][81][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-videoplayer.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-videoplayer.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-videoplayer.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-videoplayer.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-videoplayer.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-videoplayer.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-videoplayer.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-videoplayer.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-videoplayer.desktop
-
-
-[Containments][69][Applets][82]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][82][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-textedit.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-textedit.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-textedit.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-textedit.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-textedit.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-textedit.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-textedit.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-textedit.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-textedit.desktop
-
-[Containments][69][Applets][83]
-immutability=1
-plugin=org.kde.plasma.icon
-
-[Containments][69][Applets][83][Configuration][General]
-applicationName=#-grep(/usr/share/applications/calculate-terminal.desktop,\nName=(.*))-#
-#?grep(/usr/share/applications/calculate-terminal.desktop,\nGenericName=(.*))!=#
-genericName=#-grep(/usr/share/applications/calculate-terminal.desktop,\nGenericName=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-terminal.desktop,\nGenericName\[ru\]=(.*))!=#
-genericName[ru]=#-grep(/usr/share/applications/calculate-terminal.desktop,\nGenericName\[ru\]=(.*))-#
-#grep#
-#?grep(/usr/share/applications/calculate-terminal.desktop,\nGenericName\[fr\]=(.*))!=#
-genericName[fr]=#-grep(/usr/share/applications/calculate-terminal.desktop,\nGenericName\[fr\]=(.*))-#
-#grep#
-iconName=#-grep(/usr/share/applications/calculate-terminal.desktop,\nIcon=(.*))-#
-url=file:///usr/share/applications/calculate-terminal.desktop
-
-[Containments][69][ConfigDialog]
-DialogHeight=81
-DialogWidth=#-os_x11_width-#
-
-[Containments][69][General]
-AppletOrder=71,72,73,74,75,76,77,78,80,81,82,83
-
-[General]
-immutability=2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
deleted file mode 100644
index ed8a8380d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde
-[Theme]
-name=breeze-dark
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
deleted file mode 100644
index 149a5a7c5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
+++ /dev/null
@@ -1,143 +0,0 @@
-[FileDialogSize]
-Height #-os_x11_height-#=466
-Width #-os_x11_width-#=747
-
-[KFileDialog Settings]
-Recent Files[$e]=start-here-blue.svg,/usr/share/pixmaps/calculate/start-here-blue.svg
-Recent URLs[$e]=/usr/share/pixmaps/calculate/
-
-[PlasmaViews][Panel 69][Horizontal640]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal720]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal800]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1024]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1152]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1200]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1280]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1360]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1366]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1368]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1400]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1440]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1600]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1680]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal1920]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal2048]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
-
-[PlasmaViews][Panel 69][Horizontal2560]
-alignment=132
-length=728
-maxLength=728
-minLength=728
-panelVisibility=1
-thickness=56
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
deleted file mode 100644
index d9a293280..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde
-[Battery][HandleButtonEvents]
-powerButtonAction=16
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0 b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
deleted file mode 100644
index cc6a97882..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate comment=#
-include "/usr/share/themes/Breeze/gtk-2.0/gtkrc"
-include "/etc/gtk-2.0/gtkrc"
-style "user-font" 
-{
-	font_name="Droid Sans Regular"
-}
-widget_class "*" style "user-font"
-gtk-font-name="Droid Sans Regular 10"
-gtk-theme-name="Breeze"
-gtk-icon-theme-name="breeze"
-gtk-fallback-icon-theme="breeze"
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-gtk-menu-images=1
-gtk-button-images=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/emaildefaults b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/emaildefaults
deleted file mode 100644
index 253fc049a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/emaildefaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde
-#на�тройка профил� пользовател�
-[Defaults]
-Profile=Default
-
-[PROFILE_Default]
-EmailAddress=#-ur_mail-#
-FullName=#-ur_fullname-#
-Organization=#-server(mail.organization)-#
-OutgoingServer=#-server(mail.send_host)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/emailidentities b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/emailidentities
deleted file mode 100644
index 86967fd67..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/emailidentities
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=kde
-#на�тройка kmail
-[General]
-Default Identity=1
-
-[Identity #0]
-#?server(mail.type)==imap&&env(client.os_remote_auth)!=&&ur_domain_set==on#
-Drafts=.1.directory/Drafts
-Fcc=.1.directory/Sent
-#server#
-Email Address=#-ur_mail-#
-Identity=Default
-Inline Signature=#-server(mail.signature)-#
-Name=#-ur_fullname-#
-Organization=#-server(mail.organization)-#
-Signature Type=inline
-uoid=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/kwalletrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/kwalletrc
deleted file mode 100644
index dae74ed20..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/kwalletrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde
-[Wallet]
-Close When Idle=false
-Enabled=true
-First Use=false
-Use One Wallet=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/mailtransports b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/mailtransports
deleted file mode 100644
index 73871d3c7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.kde4/share/config/mailtransports
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=kde
-#на�тройка отправки пи�ем kmail
-#?server(mail.host)!=&&env(client.os_remote_auth)!=&&ur_domain_set==on#
-[General]
-default-transport=1
-
-[Transport 1]
-host=#-server(mail.host)-#
-id=1
-name=SMTP
-#server#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
deleted file mode 100644
index dae0e61cb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=~/.local/share/dolphin/view_properties/global name=.directory
-
-[Dolphin]
-PreviewsShown=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
deleted file mode 100644
index 879d99897..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
deleted file mode 100644
index 95f09e1a0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
-[Desktop Entry]
-Encoding=UTF-8
-Name=FTP
-Comment=Browser FTP
-URL[$e]=$HOME/FTP
-Icon=folder-remote
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
deleted file mode 100644
index fa1c5574c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=replace name=Home.desktop format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Encoding=UTF-8
-Name=Home
-Comment=Browser Home
-URL[$e]=$HOME/Home
-Icon=user-home
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
deleted file mode 100644
index 83031c466..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba link=/usr/share/kio_desktop/DesktopLinks/Home.desktop mirror env(client.os_remote_auth)==||ur_domain_set==off
-[Desktop Entry]
-URL[$e]=$HOME
-Icon=user-home
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
deleted file mode 100644
index 0bab7f949..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate os_root_type==livecd chmod=0755
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name[bg]=Ръковод�тво за ин�талиране
-Name[ru]=Руковод�тво по у�тановке
-Name=Installation Guide
-Comment=
-Categories=Application;
-#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
-#os_locale_language#
-#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
-#os_locale_language#
-Icon=text-html
-Terminal=false
-#включить отклик запу�ка
-StartupNotify=true
-X-KDE-StartupNotify=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
deleted file mode 100644
index 86f0be8c5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Encoding=UTF-8
-Name=Share
-Comment=Browser Share
-URL[$e]=$HOME/Share
-Icon=folder-public
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
deleted file mode 100644
index 396091411..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/calculate-chat.desktop mirror os_root_type==livecd chmod=0755
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-!NoDisplay=
-OnlyShowIn=KDE;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
deleted file mode 100644
index 653488d5b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde chmod=0755 link=/usr/share/applications/cl-console-gui-install.desktop os_root_type==livecd mirror
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-NoDisplay=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
deleted file mode 100644
index a226f334d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/org.kde.PartitionManager.desktop os_root_type==livecd mirror chmod=0755
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Exec=sudo /usr/bin/partitionmanager
-#отключим запро� парол�
-X-KDE-SubstituteUID=false
-#отключить отклик запу�ка
-StartupNotify=false
-X-KDE-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
deleted file mode 100644
index 8afb1e88b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
deleted file mode 100644
index c88ef77da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kde = 5
-
-[update]
-kde = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
deleted file mode 100644
index 03067b0e0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.local/share
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
deleted file mode 100644
index 4acaeb85f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde
-[Appearance]
-#тема
-ColorScheme=Calculate
-
-[General]
-# Им� профил�
-Name=Calculate
-#формат заголовка вкладки (заголовок окна у�танавливает�� оболочкой)
-LocalTabTitleFormat=%w
-#удалённый �еан� (заголовок окна у�танавливает�� оболочкой)
-RemoteTabTitleFormat=%w
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
deleted file mode 100644
index bcb6295d2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.kopete)!=off&&ini(ver.kopete)==&&pkg()>=4.6
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
deleted file mode 100644
index f4970fe22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kopete = 4.6
-
-[update]
-kopete = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
deleted file mode 100644
index 21911c893..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-
-[Event/kopete_contact_incoming]
-# response to an incoming message
-Action=Sound|Popup|Taskbar
-
-[Event/kopete_contact_online]
-# reaction to the birth of a user in the online
-Action=
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
deleted file mode 100644
index 0ad4d8d3b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate path=~/.kde4/share/apps/kopete
-<!DOCTYPE kpartgui>
-<kpartgui version="34" name="kopetechatwindow" >
- <ActionProperties>
-  <Action shortcut="Ctrl+Return" name="chat_send" />
-  <Action shortcut="Esc" name="file_quit" />
- </ActionProperties>
-</kpartgui>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
deleted file mode 100644
index c7dfbff60..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate path=~/.kde4/share/apps/kopete
-<!DOCTYPE kpartgui>
-<kpartgui version="16" name="kopeteemailwindow" >
- <ActionProperties>
-  <Action shortcut="Ctrl+Return" name="chat_send" />
-  <Action shortcut="Esc" name="file_quit" />
- </ActionProperties>
-</kpartgui>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
deleted file mode 100644
index c7d0048a6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
+++ /dev/null
@@ -1,86 +0,0 @@
-# Calculate format=kde append=replace path=~/.kde4/share/config
-
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=#
-[Account_JabberProtocol_#-ur_jid-#]
-AccountId=#-ur_jid-#
-AllowPlainTextPassword=true
-CustomServer=true
-Port=#-server(jabber.port)-#
-Protocol=JabberProtocol
-RememberPassword=true
-Server=#-server(jabber.host)-#
-UseSSL=true
-#env#
-
-[Behavior]
-# automatically connect
-#?pkg(kde-apps/kopete)<4.2#
-autoConnect=true
-#pkg#
-#?pkg(kde-apps/kopete)>=4.2#
-initialStatus=Online
-#pkg#
-
-[ContactList]
-contactListIconMode=IconPhoto
-showOfflineUsers=false
-
-[General Options]
-Geometry=230,600
-# fixation toolbar
-#ToolBarsMovable=Disabled
-MenuBar=Disabled
-# the status bar is minimized
-ShownIdentityId=
-
-#[KopeteChatWindowIndividualMode][Toolbar mainToolBar]
-# map icon in the dialog box
-#ToolButtonStyle=IconOnly
-
-# size of the chat window
-[KopeteChatWindowIndividualMode]
-# position of the splitter stories
-ChatViewSplitter=AAAA/wAAAAAAAAACAAAAlQAAAFMAAAAAAwEAAAAC
-Height 768=400
-Height 800=400
-Height 900=400
-Height 1024=400
-Height 1050=400
-Height 1200=400
-Width 1024=500
-Width 1280=500
-Width 1440=500
-Width 1600=500
-Width 1680=500
-Width 1920=500
-
-[MainWindow]
-Height 768=400
-Height 800=400
-Height 900=400
-Height 1024=400
-Height 1050=400
-Height 1200=400
-Width 1024=500
-Width 1280=500
-Width 1440=500
-Width 1600=500
-Width 1680=500
-Width 1920=500
-
-[Notification Messages]
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=#
-# issue a warning when verifying a certificate protected connection
-KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false
-#env#
-# warn that the program is running when you close the main window
-hideOnCloseInfo=false
-
-[QuickSearchBar Settings]
-# hide search bar
-Hidden=true
-
-[ToolBar Settings]
-# display icons in the application
-ToolButtonStyle=IconOnly
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/.calculate_directory
deleted file mode 100644
index 07a4fcd0d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.kwallet)!=off&&ini(ver.kwallet)==&&pkg()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/ini.env
deleted file mode 100644
index 713626c80..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kwallet = 4.6
-
-[update]
-kwallet = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/.calculate_directory
deleted file mode 100644
index ab3ea293d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.kde4/share/apps
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.kwl b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.kwl
deleted file mode 100644
index 2a4783fa5..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.kwl and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.salt b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.salt
deleted file mode 100644
index 53075e9ed..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.salt
+++ /dev/null
@@ -1 +0,0 @@
-ÒF^c~¢o”D”ÖÌ¿†·<ÿÊЖ¸FÛ;FçîÅ"•Iø™ÊËÒƒÒ-B�áÓ1G³…È»ˆâ‘•
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwalletrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwalletrc
deleted file mode 100644
index 3a023bb34..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwalletrc
+++ /dev/null
@@ -1,46 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-
-# Applications that access is allowed
-[Auto Allow]
-#?os_locale_lang==en_US#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,И�точник данных Akonadi,Служба KDE,IMAP Account 1 of type Почтовый �ервер IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==de_DE#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi-Ressource,KDE-Dienst,IMAP Account 1 of type IMAP-E-Mail-Server,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==es_ES#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso de Akonadi,Servicio de KDE,IMAP Account 1 of type Servidor de correo IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==it_IT#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Risorsa Akonadi,Demone KDE,IMAP Account 1 of type Server di posta IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==fr_FR#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ressource Akonadi,Démon de KDE,IMAP Account 1 of type Serveur de courriels IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==pl_PL#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Zasób Akonadi,KDE Daemon,IMAP Account 1 of type Serwer poczty IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==pt_PT#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Servidor do KDE,IMAP Account 1 of type Servidor de E-Mail IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==pt_BR#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Recurso do Akonadi,Serviço do KDE IMAP Account 1 of type Servidor de e-mails IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==bg_BG#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,KDE Daemon,IMAP Account 1 of type IMAP E-Mail Server,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==ro_RO#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Akonadi Resource,Demon KDE,IMAP Account 1 of type Server de poștă IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-#?os_locale_lang==uk_UA#
-kdewallet=Kopete,KMail,Konqueror,Chromium,Chrome,Network Management,Ре�ур� Akonadi,Фонова �лужба KDE,IMAP Account 1 of type Сервер пошти IMAP,IMAP Account 1 of type IMAP E-Mail Server
-#os_locale_lang#
-
-[Wallet]
-Close When Idle=false
-Enabled=true
-First Use=false
-Use One Wallet=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.calculate_directory
deleted file mode 100644
index fbd08a2e7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(kde-base/kdelibs)!=&&ini(update.kde)!=off&&ini(ver.kde)==&&pkg(kde-base/kdelibs)>=4.10&&pkg(kde-plasma/kwin)<5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/autostart/kopete.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/autostart/kopete.desktop
deleted file mode 100644
index f99447ef5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/autostart/kopete.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=&&ur_jid!=
-#добавим Kopete в автозагрузку е�ли на�троен локальный Jabber �ервер
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/autostart/kres-migrator.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/autostart/kres-migrator.desktop
deleted file mode 100644
index b9ef4d19e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/autostart/kres-migrator.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=kde
-[Desktop Entry]
-Comment=Resources migrator
-Exec=/usr/bin/kres-migrator
-GenericName=Resources migrator
-Icon=accessories-text-editor
-Name=Resources migrator
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/gtk-3.0/settings.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/gtk-3.0/settings.ini
deleted file mode 100644
index 92476a6f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate comment=# chmod=0600 pkg(x11-themes/oxygen-gtk)!=
-[Settings]
-#?pkg(media-fonts/droid)!=#
-gtk-font-name=Droid Sans 10
-#pkg#
-#?pkg(media-fonts/droid)==#
-gtk-font-name=Verdana 10
-#pkg#
-gtk-theme-name=oxygen-gtk
-gtk-icon-theme-name= oxygen
-gtk-fallback-icon-theme=oxygen
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-menu-images=0
-gtk-button-images=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/qtcurve.gtk-icons b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/qtcurve.gtk-icons
deleted file mode 100644
index 13348a2b7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.config/qtcurve.gtk-icons
+++ /dev/null
@@ -1,871 +0,0 @@
-# Calculate pkg(x11-themes/gtk-engines-qtcurve)!=
-# опи�ание �оответ�ви� иконок kde иконкам gtk
-style "KDE4-icons"
-{
-	stock["gtk-about"]={
-		{ "16x16/actions/help-about.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/help-about.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/help-about.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/help-about.png", *, *, "gtk-button" },
-		{ "16x16/actions/help-about.png", *, *, "gtk-menu" },
-		{ "32x32/actions/help-about.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/help-about.png" }
-	}
-	stock["gtk-add"]={
-		{ "16x16/actions/list-add.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/list-add.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/list-add.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/list-add.png", *, *, "gtk-button" },
-		{ "16x16/actions/list-add.png", *, *, "gtk-menu" },
-		{ "32x32/actions/list-add.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/list-add.png" }
-	}
-	stock["gtk-apply"]={
-		{ "16x16/actions/dialog-ok-apply.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/dialog-ok-apply.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/dialog-ok-apply.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/dialog-ok-apply.png", *, *, "gtk-button" },
-		{ "16x16/actions/dialog-ok-apply.png", *, *, "gtk-menu" },
-		{ "32x32/actions/dialog-ok-apply.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/dialog-ok-apply.png" }
-	}
-	stock["gtk-bold"]={
-		{ "16x16/actions/format-text-bold.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-text-bold.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-text-bold.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-text-bold.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-text-bold.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-text-bold.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-text-bold.png" }
-	}
-	stock["gtk-cancel"]={
-		{ "16x16/actions/dialog-cancel.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/dialog-cancel.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/dialog-cancel.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/dialog-cancel.png", *, *, "gtk-button" },
-		{ "16x16/actions/dialog-cancel.png", *, *, "gtk-menu" },
-		{ "32x32/actions/dialog-cancel.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/dialog-cancel.png" }
-	}
-	stock["gtk-cdrom"]={
-		{ "16x16/devices/media-optical.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/devices/media-optical.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/devices/media-optical.png", *, *, "gtk-dnd" },
-		{ "16x16/devices/media-optical.png", *, *, "gtk-button" },
-		{ "16x16/devices/media-optical.png", *, *, "gtk-menu" },
-		{ "32x32/devices/media-optical.png", *, *, "gtk-dialog" },
-		{ "16x16/devices/media-optical.png" }
-	}
-	stock["gtk-clear"]={
-		{ "16x16/actions/edit-clear.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-clear.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-clear.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-clear.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-clear.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-clear.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-clear.png" }
-	}
-	stock["gtk-close"]={
-		{ "16x16/actions/window-close.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/window-close.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/window-close.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/window-close.png", *, *, "gtk-button" },
-		{ "16x16/actions/window-close.png", *, *, "gtk-menu" },
-		{ "32x32/actions/window-close.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/window-close.png" }
-	}
-	stock["gtk-color-picker"]={
-		{ "16x16/actions/color-picker.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/color-picker.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/color-picker.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/color-picker.png", *, *, "gtk-button" },
-		{ "16x16/actions/color-picker.png", *, *, "gtk-menu" },
-		{ "32x32/actions/color-picker.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/color-picker.png" }
-	}
-	stock["gtk-connect"]={
-		{ "16x16/actions/network-connect.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/network-connect.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/network-connect.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/network-connect.png", *, *, "gtk-button" },
-		{ "16x16/actions/network-connect.png", *, *, "gtk-menu" },
-		{ "32x32/actions/network-connect.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/network-connect.png" }
-	}
-	stock["gtk-convert"]={
-		{ "16x16/actions/document-export.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-export.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-export.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-export.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-export.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-export.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-export.png" }
-	}
-	stock["gtk-copy"]={
-		{ "16x16/actions/edit-copy.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-copy.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-copy.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-copy.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-copy.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-copy.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-copy.png" }
-	}
-	stock["gtk-cut"]={
-		{ "16x16/actions/edit-cut.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-cut.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-cut.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-cut.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-cut.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-cut.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-cut.png" }
-	}
-	stock["gtk-delete"]={
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-delete.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-delete.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-delete.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-delete.png" }
-	}
-	stock["gtk-dialog-authentication"]={
-		{ "16x16/status/dialog-password.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/status/dialog-password.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/status/dialog-password.png", *, *, "gtk-dnd" },
-		{ "16x16/status/dialog-password.png", *, *, "gtk-button" },
-		{ "16x16/status/dialog-password.png", *, *, "gtk-menu" },
-		{ "32x32/status/dialog-password.png", *, *, "gtk-dialog" },
-		{ "16x16/status/dialog-password.png" }
-	}
-	stock["gtk-dialog-error"]={
-		{ "16x16/status/dialog-error.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/status/dialog-error.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/status/dialog-error.png", *, *, "gtk-dnd" },
-		{ "16x16/status/dialog-error.png", *, *, "gtk-button" },
-		{ "16x16/status/dialog-error.png", *, *, "gtk-menu" },
-		{ "32x32/status/dialog-error.png", *, *, "gtk-dialog" },
-		{ "16x16/status/dialog-error.png" }
-	}
-	stock["gtk-dialog-info"]={
-		{ "16x16/status/dialog-information.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/status/dialog-information.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/status/dialog-information.png", *, *, "gtk-dnd" },
-		{ "16x16/status/dialog-information.png", *, *, "gtk-button" },
-		{ "16x16/status/dialog-information.png", *, *, "gtk-menu" },
-		{ "32x32/status/dialog-information.png", *, *, "gtk-dialog" },
-		{ "16x16/status/dialog-information.png" }
-	}
-	stock["gtk-dialog-question"]={
-		{ "16x16/status/dialog-information.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/status/dialog-information.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/status/dialog-information.png", *, *, "gtk-dnd" },
-		{ "16x16/status/dialog-information.png", *, *, "gtk-button" },
-		{ "16x16/status/dialog-information.png", *, *, "gtk-menu" },
-		{ "32x32/status/dialog-information.png", *, *, "gtk-dialog" },
-		{ "16x16/status/dialog-information.png" }
-	}
-	stock["gtk-dialog-warning"]={
-		{ "16x16/status/dialog-warning.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/status/dialog-warning.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/status/dialog-warning.png", *, *, "gtk-dnd" },
-		{ "16x16/status/dialog-warning.png", *, *, "gtk-button" },
-		{ "16x16/status/dialog-warning.png", *, *, "gtk-menu" },
-		{ "32x32/status/dialog-warning.png", *, *, "gtk-dialog" },
-		{ "16x16/status/dialog-warning.png" }
-	}
-	stock["gtk-directory"]={
-		{ "16x16/places/folder.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/places/folder.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/places/folder.png", *, *, "gtk-dnd" },
-		{ "16x16/places/folder.png", *, *, "gtk-button" },
-		{ "16x16/places/folder.png", *, *, "gtk-menu" },
-		{ "32x32/places/folder.png", *, *, "gtk-dialog" },
-		{ "16x16/places/folder.png" }
-	}
-	stock["gtk-disconnect"]={
-		{ "16x16/actions/network-disconnect.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/network-disconnect.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/network-disconnect.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/network-disconnect.png", *, *, "gtk-button" },
-		{ "16x16/actions/network-disconnect.png", *, *, "gtk-menu" },
-		{ "32x32/actions/network-disconnect.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/network-disconnect.png" }
-	}
-	stock["gtk-dnd"]={
-		{ "16x16/mimetypes/application-x-zerosize.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/mimetypes/application-x-zerosize.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/mimetypes/application-x-zerosize.png", *, *, "gtk-dnd" },
-		{ "16x16/mimetypes/application-x-zerosize.png", *, *, "gtk-button" },
-		{ "16x16/mimetypes/application-x-zerosize.png", *, *, "gtk-menu" },
-		{ "32x32/mimetypes/application-x-zerosize.png", *, *, "gtk-dialog" },
-		{ "16x16/mimetypes/application-x-zerosize.png" }
-	}
-	stock["gtk-dnd-multiple"]={
-		{ "16x16/places/document-multiple.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/places/document-multiple.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/places/document-multiple.png", *, *, "gtk-dnd" },
-		{ "16x16/places/document-multiple.png", *, *, "gtk-button" },
-		{ "16x16/places/document-multiple.png", *, *, "gtk-menu" },
-		{ "32x32/places/document-multiple.png", *, *, "gtk-dialog" },
-		{ "16x16/places/document-multiple.png" }
-	}
-	stock["gtk-edit"]={
-		{ "16x16/actions/document-properties.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-properties.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-properties.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-properties.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-properties.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-properties.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-properties.png" }
-	}
-	stock["gtk-execute"]={
-		{ "16x16/actions/fork.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/fork.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/fork.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/fork.png", *, *, "gtk-button" },
-		{ "16x16/actions/fork.png", *, *, "gtk-menu" },
-		{ "32x32/actions/fork.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/fork.png" }
-	}
-	stock["gtk-file"]={
-		{ "16x16/mimetypes/application-x-zerosize.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/mimetypes/application-x-zerosize.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/mimetypes/application-x-zerosize.png", *, *, "gtk-dnd" },
-		{ "16x16/mimetypes/application-x-zerosize.png", *, *, "gtk-button" },
-		{ "16x16/mimetypes/application-x-zerosize.png", *, *, "gtk-menu" },
-		{ "32x32/mimetypes/application-x-zerosize.png", *, *, "gtk-dialog" },
-		{ "16x16/mimetypes/application-x-zerosize.png" }
-	}
-	stock["gtk-find"]={
-		{ "16x16/actions/edit-find.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-find.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-find.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-find.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-find.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-find.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-find.png" }
-	}
-#	stock["gtk-find-and-replace"]=<No matching KDE icon>
-	stock["gtk-floppy"]={
-		{ "16x16/devices/media-floppy.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/devices/media-floppy.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/devices/media-floppy.png", *, *, "gtk-dnd" },
-		{ "16x16/devices/media-floppy.png", *, *, "gtk-button" },
-		{ "16x16/devices/media-floppy.png", *, *, "gtk-menu" },
-		{ "32x32/devices/media-floppy.png", *, *, "gtk-dialog" },
-		{ "16x16/devices/media-floppy.png" }
-	}
-	stock["gtk-fullscreen"]={
-		{ "16x16/actions/view-fullscreen.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/view-fullscreen.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/view-fullscreen.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/view-fullscreen.png", *, *, "gtk-button" },
-		{ "16x16/actions/view-fullscreen.png", *, *, "gtk-menu" },
-		{ "32x32/actions/view-fullscreen.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/view-fullscreen.png" }
-	}
-	stock["gtk-goto-bottom"]={
-		{ "16x16/actions/go-bottom.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-bottom.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-bottom.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-bottom.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-bottom.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-bottom.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-bottom.png" }
-	}
-	stock["gtk-goto-first"]={
-		{ "16x16/actions/go-first.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-first.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-first.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-first.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-first.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-first.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-first.png" }
-	}
-	stock["gtk-goto-last"]={
-		{ "16x16/actions/go-last.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-last.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-last.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-last.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-last.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-last.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-last.png" }
-	}
-	stock["gtk-goto-top"]={
-		{ "16x16/actions/go-top.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-top.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-top.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-top.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-top.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-top.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-top.png" }
-	}
-	stock["gtk-go-back"]={
-		{ "16x16/actions/go-previous.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-previous.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-previous.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-previous.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-previous.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-previous.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-previous.png" }
-	}
-	stock["gtk-go-back-ltr"]={
-		{ "16x16/actions/go-previous.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-previous.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-previous.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-previous.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-previous.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-previous.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-previous.png" }
-	}
-	stock["gtk-go-back-rtl"]={
-		{ "16x16/actions/go-next.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-next.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-next.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-next.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-next.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-next.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-next.png" }
-	}
-	stock["gtk-go-down"]={
-		{ "16x16/actions/go-down.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-down.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-down.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-down.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-down.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-down.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-down.png" }
-	}
-	stock["gtk-go-forward"]={
-		{ "16x16/actions/go-next.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-next.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-next.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-next.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-next.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-next.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-next.png" }
-	}
-	stock["gtk-go-forward-ltr"]={
-		{ "16x16/actions/go-next.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-next.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-next.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-next.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-next.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-next.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-next.png" }
-	}
-	stock["gtk-go-forward-rtl"]={
-		{ "16x16/actions/go-previous.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-previous.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-previous.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-previous.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-previous.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-previous.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-previous.png" }
-	}
-	stock["gtk-go-up"]={
-		{ "16x16/actions/go-up.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-up.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-up.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-up.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-up.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-up.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-up.png" }
-	}
-	stock["gtk-harddisk"]={
-		{ "16x16/devices/drive-harddisk.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/devices/drive-harddisk.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/devices/drive-harddisk.png", *, *, "gtk-dnd" },
-		{ "16x16/devices/drive-harddisk.png", *, *, "gtk-button" },
-		{ "16x16/devices/drive-harddisk.png", *, *, "gtk-menu" },
-		{ "32x32/devices/drive-harddisk.png", *, *, "gtk-dialog" },
-		{ "16x16/devices/drive-harddisk.png" }
-	}
-	stock["gtk-help"]={
-		{ "16x16/actions/help-contents.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/help-contents.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/help-contents.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/help-contents.png", *, *, "gtk-button" },
-		{ "16x16/actions/help-contents.png", *, *, "gtk-menu" },
-		{ "32x32/actions/help-contents.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/help-contents.png" }
-	}
-	stock["gtk-home"]={
-		{ "16x16/actions/go-home.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-home.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-home.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-home.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-home.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-home.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-home.png" }
-	}
-	stock["gtk-indent"]={
-		{ "16x16/actions/format-indent-more.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-indent-more.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-indent-more.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-indent-more.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-indent-more.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-indent-more.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-indent-more.png" }
-	}
-	stock["gtk-index"]={
-		{ "16x16/actions/help-contents.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/help-contents.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/help-contents.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/help-contents.png", *, *, "gtk-button" },
-		{ "16x16/actions/help-contents.png", *, *, "gtk-menu" },
-		{ "32x32/actions/help-contents.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/help-contents.png" }
-	}
-	stock["gtk-info"]={
-		{ "16x16/actions/help-about.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/help-about.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/help-about.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/help-about.png", *, *, "gtk-button" },
-		{ "16x16/actions/help-about.png", *, *, "gtk-menu" },
-		{ "32x32/actions/help-about.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/help-about.png" }
-	}
-	stock["gtk-italic"]={
-		{ "16x16/actions/format-text-italic.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-text-italic.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-text-italic.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-text-italic.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-text-italic.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-text-italic.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-text-italic.png" }
-	}
-	stock["gtk-jump-to"]={
-		{ "16x16/actions/go-jump.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/go-jump.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/go-jump.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/go-jump.png", *, *, "gtk-button" },
-		{ "16x16/actions/go-jump.png", *, *, "gtk-menu" },
-		{ "32x32/actions/go-jump.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/go-jump.png" }
-	}
-	stock["gtk-justify-center"]={
-		{ "16x16/actions/format-justify-center.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-justify-center.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-justify-center.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-justify-center.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-justify-center.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-justify-center.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-justify-center.png" }
-	}
-	stock["gtk-justify-fill"]={
-		{ "16x16/actions/format-justify-fill.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-justify-fill.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-justify-fill.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-justify-fill.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-justify-fill.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-justify-fill.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-justify-fill.png" }
-	}
-	stock["gtk-justify-left"]={
-		{ "16x16/actions/format-justify-left.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-justify-left.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-justify-left.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-justify-left.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-justify-left.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-justify-left.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-justify-left.png" }
-	}
-	stock["gtk-justify-right"]={
-		{ "16x16/actions/format-justify-right.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-justify-right.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-justify-right.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-justify-right.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-justify-right.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-justify-right.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-justify-right.png" }
-	}
-	stock["gtk-leave-fullscreen"]={
-		{ "16x16/actions/view-restore.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/view-restore.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/view-restore.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/view-restore.png", *, *, "gtk-button" },
-		{ "16x16/actions/view-restore.png", *, *, "gtk-menu" },
-		{ "32x32/actions/view-restore.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/view-restore.png" }
-	}
-	stock["gtk-media-forward"]={
-		{ "16x16/actions/media-seek-forward.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-seek-forward.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-seek-forward.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-seek-forward.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-seek-forward.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-seek-forward.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-seek-forward.png" }
-	}
-	stock["gtk-media-next"]={
-		{ "16x16/actions/media-skip-forward.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-skip-forward.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-skip-forward.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-skip-forward.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-skip-forward.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-skip-forward.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-skip-forward.png" }
-	}
-	stock["gtk-media-pause"]={
-		{ "16x16/actions/media-playback-pause.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-playback-pause.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-playback-pause.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-playback-pause.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-playback-pause.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-playback-pause.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-playback-pause.png" }
-	}
-	stock["gtk-media-play"]={
-		{ "16x16/actions/media-playback-start.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-playback-start.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-playback-start.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-playback-start.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-playback-start.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-playback-start.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-playback-start.png" }
-	}
-	stock["gtk-media-previous"]={
-		{ "16x16/actions/media-skip-backward.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-skip-backward.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-skip-backward.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-skip-backward.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-skip-backward.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-skip-backward.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-skip-backward.png" }
-	}
-	stock["gtk-media-record"]={
-		{ "16x16/actions/media-record.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-record.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-record.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-record.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-record.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-record.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-record.png" }
-	}
-	stock["gtk-media-rewind"]={
-		{ "16x16/actions/media-seek-backward.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-seek-backward.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-seek-backward.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-seek-backward.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-seek-backward.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-seek-backward.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-seek-backward.png" }
-	}
-	stock["gtk-media-stop"]={
-		{ "16x16/actions/media-playback-stop.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/media-playback-stop.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/media-playback-stop.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/media-playback-stop.png", *, *, "gtk-button" },
-		{ "16x16/actions/media-playback-stop.png", *, *, "gtk-menu" },
-		{ "32x32/actions/media-playback-stop.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/media-playback-stop.png" }
-	}
-	stock["gtk-missing-image"]={
-		{ "16x16/mimetypes/unknown.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/mimetypes/unknown.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/mimetypes/unknown.png", *, *, "gtk-dnd" },
-		{ "16x16/mimetypes/unknown.png", *, *, "gtk-button" },
-		{ "16x16/mimetypes/unknown.png", *, *, "gtk-menu" },
-		{ "32x32/mimetypes/unknown.png", *, *, "gtk-dialog" },
-		{ "16x16/mimetypes/unknown.png" }
-	}
-	stock["gtk-network"]={
-		{ "16x16/places/network-server.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/places/network-server.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/places/network-server.png", *, *, "gtk-dnd" },
-		{ "16x16/places/network-server.png", *, *, "gtk-button" },
-		{ "16x16/places/network-server.png", *, *, "gtk-menu" },
-		{ "32x32/places/network-server.png", *, *, "gtk-dialog" },
-		{ "16x16/places/network-server.png" }
-	}
-	stock["gtk-new"]={
-		{ "16x16/actions/document-new.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-new.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-new.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-new.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-new.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-new.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-new.png" }
-	}
-	stock["gtk-no"]={
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-delete.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-delete.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-delete.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-delete.png" }
-	}
-	stock["gtk-ok"]={
-		{ "16x16/actions/dialog-ok.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/dialog-ok.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/dialog-ok.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/dialog-ok.png", *, *, "gtk-button" },
-		{ "16x16/actions/dialog-ok.png", *, *, "gtk-menu" },
-		{ "32x32/actions/dialog-ok.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/dialog-ok.png" }
-	}
-	stock["gtk-open"]={
-		{ "16x16/actions/document-open.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-open.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-open.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-open.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-open.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-open.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-open.png" }
-	}
-	stock["gtk-paste"]={
-		{ "16x16/actions/edit-paste.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-paste.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-paste.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-paste.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-paste.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-paste.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-paste.png" }
-	}
-	stock["gtk-preferences"]={
-		{ "16x16/actions/configure.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/configure.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/configure.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/configure.png", *, *, "gtk-button" },
-		{ "16x16/actions/configure.png", *, *, "gtk-menu" },
-		{ "32x32/actions/configure.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/configure.png" }
-	}
-	stock["gtk-print"]={
-		{ "16x16/actions/document-print.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-print.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-print.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-print.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-print.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-print.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-print.png" }
-	}
-	stock["gtk-print-preview"]={
-		{ "16x16/actions/document-print-preview.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-print-preview.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-print-preview.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-print-preview.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-print-preview.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-print-preview.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-print-preview.png" }
-	}
-	stock["gtk-properties"]={
-		{ "16x16/actions/document-properties.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-properties.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-properties.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-properties.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-properties.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-properties.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-properties.png" }
-	}
-	stock["gtk-quit"]={
-		{ "16x16/actions/application-exit.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/application-exit.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/application-exit.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/application-exit.png", *, *, "gtk-button" },
-		{ "16x16/actions/application-exit.png", *, *, "gtk-menu" },
-		{ "32x32/actions/application-exit.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/application-exit.png" }
-	}
-	stock["gtk-redo"]={
-		{ "16x16/actions/edit-redo.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-redo.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-redo.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-redo.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-redo.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-redo.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-redo.png" }
-	}
-	stock["gtk-refresh"]={
-		{ "16x16/actions/view-refresh.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/view-refresh.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/view-refresh.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/view-refresh.png", *, *, "gtk-button" },
-		{ "16x16/actions/view-refresh.png", *, *, "gtk-menu" },
-		{ "32x32/actions/view-refresh.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/view-refresh.png" }
-	}
-	stock["gtk-remove"]={
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-delete.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-delete.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-delete.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-delete.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-delete.png" }
-	}
-	stock["gtk-revert-to-saved"]={
-		{ "16x16/actions/document-revert.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-revert.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-revert.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-revert.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-revert.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-revert.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-revert.png" }
-	}
-	stock["gtk-save"]={
-		{ "16x16/actions/document-save.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-save.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-save.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-save.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-save.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-save.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-save.png" }
-	}
-	stock["gtk-save-as"]={
-		{ "16x16/actions/document-save-as.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/document-save-as.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/document-save-as.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/document-save-as.png", *, *, "gtk-button" },
-		{ "16x16/actions/document-save-as.png", *, *, "gtk-menu" },
-		{ "32x32/actions/document-save-as.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/document-save-as.png" }
-	}
-	stock["gtk-select-color"]={
-		{ "16x16/actions/color-picker.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/color-picker.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/color-picker.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/color-picker.png", *, *, "gtk-button" },
-		{ "16x16/actions/color-picker.png", *, *, "gtk-menu" },
-		{ "32x32/actions/color-picker.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/color-picker.png" }
-	}
-	stock["gtk-select-font"]={
-		{ "16x16/apps/preferences-desktop-font.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/apps/preferences-desktop-font.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/apps/preferences-desktop-font.png", *, *, "gtk-dnd" },
-		{ "16x16/apps/preferences-desktop-font.png", *, *, "gtk-button" },
-		{ "16x16/apps/preferences-desktop-font.png", *, *, "gtk-menu" },
-		{ "32x32/apps/preferences-desktop-font.png", *, *, "gtk-dialog" },
-		{ "16x16/apps/preferences-desktop-font.png" }
-	}
-	stock["gtk-sort-ascending"]={
-		{ "16x16/actions/view-sort-ascending.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/view-sort-ascending.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/view-sort-ascending.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/view-sort-ascending.png", *, *, "gtk-button" },
-		{ "16x16/actions/view-sort-ascending.png", *, *, "gtk-menu" },
-		{ "32x32/actions/view-sort-ascending.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/view-sort-ascending.png" }
-	}
-	stock["gtk-sort-descending"]={
-		{ "16x16/actions/view-sort-descending.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/view-sort-descending.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/view-sort-descending.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/view-sort-descending.png", *, *, "gtk-button" },
-		{ "16x16/actions/view-sort-descending.png", *, *, "gtk-menu" },
-		{ "32x32/actions/view-sort-descending.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/view-sort-descending.png" }
-	}
-	stock["gtk-spell-check"]={
-		{ "16x16/actions/tools-check-spelling.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/tools-check-spelling.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/tools-check-spelling.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/tools-check-spelling.png", *, *, "gtk-button" },
-		{ "16x16/actions/tools-check-spelling.png", *, *, "gtk-menu" },
-		{ "32x32/actions/tools-check-spelling.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/tools-check-spelling.png" }
-	}
-	stock["gtk-stop"]={
-		{ "16x16/actions/process-stop.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/process-stop.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/process-stop.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/process-stop.png", *, *, "gtk-button" },
-		{ "16x16/actions/process-stop.png", *, *, "gtk-menu" },
-		{ "32x32/actions/process-stop.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/process-stop.png" }
-	}
-	stock["gtk-strikethrough"]={
-		{ "16x16/actions/format-text-strikethrough.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-text-strikethrough.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-text-strikethrough.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-text-strikethrough.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-text-strikethrough.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-text-strikethrough.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-text-strikethrough.png" }
-	}
-	stock["gtk-undelete"]={
-		{ "16x16/actions/edit-undo.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-undo.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-undo.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-undo.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-undo.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-undo.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-undo.png" }
-	}
-	stock["gtk-underline"]={
-		{ "16x16/actions/format-text-underline.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-text-underline.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-text-underline.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-text-underline.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-text-underline.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-text-underline.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-text-underline.png" }
-	}
-	stock["gtk-undo"]={
-		{ "16x16/actions/edit-undo.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/edit-undo.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/edit-undo.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/edit-undo.png", *, *, "gtk-button" },
-		{ "16x16/actions/edit-undo.png", *, *, "gtk-menu" },
-		{ "32x32/actions/edit-undo.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/edit-undo.png" }
-	}
-	stock["gtk-unindent"]={
-		{ "16x16/actions/format-indent-less.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/format-indent-less.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/format-indent-less.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/format-indent-less.png", *, *, "gtk-button" },
-		{ "16x16/actions/format-indent-less.png", *, *, "gtk-menu" },
-		{ "32x32/actions/format-indent-less.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/format-indent-less.png" }
-	}
-	stock["gtk-yes"]={
-		{ "16x16/actions/dialog-ok.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/dialog-ok.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/dialog-ok.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/dialog-ok.png", *, *, "gtk-button" },
-		{ "16x16/actions/dialog-ok.png", *, *, "gtk-menu" },
-		{ "32x32/actions/dialog-ok.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/dialog-ok.png" }
-	}
-	stock["gtk-zoom-100"]={
-		{ "16x16/actions/zoom-original.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/zoom-original.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/zoom-original.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/zoom-original.png", *, *, "gtk-button" },
-		{ "16x16/actions/zoom-original.png", *, *, "gtk-menu" },
-		{ "32x32/actions/zoom-original.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/zoom-original.png" }
-	}
-	stock["gtk-zoom-fit"]={
-		{ "16x16/actions/zoom-fit-best.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/zoom-fit-best.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/zoom-fit-best.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/zoom-fit-best.png", *, *, "gtk-button" },
-		{ "16x16/actions/zoom-fit-best.png", *, *, "gtk-menu" },
-		{ "32x32/actions/zoom-fit-best.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/zoom-fit-best.png" }
-	}
-	stock["gtk-zoom-in"]={
-		{ "16x16/actions/zoom-in.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/zoom-in.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/zoom-in.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/zoom-in.png", *, *, "gtk-button" },
-		{ "16x16/actions/zoom-in.png", *, *, "gtk-menu" },
-		{ "32x32/actions/zoom-in.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/zoom-in.png" }
-	}
-	stock["gtk-zoom-out"]={
-		{ "16x16/actions/zoom-out.png", *, *, "gtk-small-toolbar" },
-		{ "22x22/actions/zoom-out.png", *, *, "gtk-large-toolbar" },
-		{ "32x32/actions/zoom-out.png", *, *, "gtk-dnd" },
-		{ "16x16/actions/zoom-out.png", *, *, "gtk-button" },
-		{ "16x16/actions/zoom-out.png", *, *, "gtk-menu" },
-		{ "32x32/actions/zoom-out.png", *, *, "gtk-dialog" },
-		{ "16x16/actions/zoom-out.png" }
-	}
-}
-class "*" style "KDE4-icons"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.directory
deleted file mode 100644
index 66cfad3c2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde env(client.os_remote_auth)==||ur_domain_set==off
-#покажем иконку Home в �лучае е�ли компьютер не �етевой
-#в противном �лучае директори� Home будет в /home/$USER/Home
-[Desktop Entry]
-Icon=user-home
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.gtkrc-2.0 b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.gtkrc-2.0
deleted file mode 100644
index a15bf899d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.gtkrc-2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate comment=# chmod=0600 pkg(x11-themes/oxygen-gtk)!=
-include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
-include "/etc/gtk-2.0/gtkrc"
-
-style "user-font"
-{
-    font_name="Droid Sans"
-}
-widget_class "*" style "user-font"
-gtk-font-name="Droid Sans 10"
-gtk-theme-name="oxygen-gtk"
-gtk-icon-theme-name="oxygen"
-gtk-fallback-icon-theme="oxygen"
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-menu-images=1
-gtk-button-images=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/env/gtk-qt-engine.rc.sh b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/env/gtk-qt-engine.rc.sh
deleted file mode 100644
index 10991b26a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/env/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate chmod=0700 pkg(x11-themes/gtk-engines-qtcurve)!=||pkg(x11-themes/oxygen-gtk)!=
-#!/bin/bash
-
-# включаем пользователь�кое оформление GTK приложений
-export GTK2_RC_FILES=/home/#-ur_login-#/.gtkrc-2.0-kde4
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konqueror/profiles/webbrowsing b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konqueror/profiles/webbrowsing
deleted file mode 100644
index ec9b28c65..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konqueror/profiles/webbrowsing
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=kde
-[Profile]
-#вы�ота окна браузера от �крана
-Height=700
-#про�мотр домашней �траницы при �тарте Konqueror
-RootItem=View0
-View0_ServiceName=khtml
-View0_ServiceType=text/html
-View0_URL=http://start.calculate-linux.org
-#?os_locale_language==ru#
-View0_URL=http://start.calculate-linux.ru
-#os_locale_language#
-#ширина окна браузера от �крана
-Width=1000
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/Calculate.colorscheme b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/Calculate.colorscheme
deleted file mode 100644
index 0e87f3680..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/Calculate.colorscheme
+++ /dev/null
@@ -1,73 +0,0 @@
-[Background]
-Color=44,44,44
-
-[BackgroundIntense]
-Bold=true
-Color=44,44,44
-
-[Color0]
-Color=44,44,44
-
-[Color0Intense]
-Bold=true
-Color=112,144,128
-
-[Color1]
-Color=112,80,80
-
-[Color1Intense]
-Bold=true
-Color=220,163,163
-
-[Color2]
-Color=96,180,138
-
-[Color2Intense]
-Bold=true
-Color=114,213,163
-
-[Color3]
-Color=223,175,143
-
-[Color3Intense]
-Bold=true
-Color=240,223,175
-
-[Color4]
-Color=154,184,215
-
-[Color4Intense]
-Bold=true
-Color=148,191,243
-
-[Color5]
-Color=220,140,195
-
-[Color5Intense]
-Bold=true
-Color=236,147,211
-
-[Color6]
-Color=140,208,211
-
-[Color6Intense]
-Bold=true
-Color=147,224,227
-
-[Color7]
-Color=220,220,204
-
-[Color7Intense]
-Bold=true
-Color=255,255,255
-
-[Foreground]
-Color=220,220,204
-
-[ForegroundIntense]
-Bold=true
-Color=220,220,204
-
-[General]
-Description=Calculate
-Opacity=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/Shell.profile b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/Shell.profile
deleted file mode 100644
index d66280b9e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/Shell.profile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=kde
-[Appearance]
-#тема
-ColorScheme=Calculate
-
-[General]
-#формат заголовка вкладки (заголовок окна у�танавливает�� оболочкой)
-LocalTabTitleFormat=%w
-#удалённый �еан� (заголовок окна у�танавливает�� оболочкой)
-RemoteTabTitleFormat=%w
-#отображать кнопки "�оздать" и "закрыть" вкладку на панели вкладок
-ShowNewAndCloseTabButtons=true
-
-#starting with version 4.8 moved to another file
-TabBarPosition=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/default.keytab b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/default.keytab
deleted file mode 100644
index 8034f49d9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/apps/konsole/default.keytab
+++ /dev/null
@@ -1,170 +0,0 @@
-# [README.default.Keytab] Default Keyboard Table
-#
-# To customize your keyboard, copy this file to something
-# ending with .keytab and change it to meet you needs.
-# Please read the README.KeyTab and the README.keyboard
-# in this case.
-#
-# --------------------------------------------------------------
-
-keyboard "Default (XFree 4)"
-
-# --------------------------------------------------------------
-#
-# Note that this particular table is a "risc" version made to
-# ease customization without bothering with obsolete details.
-# See VT100.keytab for the more hairy stuff.
-#
-# --------------------------------------------------------------
-
-# common keys
-
-key Escape             : "\E"
-
-key Tab   -Shift       : "\t"
-key Tab   +Shift+Ansi  : "\E[Z"
-key Tab   +Shift-Ansi  : "\t"
-key Backtab     +Ansi  : "\E[Z"
-key Backtab     -Ansi  : "\t"
-
-key Return-Shift-NewLine : "\r"
-key Return-Shift+NewLine : "\r\n"
-
-key Return+Shift         : "\EOM"
-
-# Backspace and Delete codes are preserving CTRL-H.
-
-key Backspace      : "\x7f"
-
-# Arrow keys in VT52 mode
-# shift up/down are reserved for scrolling.
-# shift left/right are reserved for switching between tabs (this is hardcoded).
-
-key Up   -Shift-Ansi : "\EA"
-key Down -Shift-Ansi : "\EB"
-key Right-Shift-Ansi : "\EC"
-key Left -Shift-Ansi : "\ED"
-
-# Arrow keys in ANSI mode with Application - and Normal Cursor Mode)
-
-key Up    -Shift-AnyMod+Ansi+AppCuKeys : "\EOA"
-key Down  -Shift-AnyMod+Ansi+AppCuKeys : "\EOB"
-key Right -Shift-AnyMod+Ansi+AppCuKeys : "\EOC"
-key Left  -Shift-AnyMod+Ansi+AppCuKeys : "\EOD"
-
-key Up    -Shift-AnyMod+Ansi-AppCuKeys : "\E[A"
-key Down  -Shift-AnyMod+Ansi-AppCuKeys : "\E[B"
-key Right -Shift-AnyMod+Ansi-AppCuKeys : "\E[C"
-key Left  -Shift-AnyMod+Ansi-AppCuKeys : "\E[D"
-
-key Up    -Shift+AnyMod+Ansi           : "\E[1;*A"
-key Down  -Shift+AnyMod+Ansi           : "\E[1;*B"
-key Right -Shift+AnyMod+Ansi           : "\E[1;*C"
-key Left  -Shift+AnyMod+Ansi           : "\E[1;*D"
-
-# Keypad keys with NumLock ON
-# (see "Numeric Keypad" section at http://www.nw.com/nw/WWW/products/wizcon/vt100.html )
-#key 0 +KeyPad+AppKeyPad : "\EOp"
-#key 1 +KeyPad+AppKeyPad : "\EOq"
-#key 2 +KeyPad+AppKeyPad : "\EOr"
-#key 3 +KeyPad+AppKeyPad : "\EOs"
-#key 4 +KeyPad+AppKeyPad : "\EOt"
-#key 5 +KeyPad+AppKeyPad : "\EOu"
-#key 6 +KeyPad+AppKeyPad : "\EOv"
-#key 7 +KeyPad+AppKeyPad : "\EOw"
-#key 8 +KeyPad+AppKeyPad : "\EOx"
-#key 9 +KeyPad+AppKeyPad : "\EOy"
-#key + +KeyPad+AppKeyPad : "\EOl"
-#key - +KeyPad+AppKeyPad : "\EOm"
-#key . +KeyPad+AppKeyPad : "\EOn"
-#key * +KeyPad+AppKeyPad : "\EOM"
-#key Enter +KeyPad+AppKeyPad : "\r"
-
-# other grey PC keys
-
-key Enter+NewLine : "\r\n"
-key Enter-NewLine : "\r"
-
-key Home        -AnyMod-AppCuKeys : "\E[H"  
-key End         -AnyMod-AppCuKeys : "\E[F"  
-key Home        -AnyMod+AppCuKeys : "\EOH"  
-key End         -AnyMod+AppCuKeys : "\EOF"  
-key Home        +AnyMod           : "\E[1;*H"
-key End         +AnyMod           : "\E[1;*F"
-
-key Home+KeyPad   : "\E[1~"
-key End+KeyPad    : "\E[4~"
-key Insert+KeyPad : "\E[2~"
-key Delete+KeyPad : "\E[3~"
-key PgUp+KeyPad :   "\E[5~"
-key PgDown+KeyPad : "\E[6~"
-key Up-AppCursorKeys+KeyPad : "\E[A"
-key Down-AppCursorKeys+KeyPad : "\E[B"
-key Right-AppCursorKeys+KeyPad : "\E[C"
-key Left-AppCursorKeys+KeyPad : "\E[D"
-key Up-Shift+Ansi+AppCursorKeys+KeyPad : "\EOA"
-key Down-Shift+Ansi+AppCursorKeys+KeyPad : "\EOB"
-key Right-Shift+Ansi+AppCursorKeys+KeyPad : "\EOC"
-key Left-Shift+Ansi+AppCursorKeys+KeyPad : "\EOD"
-
-
-#key Up-AppCursorKeys+KeyPad : "\E[A"
-#key Down-AppCursorKeys+KeyPad : "\E[B"
-#key Right-AppCursorKeys+KeyPad : "\E[C"
-#key Left-AppCursorKeys+KeyPad : "\E[D"
-#key Up+Ansi+AppCursorKeys+KeyPad : "\E[A"
-#key Down+Ansi+AppCursorKeys+KeyPad : "\E[B"
-#key Right+Ansi+AppCursorKeys+KeyPad : "\E[C"
-#key Left+Ansi+AppCursorKeys+KeyPad : "\E[D"
-
-key Insert      -AnyMod  : "\E[2~"
-key Delete      -AnyMod  : "\E[3~"
-key Insert      +AnyMod  : "\E[2;*~"
-key Delete      +AnyMod  : "\E[3;*~"
-
-key Prior -Shift-AnyMod  : "\E[5~"
-key Next  -Shift-AnyMod  : "\E[6~"
-key Prior -Shift+AnyMod  : "\E[5;*~"
-key Next  -Shift+AnyMod  : "\E[6;*~"
-
-# Function keys
-key F1  -AnyMod  : "\EOP"
-key F2  -AnyMod  : "\EOQ"
-key F3  -AnyMod  : "\EOR"
-key F4  -AnyMod  : "\EOS"
-key F5  -AnyMod  : "\E[15~"
-key F6  -AnyMod  : "\E[17~"
-key F7  -AnyMod  : "\E[18~"
-key F8  -AnyMod  : "\E[19~"
-key F9  -AnyMod  : "\E[20~"
-key F10 -AnyMod  : "\E[21~"
-key F11 -AnyMod  : "\E[23~"
-key F12 -AnyMod  : "\E[24~"
-
-key F1  +AnyMod  : "\EO*P"
-key F2  +AnyMod  : "\EO*Q"
-key F3  +AnyMod  : "\EO*R"
-key F4  +AnyMod  : "\EO*S"
-key F5  +AnyMod  : "\E[15;*~"
-key F6  +AnyMod  : "\E[17;*~"
-key F7  +AnyMod  : "\E[18;*~"
-key F8  +AnyMod  : "\E[19;*~"
-key F9  +AnyMod  : "\E[20;*~"
-key F10 +AnyMod  : "\E[21;*~"
-key F11 +AnyMod  : "\E[23;*~"
-key F12 +AnyMod  : "\E[24;*~"
-
-# Work around dead keys
-
-key Space +Control : "\x00"
-
-# Some keys are used by konsole to cause operations.
-# The scroll* operations refer to the history buffer.
-
-key Up    +Shift-AppScreen  : scrollLineUp
-key Prior +Shift-AppScreen  : scrollPageUp
-key Down  +Shift-AppScreen  : scrollLineDown
-key Next  +Shift-AppScreen  : scrollPageDown
-
-key ScrollLock     : scrollLock
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/akonadi_nepomuk_feederrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/akonadi_nepomuk_feederrc
deleted file mode 100644
index c87e8ce32..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/akonadi_nepomuk_feederrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[akonadi_nepomuk_email_feeder]
-Enabled=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/baloofilerc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/baloofilerc
deleted file mode 100644
index 04595a761..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/baloofilerc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde desktop.ur_domain_set==on
-
-[Basic Settings]
-Indexing-Enabled=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/colors/Recent_Colors b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/colors/Recent_Colors
deleted file mode 100644
index 197b1825b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/colors/Recent_Colors
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE RGB Palette
-#цвет рабочего �тола
-0 0 0 
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/dolphinrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/dolphinrc
deleted file mode 100644
index 0eb562596..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/dolphinrc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde
-[General]
-FirstRun=false
-Version=200
-
-[IconsMode]
-IconSize=48
-
-[MainWindow]
-State=AAAA/wAAAAD9AAAAAwAAAAAAAACxAAAB7PwCAAAAAvsAAAAWAGYAbwBsAGQAZQByAHMARABvAGMAawAAAAAA/////wAAAAgBAAAF+wAAABQAcABsAGEAYwBlAHMARABvAGMAawEAAAA/AAAB7AAAAFABAAAFAAAAAQAAAAAAAAAA/AIAAAAC+wAAABAAaQBuAGYAbwBEAG8AYwBrAAAAAAD/////AAAACAEAAAX7AAAAFABzAGUAYQByAGMAaABEAG8AYwBrAAAAAAD/////AAAAAAAAAAAAAAADAAAAAAAAAAD8AQAAAAH7AAAAGAB0AGUAcgBtAGkAbgBhAGwARABvAGMAawAAAAAA/////wAAAAgBAAAFAAACYgAAAewAAAAEAAAABAAAAAgAAAAI/AAAAAEAAAACAAAAAQAAABYAbQBhAGkAbgBUAG8AbwBsAEIAYQByAQAAAAD/////AAAAAAAAAAA=
-Width #-main.os_x11_width-#=790
-Height #-main.os_x11_height-#=555
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/emaildefaults b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/emaildefaults
deleted file mode 100644
index 253fc049a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/emaildefaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde
-#на�тройка профил� пользовател�
-[Defaults]
-Profile=Default
-
-[PROFILE_Default]
-EmailAddress=#-ur_mail-#
-FullName=#-ur_fullname-#
-Organization=#-server(mail.organization)-#
-OutgoingServer=#-server(mail.send_host)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/emailidentities b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/emailidentities
deleted file mode 100644
index 86967fd67..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/emailidentities
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=kde
-#на�тройка kmail
-[General]
-Default Identity=1
-
-[Identity #0]
-#?server(mail.type)==imap&&env(client.os_remote_auth)!=&&ur_domain_set==on#
-Drafts=.1.directory/Drafts
-Fcc=.1.directory/Sent
-#server#
-Email Address=#-ur_mail-#
-Identity=Default
-Inline Signature=#-server(mail.signature)-#
-Name=#-ur_fullname-#
-Organization=#-server(mail.organization)-#
-Signature Type=inline
-uoid=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/gtkrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/gtkrc
deleted file mode 100644
index 98a2b7e69..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/gtkrc
+++ /dev/null
@@ -1,44 +0,0 @@
-# Calculate chmod=0400 pkg(kde-misc/gtk-kde4)!=
-# опи�ание оформлени� �леменов управлени� в GTK приложени�х
-# берет за о�нову опи�ание темы Qt4
-include "/usr/share/themes/qt4/gtk-2.0/gtkrc"
-# подправл�ет �тиль дл� в�ех �лементов
-style "user-font"
-{ 
-    # у�танавливаем пользователь�кий шрифт
-    #?pkg(media-fonts/droid)!=#
-    font_name="Droid Sans 10"
-    #pkg#
-    #?pkg(media-fonts/droid)==#
-    font_name="Verdana 10"
-    #pkg#
-    # у�танавливаем �ерый фон под документом  дл� openoffice
-    bg[NORMAL] = {0.859804, 0.855882, 0.851961 }
-}
-# подправл�ет �тиль кнопки опи�анной button
-style "user-button" = "button"
-{
-    # отмена уменьшени� фоку�а, необходимо, дл� нормального
-    # отображени� �леменов управлени� дл� ввода тек�та на
-    # панели в openoffice
-    GtkWidget::focus_padding = 0
-    # увеличить ширину кнопки
-    xthickness = 5
-    # увеличить вы�оту кнопки
-    ythickness = 4
-}
-# у�танавливить новый �тиль дл� кнопки
-class "GtkButton" style "user-button"
-# у�тановить шрифт дл� кнопки
-widget_class "*" style "user-font"
-# тема оформлени� qt4
-gtk-theme-name="qt4"
-# фонт дл� gtk
-#?pkg(media-fonts/droid)!=#
-gtk-font-name="Droid Sans 10"
-#pkg#
-#?pkg(media-fonts/droid)==#
-gtk-font-name="Verdana 10"
-#pkg#
-# Gtk иконки
-gtk-icon-theme-name="Locolor"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/gtkrc-2.0 b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/gtkrc-2.0
deleted file mode 100644
index 993dd3476..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/gtkrc-2.0
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=gtkrc symbolic pkg(kde-misc/gtk-kde4)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/katerc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/katerc
deleted file mode 100644
index 636a33317..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/katerc
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=kde
-[General]
-#начало �е��ии
-Startup Session=new
-[Kate Document Defaults]
-#�оздавать резервную копию
-Backup Config Flags=0
-#код на�троек (от�тупы пробелами)
-Basic Config Flags=48758816
-#режим ра��тановки от�тупов по умолчанию
-Indentation Mode=python
-#ширина от�тупа
-Indentation Width=4
-[Kate Renderer Defaults]
-#показывать лиини от�тупов
-Show Indentation Lines=true
-#показывать маркеры �татичного перено�а �трок
-Word Wrap Marker=true
-[Kate View Defaults]
-#показывать поло�у закладок
-Icon Bar=true
-#показывать отметки на поло�е прокрутки
-Scroll Bar Marks=true
-[TipOfDay]
-#показывать �ообщение дн�
-RunOnStart=false
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kclock.kssrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kclock.kssrc
deleted file mode 100644
index a59f92811..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kclock.kssrc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=kde
-[Colors]
-#цвета
-Background=0,0,0
-HourHand=255,255,255
-MinuteHand=255,255,255
-Scale=255,255,255
-SecondHand=250,0,0
-
-[Settings]
-#центровка по�ередине
-KeepCentered=false
-#размер ча�ов
-Size=5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcmdisplayrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcmdisplayrc
deleted file mode 100644
index d9ad6137f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcmdisplayrc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=kde
-[DisplayEnergy]
-#включение �нерго�бережени� ди�пле�
-displayEnergySaving=true
-#период отключени� в минутах
-displayPowerOff=60
-#переход в дежурный режим (0 - отключён)
-displayStandby=0
-#переход в �п�щий режим в минутах
-displaySuspend=30
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcminputrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcminputrc
deleted file mode 100644
index dd547ce08..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcminputrc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=kde
-[$Version]
-#дл� отмены �бро�а на�тройки cursorTheme
-update_info=mouse_cursor_theme.upd:kde3.4.99
-[Mouse]
-#тема кур�оров мыши
-cursorTheme=Calculate
-[Keyboard]
-#Режим NumLock (0-включить, 1-отключить, 2-не измен�ть)
-#?hr_laptop==#
-NumLock=0
-#hr_laptop#
-#?hr_laptop!=#
-NumLock=2
-#hr_laptop#
-#delay before repeat keyboard
-RepeatDelay=330
-#rate repeat keyboard
-RepeatRate=30
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcookiejarrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcookiejarrc
deleted file mode 100644
index 78aead88e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kcookiejarrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-[Cookie Policy]
-#принимать в�е файлы "cookie"
-CookieGlobalAdvice=Accept
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kde.notifyrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kde.notifyrc
deleted file mode 100644
index 947764ae3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kde.notifyrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde
-[Event/exitkde]
-Action=
-Sound=KDE_Logout_new.wav
-
-[Event/startkde]
-Action=Sound
-Sound=KDE_Startup_new.wav
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kdeglobals b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kdeglobals
deleted file mode 100644
index 70e5d1ceb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kdeglobals
+++ /dev/null
@@ -1,46 +0,0 @@
-# Calculate format=kde
-[Emoticons]
-#Smileys theme
-emoticonsTheme=KMess-Cartoon
-
-#Fonts
-[General]
-BrowserApplication[$e]=calculate-browser.desktop
-XftHintStyle=hintmedium
-#?pkg(media-fonts/droid)!=#
-desktopFont=Droid Sans,10,-1,5,50,0,0,0,0,0
-fixed=Droid Sans Mono Slashed,10,-1,5,50,0,0,0,0,0
-font=Droid Sans,10,-1,5,50,0,0,0,0,0
-menuFont=Droid Sans,10,-1,5,50,0,0,0,0,0
-smallestReadableFont=Droid Sans,8,-1,5,50,0,0,0,0,0
-taskbarFont=Droid Sans,10,-1,5,50,0,0,0,0,0
-toolBarFont=Droid Sans,8,-1,5,50,0,0,0,0,0
-[WM]
-activeFont=Droid Sans,10,-1,5,75,0,0,0,0,0
-#pkg#
-#?pkg(media-fonts/droid)==#
-desktopFont=Verdana,10,-1,5,50,0,0,0,0,0
-fixed=Courier New,10,-1,5,50,0,0,0,0,0
-font=Verdana,10,-1,5,50,0,0,0,0,0
-menuFont=Verdana,10,-1,5,50,0,0,0,0,0
-smallestReadableFont=Verdana,8,-1,5,50,0,0,0,0,0
-taskbarFont=Verdana,10,-1,5,50,0,0,0,0,0
-toolBarFont=Verdana,8,-1,5,50,0,0,0,0,0
-[WM]
-activeFont=Verdana,9,-1,5,75,0,0,0,0,0
-#pkg#
-
-#?pkg(x11-themes/calculate-icon-theme)!=#
-[Icons]
-Theme=Calculate
-#pkg#
-
-#Language
-[Locale]
-Country=#-os_locale_language-#
-#DateFormat=%A %d %B %Y
-Language=#-os_locale_language-#:
-
-[Toolbar style]
-ToolButtonStyle=TextUnderIcon
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kglobalshortcutsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kglobalshortcutsrc
deleted file mode 100644
index 7f85286da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kglobalshortcutsrc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=kde
-[kopete]
-ReadMessage=Ctrl+`,Ctrl+Shift+I,Прочитать �ообщение
-
-[ksmserver]
-Lock Session=ScrollLock,Ctrl+Alt+L,Lock Session
-
-[plasma]
-Activate Блокирование/Выход Widget=none,ScrollLock,Блокирование/Выход
-
-[khotkeys]
-_k_friendly_name=khotkeys
-{d03619b6-9b3c-48cc-9d9c-a2aadb485550}=,none,Пои�к
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kio_httprc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kio_httprc
deleted file mode 100644
index de58b5152..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kio_httprc
+++ /dev/null
@@ -1,6 +0,0 @@
-#идентификаци� Konqueror
-#добавл�ть вер�ию операционной �и�темы
-SendUserAgent=true
-#добавить �ведени� о �зыке
-UserAgentKeys=:ovl
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/konquerorrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/konquerorrc
deleted file mode 100644
index 1ae7ba093..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/konquerorrc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=kde
-[FMSettings]
-#�крытие панели вкладок, когда открыта только одна вкладка
-AlwaysTabbedMode=true
-#закрытие вкладки �редней кнопкой мыши
-MouseMiddleClickClosesTab=true
-#открывать в�плывающие окна в новой вкладке, а не в новом окне
-PopupsWithinTabs=true
-
-[HTML Settings]
-Fonts=Verdana,Courier New,Times New Roman,Verdana,Verdana,Verdana,
-MediumFontSize=11
-
-[UserSettings]
-#Домашн�� �траница
-HomeURL=http://start.calculate-linux.org
-#?os_locale_language==ru#
-HomeURL=http://start.calculate-linux.ru
-#os_locale_language#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/konsolerc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/konsolerc
deleted file mode 100644
index 2bd9509cf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/konsolerc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde
-#хот�бы пу�той файл дл� того чтобы права не помен�ли�ь при запу�ке рутовой кон�оли на LiveCD
-
-[Notification Messages]
-CloseAllTabs=true
-
-[TabBar]
-TabBarPosition=Top
-TabBarVisibility=ShowTabBarWhenNeeded
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kscreensaverrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kscreensaverrc
deleted file mode 100644
index 369a26c14..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kscreensaverrc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=kde
-#хранитель �крана
-[ScreenSaver]
-Enabled=true
-LegacySaverEnabled=true
-PlasmaEnabled=false
-#?os_root_type==livecd#
-Lock=false
-#os_root_type#
-#?os_root_type!=livecd#
-Lock=true
-#os_root_type#
-LockGrace=60000
-Saver=KClock.desktop
-Timeout=600
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/ksmserverrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/ksmserverrc
deleted file mode 100644
index 181c6e682..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/ksmserverrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde
-[General]
-loginMode=default
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/ksplashrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/ksplashrc
deleted file mode 100644
index 18ce34c78..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/ksplashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde
-#тема загрузки рабочего �тола
-[KSplash]
-Engine=KSplashX
-#?pkg(media-gfx/kdm-themes-calculate)<14&&os_locale_lang!=pt_BR#
-Theme=CalculateSplash#-case(capitalize,os_locale_language)-#
-#pkg#
-#?pkg(media-gfx/kdm-themes-calculate)<14&&os_locale_lang==pt_BR#
-Theme=CalculateSplashPt
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kwinrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kwinrc
deleted file mode 100644
index d86b272ce..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kwinrc
+++ /dev/null
@@ -1,66 +0,0 @@
-# Calculate format=kde append=replace
-[Compositing]
-#включить графиче�кие �ффекты
-Enabled=true
-#отключать граф. �ффекты дл� полно�кранных окон
-UnredirectFullscreen=true
-
-[Desktops]
-#кол-во рабочих �толов
-Number=4
-#кол-во �трок дл� рабочик �толов
-Rows=1
-
-#�а�тройка 3D куба
-[Effect-Cube]
-#Логотип Calculate Linux на верхней и нижней грани куба
-CapPath=/usr/share/apps/kwin/calculatecubecap.png
-
-#Вы�тавка окон
-[Effect-PresentWindows]
-#не активировать при перемещении мышки в правый нижний угол
-BorderActivate=9
-#не отображать окна в�ех рабочих �толов при перемещении в лев. вер. угол
-BorderActivateAll=9
-DrawWindowCaptions=true
-
-#Дей�тви� мыши � окном
-[MouseBindings]
-#убрать окно вниз по �редней кнопке на заголовке
-CommandActiveTitlebar2=Lower
-CommandInactiveTitlebar2=Lower
-
-[Plugins]
-#Показывать размытый фон под полупрозрачным окном
-kwin4_effect_blurEnabled=false
-#Показать в�е рабочие �толы на одном �кране
-kwin4_effect_desktopgridEnabled=true
-#Улучшенный переключатель окон Alt-tab
-kwin4_effect_boxswitchEnabled=true
-#Циркул�ци� - анимаци� переключени� окон (Alt+Tab) по мотивам Cover Flow
-kwin4_effect_coverswitchEnabled=false
-#Куб � рабочими �толами
-kwin4_effect_cubeEnabled=true
-#Эффект �ворачивани� "Волшебна� лампа"
-kwin4_effect_magiclampEnabled=true
-#�нимаци� окна при мак�имизации
-kwin4_effect_maximizeEnabled=false
-#�нимаци� �ворачивани�
-kwin4_effect_minimizeanimationEnabled=false
-#Вихл�ющие окна
-kwin4_effect_wobblywindowsEnabled=false
-#Slide back
-kwin4_effect_slidebackEnabled=false
-
-[Windows]
-#на�тройка активных границ рабочего �тола
-#(при перемещении окна переходить на другой рабочий �тол)
-ElectricBorders=1
-#разрешать перемещение и изменение размера развернутых окон
-MoveResizeMaximizedWindows=true
-#не ра�т�гивать окно при переменщении к верхнему краю �крана
-ElectricBorderMaximize=false
-#не ра��тгивать окно на половину �крана по�ле перемещени� к боковому краю �крана
-ElectricBorderTiling=false
-#уровень предотвращение перевода фоку�а - никогда
-FocusStealingPreventionLevel=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kwriterc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kwriterc
deleted file mode 100644
index 306b67f95..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kwriterc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[Kate Document Defaults]
-#�оздание резервной попии файлов (1-локальных, 2-удаленных, 3-в�ех)
-Backup Config Flags=0
-
-#размер от�тупа
-Indentation Width=8
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kxkbrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kxkbrc
deleted file mode 100644
index d93b95054..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/kxkbrc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate format=kde
-#Ра�кладка клавиатуры
-[Layout]
-DisplayNames=#-os_locale_xkbname-#
-IndicatorOnly=false
-LayoutList=#-os_locale_xkb-#
-Model=pc104
-#?os_locale_language==us#
-Options=terminate:ctrl_alt_bksp
-#os_locale_language#
-#?os_locale_language!=us#
-Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp
-#os_locale_language#
-ResetOldOptions=true
-ShowFlag=false
-ShowSingle=false
-SwitchMode=WinClass
-Use=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/mailtransports b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/mailtransports
deleted file mode 100644
index 73871d3c7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/mailtransports
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=kde
-#на�тройка отправки пи�ем kmail
-#?server(mail.host)!=&&env(client.os_remote_auth)!=&&ur_domain_set==on#
-[General]
-default-transport=1
-
-[Transport 1]
-host=#-server(mail.host)-#
-id=1
-name=SMTP
-#server#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/nepomukserverrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/nepomukserverrc
deleted file mode 100644
index 24ee2fdc2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/nepomukserverrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=kde
-
-[Basic Settings]
-Start Nepomuk=true
-
-[Service-nepomukstrigiservice]
-autostart=false
-
-[Service-nepomukfileindexer]
-autostart=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/oxygenrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/oxygenrc
deleted file mode 100644
index 7bbb78c02..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/oxygenrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde
-
-[Windeco]
-DrawSeparator=true
-TitleAlignment=Left
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/powermanagementprofilesrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/powermanagementprofilesrc
deleted file mode 100644
index f855b6e0a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/powermanagementprofilesrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde
-
-[AC][HandleButtonEvents]
-lidAction=32
-powerButtonAction=16
-
-[Battery][HandleButtonEvents]
-lidAction=1
-powerButtonAction=16
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/sonnetrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/sonnetrc
deleted file mode 100644
index 80725bc31..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/sonnetrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[Spelling]
-#?os_locale_lang==ru_RU#
-defaultLanguage=ru_RU_yo
-#os_locale_lang#
-#?os_locale_lang!=ru_RU#
-defaultLanguage=#-os_locale_lang-#
-#os_locale_lang#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/systemsettingsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/systemsettingsrc
deleted file mode 100644
index fe9fca1fe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/config/systemsettingsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde
-
-[MainWindow]
-Width #-main.os_x11_width-#=755
-Height #-main.os_x11_height-#=610
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/kde4/services/ServiceMenu/send-attach.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/kde4/services/ServiceMenu/send-attach.desktop
deleted file mode 100644
index fa9570087..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.kde4/share/kde4/services/ServiceMenu/send-attach.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=KonqPopupMenu/Plugin,all/allfiles
-Actions=openKmailAttachment
-Encoding=UTF-8
-MimeType=application/octet-stream
-ExcludeServiceTypes=application/x-iso,kdedevice/*,inode/directory
-
-[Desktop Action openKmailAttachment]
-Name=Send File As Attachment
-Name[de]=Datei als Anhang versenden
-Name[en]=Send File As Attachment
-Name[fr]=Envoyer le fichier en pièce jointe
-Name[pt]=Enviar por correio-e
-Name[sk]=Poslať e-mailom
-Name[ru]=Отправить в KMail
-
-Icon=kmail
-Exec=kmail --composer --attach %F `echo attachment=\'file://%F\' | sed 's/ \//,file:\/\/\//g'`
-X-Ubuntu-Gettext-Domain=desktop_kdebase
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/bsh-console-bsh.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/bsh-console-bsh.desktop
deleted file mode 100644
index 75ebf6b50..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/bsh-console-bsh.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/bsh-console-bsh.desktop mirror
-[Desktop Entry]
-#�кроем из меню
-OnlyShowIn=X-NeverShowThis;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/goldendict.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/goldendict.desktop
deleted file mode 100644
index f6eb7fe0b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/goldendict.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/goldendict.desktop mirror
-[Desktop Entry]
-Categories=Office;Dictionary
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/gparted.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/gparted.desktop
deleted file mode 100644
index 4fadc6b58..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/gparted.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gparted.desktop os_root_type==livecd mirror
-[Desktop Entry]
-Exec=sudo -E /usr/sbin/gparted
-#отключим запро� парол�
-X-KDE-SubstituteUID=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/kde4/contactthemeeditor.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/kde4/contactthemeeditor.desktop
deleted file mode 100644
index 1f3f447ab..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/kde4/contactthemeeditor.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications/kde4 link=/usr/share/applications/kde4/contactthemeeditor.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/kde4/ksecrets.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/kde4/ksecrets.desktop
deleted file mode 100644
index c85099080..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.local/share/applications/kde4/ksecrets.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/ksecrets.desktop mirror
-[Desktop Entry]
-#�кроем из меню
-OnlyShowIn=X-NeverShowThis;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.qt/qtrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.qt/qtrc
deleted file mode 100644
index 1aff315ee..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/.qt/qtrc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=kde
-[General]
-# �тиль оформлени�
-style=Windows
-# шрифт
-#?pkg(media-fonts/droid)!=#
-font=Droid Sans,10,-1,5,50,0,0,0,0,0
-#pkg#
-#?pkg(media-fonts/droid)==#
-font=Verdana,10,-1,5,50,0,0,0,0,0
-#pkg#
-# цветовое оформление
-[Palette]
-active=#141312^e#e0dfde^e#ffffff^e#efefee^e#70706f^e#959494^e#141312^e#ffffff^e#141312^e#ffffff^e#e0dfde^e#000000^e#000080^e#ffffff^e#0000ff^e#ff00ff^e
-disabled=#7a7978^e#e0dfde^e#ffffff^e#efefee^e#70706f^e#959494^e#7a7978^e#ffffff^e#7a7978^e#ffffff^e#e0dfde^e#000000^e#000080^e#ffffff^e#0000ff^e#ff00ff^e
-inactive=#141312^e#e0dfde^e#ffffff^e#efefee^e#70706f^e#959494^e#141312^e#ffffff^e#141312^e#ffffff^e#e0dfde^e#000000^e#000080^e#ffffff^e#0000ff^e#ff00ff^e
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/.calculate_directory
deleted file mode 100644
index 879d99897..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/.directory
deleted file mode 100644
index 6cb8ac91d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Icon=user-desktop
-Type=Directory
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/FTP.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/FTP.desktop
deleted file mode 100644
index 532cedcae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/FTP.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
-[Desktop Entry]
-Encoding=UTF-8
-Name=FTP
-Comment=Browser FTP
-URL[$e]=$HOME/FTP
-Icon=folder-downloads
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Home-remote.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Home-remote.desktop
deleted file mode 100644
index fa1c5574c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Home-remote.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=replace name=Home.desktop format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Encoding=UTF-8
-Name=Home
-Comment=Browser Home
-URL[$e]=$HOME/Home
-Icon=user-home
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Home.desktop
deleted file mode 100644
index 3ebdebf13..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Home.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba link=/usr/share/apps/kio_desktop/DesktopLinks/Home.desktop mirror env(client.os_remote_auth)==||ur_domain_set==off
-[Desktop Entry]
-URL[$e]=$HOME
-Icon=user-home
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/README.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/README.desktop
deleted file mode 100644
index 0bab7f949..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/README.desktop
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate os_root_type==livecd chmod=0755
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name[bg]=Ръковод�тво за ин�талиране
-Name[ru]=Руковод�тво по у�тановке
-Name=Installation Guide
-Comment=
-Categories=Application;
-#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
-#os_locale_language#
-#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
-#os_locale_language#
-Icon=text-html
-Terminal=false
-#включить отклик запу�ка
-StartupNotify=true
-X-KDE-StartupNotify=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Share.desktop
deleted file mode 100644
index 6ab93c66f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/Share.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Encoding=UTF-8
-Name=Share
-Comment=Browser Share
-URL[$e]=$HOME/Share
-Icon=folder-favorites
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/calculate-community.desktop
deleted file mode 100644
index 396091411..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/calculate-community.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/calculate-chat.desktop mirror os_root_type==livecd chmod=0755
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-!NoDisplay=
-OnlyShowIn=KDE;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/calculate-install.desktop
deleted file mode 100644
index 653488d5b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/calculate-install.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde chmod=0755 link=/usr/share/applications/cl-console-gui-install.desktop os_root_type==livecd mirror
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-NoDisplay=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/partitionmanager.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/partitionmanager.desktop
deleted file mode 100644
index 2d94d67b7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/Desktop/partitionmanager.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/kde4/partitionmanager.desktop os_root_type==livecd mirror chmod=0755
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Exec=sudo /usr/bin/partitionmanager
-#отключим запро� парол�
-X-KDE-SubstituteUID=false
-#отключить отклик запу�ка
-StartupNotify=false
-X-KDE-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/ini.env
deleted file mode 100644
index ef3c25296..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-4.10/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kde = 4.10
-
-[update]
-kde = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-always/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-always/.calculate_directory
deleted file mode 100644
index c2b079cfa..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/KDE-always/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env(client.os_remote_auth)==&&ini(domain)!=#-env(client.os_remote_auth)-#||ur_domain_set==off&&ini(domain)!=#-env(client.os_remote_auth)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.calculate/ini.env
deleted file mode 100644
index ecd4a7165..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-akregator = 4.4
-
-[update]
-akregator = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.calculate_directory
deleted file mode 100644
index 2cb2c260f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.kde4/share/apps/akregator)==&&ini(update.akregator)!=off&&ini(ver.akregator)==&&pkg()>=1.7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.kde4/share/apps/akregator/data/feeds.opml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.kde4/share/apps/akregator/data/feeds.opml
deleted file mode 100644
index 926e4eab5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/akregator-4.4/.kde4/share/apps/akregator/data/feeds.opml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<opml version="1.0">
- <head>
-  <text/>
- </head>
- <body>
-#?os_locale_language!=ru#
-  <outline isOpen="true" id="1650375233" text="Calculate Linux">
-   <outline title="Planet Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.org/blogs/en" xmlUrl="http://www.calculate-linux.org/blogs/en?format=atom&amp;key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="470886927" archiveMode="globalDefault" maxArticleNumber="99" text="Planet Calculate"/>
-   <outline title="Forums Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.org/en/projects/en/activity?show_messages=1" xmlUrl="http://www.calculate-linux.org/en/projects/en/activity.atom?key=#-os_linux_shortname-##-os_linux_ver-#&amp;show_messages=1" fetchInterval="30" type="rss" id="2004192351" archiveMode="globalDefault" maxArticleNumber="99" text="Forums Calculate"/>
-   <outline title="Gentoo Linux Security Advisories" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.org/glsa" xmlUrl="http://www.calculate-linux.org/glsa?format=atom&amp;key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="938840957" archiveMode="globalDefault" maxArticleNumber="99" text="Gentoo Linux Security Advisories"/>
-   <outline title="New Packages Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.org/packages/newset" xmlUrl="http://www.calculate-linux.org/packages/newset?format=atom&amp;key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="2011593012" archiveMode="globalDefault" maxArticleNumber="99" text="New Packages Calculate"/>
-   <outline title="News Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.org/news" xmlUrl="http://www.calculate-linux.org/news.atom?key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="929835368" archiveMode="globalDefault" maxArticleNumber="99" text="News Calculate"/>
-   <outline title="Issues Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.org/projects/calculatelinux/issues" xmlUrl="http://www.calculate-linux.org/projects/calculatelinux/issues.atom?key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="467385448" archiveMode="globalDefault" maxArticleNumber="99" text="Issues Calculate"/>
-  </outline>
-  <outline isOpen="true" id="295884796" text="Open Source">
-   <outline title="DistroWatch.com: News" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="Latest news on Linux distributions and BSD projects" htmlUrl="http://distrowatch.com/" xmlUrl="http://distrowatch.com/news/dw.xml" fetchInterval="30" type="rss" id="1493585086" archiveMode="globalDefault" maxArticleNumber="99" text="DistroWatch.com: News"/>
-   <outline title="LinuxTracker" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="Last ten linux torrents uploaded to Linuxtracker.org" htmlUrl="http://linuxtracker.org" xmlUrl="http://feeds.feedburner.com/Linuxtracker" fetchInterval="30" type="rss" id="1131344674" archiveMode="globalDefault" maxArticleNumber="99" text="LinuxTracker"/>
-  </outline>
-#os_locale_language#
-#?os_locale_language==ru#
-  <outline isOpen="true" id="2023840312" text="Calculate Linux">
-   <outline title="Планета Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.ru/blogs/ru" xmlUrl="http://www.calculate-linux.ru/blogs/ru?format=atom&amp;key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="1796570601" archiveMode="globalDefault" maxArticleNumber="99" text="Планета Calculate"/>
-   <outline title="Форумы Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.ru/ru/projects/ru/activity?show_messages=1" xmlUrl="http://www.calculate-linux.ru/ru/projects/ru/activity.atom?key=#-os_linux_shortname-##-os_linux_ver-#&amp;show_messages=1" fetchInterval="30" type="rss" id="1816994591" archiveMode="globalDefault" maxArticleNumber="99" text="Форумы Calculate"/>
-   <outline title="Уведомлени� о безопа�но�ти GLSA" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.ru/glsa" xmlUrl="http://www.calculate-linux.ru/glsa?format=atom&amp;key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="268867290" archiveMode="globalDefault" maxArticleNumber="99" text="Уведомлени� о безопа�но�ти GLSA"/>
-   <outline title="�овые пакеты Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.ru/packages/newset" xmlUrl="http://www.calculate-linux.ru/packages/newset?format=atom&amp;key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="1771954734" archiveMode="globalDefault" maxArticleNumber="99" text="�овые пакеты Calculate"/>
-   <outline title="�ово�ти Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.ru/news" xmlUrl="http://www.calculate-linux.ru/news.atom?key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="630766727" archiveMode="globalDefault" maxArticleNumber="99" text="�ово�ти Calculate"/>
-   <outline title="Задачи Calculate" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="" htmlUrl="http://www.calculate-linux.ru/projects/calculatelinux/issues" xmlUrl="http://www.calculate-linux.ru/projects/calculatelinux/issues.atom?key=#-os_linux_shortname-##-os_linux_ver-#" fetchInterval="30" type="rss" id="13563605" archiveMode="globalDefault" maxArticleNumber="99" text="Задачи Calculate"/>
-  </outline>
-  <outline isOpen="true" id="1911850296" text="Свободное программное обе�печение">
-   <outline title="Linuxoid - в�е что знаю о Тук�е" useCustomFetchInterval="false" version="RSS" maxArticleAge="60" description="Блог об OpenSource" htmlUrl="http://www.tux.in.ua" xmlUrl="http://feeds.feedburner.com/in/JEEz" fetchInterval="30" type="rss" id="209437315" archiveMode="globalDefault" maxArticleNumber="99" text="Linuxoid - в�е что знаю о Тук�е"/>
-  </outline>
-#os_locale_language#
- </body>
-</opml>
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/.calculate/ini.env
deleted file mode 100644
index 098db9af4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-kmail = 4.7
-
-[update]
-kmail = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/.calculate_directory
deleted file mode 100644
index 4fe80c6c4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.kmail)!=off&&ini(ver.kmail)==&&pkg()>=4.7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/headerthemeeditor.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/headerthemeeditor.desktop
deleted file mode 100644
index 52bb42bf0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/headerthemeeditor.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications/kde4 link=/usr/share/applications/kde4/headerthemeeditor.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/importwizard.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/importwizard.desktop
deleted file mode 100644
index 56cdb1080..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/importwizard.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications/kde4 link=/usr/share/applications/kde4/importwizard.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/kmail2rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/kmail2rc
deleted file mode 100644
index ce3a6f9c8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/kmail2rc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-[Composer]
-use-fixed-font=true
-
-[General]
-first-start=false
-SystemTrayEnabled=true
-SystemTrayPolicy=ShowAlways
-
-[TipOfDay]
-RunOnStart=false
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/pimsettingexporter.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/pimsettingexporter.desktop
deleted file mode 100644
index fefade97f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/kmail-4.7/pimsettingexporter.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications/kde4 link=/usr/share/applications/kde4/pimsettingexporter.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/.calculate_directory
deleted file mode 100644
index e02fcedc6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.plasma)!=off&&ini(ver.plasma)==&&pkg()>=4.10&&pkg()<5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/activitymanagerrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/activitymanagerrc
deleted file mode 100644
index aa2827b51..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/activitymanagerrc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=plasma append=replace path=~/.kde4/share/config
-[activities]
-4f06b54b-38f1-4338-94a6-44a6f2a3eecc=New room
-
-[main]
-currentActivity=4f06b54b-38f1-4338-94a6-44a6f2a3eecc
-lastUnlockedActivity=4f06b54b-38f1-4338-94a6-44a6f2a3eecc
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/ini.env
deleted file mode 100644
index 65a34fa6f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-plasma = 4.10
-
-[update]
-plasma = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-desktop-appletsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-desktop-appletsrc
deleted file mode 100644
index 266acff6c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-desktop-appletsrc
+++ /dev/null
@@ -1,360 +0,0 @@
-# Calculate format=plasma append=replace path=~/.kde4/share/config
-#------------------------------------------------------------------------------
-#рабочий �тол
-#------------------------------------------------------------------------------
-[AppletGlobals][plasma_applet_pager]
-rows=1
-
-[Containments][#-sum(cont,1)-#]
-activity=
-activityId=4f06b54b-38f1-4338-94a6-44a6f2a3eecc
-alignToGrid=true
-customIconSize=48
-desktop=0
-filter=0
-filterFiles=*
-formfactor=0
-geometry=0,0,#-os_x11_width-#,#-os_x11_height-#
-iconsLocked=false
-immutability=1
-location=0
-mimeFilter=
-plugin=folderview
-screen=0
-Url=desktop:/
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-#-sum(iconx,,10)-#
-#-sum(icony,,10)-#
-#-sum(iconcx,,112)-#
-#-sum(iconcy,,100)-#
-#-sum(iconcount,,2)-#
-savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
-zvalue=0
-sortColumn=-1
-
-[Containments][#-sum(cont,cont)-#][Wallpaper][image]
-slideTimer=600
-slidepaths=/usr/share/wallpapers/
-userswallpapers=
-wallpaper=/usr/share/wallpapers/Calculate_Linux
-wallpapercolor=56,111,150
-wallpaperposition=0
-
-#------------------------------------------------------------------------------
-#верхн�� панель
-#------------------------------------------------------------------------------
-#-sum(panel,,36)-#
-#-sum(apporder,,0)-#
-
-[Containments][-#-sum(cont,cont+1)-#]
-desktop=-1
-formfactor=2
-geometry=0,0,#-os_x11_width-#,#-sum(panel,panel)-#
-immutability=1
-location=3
-plugin=panel
-screen=0
-zvalue=150
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#]
-immutability=1
-plugin=simplelauncher
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(x11-themes/calculate-icon-theme)<14-r6#
-icon=start-calculate
-#pkg#
-views=Applications,RunCommand,SwitchUser,LockScreen,Leave
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder)-#
-
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=folderview
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-url=file:///home/#-ur_login-#
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-#env#
-
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=folderview
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-url=file:///home/#-ur_login-#/Home
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=folderview
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-url=file:///home/#-ur_login-#/Share
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-#env#
-
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=#
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=folderview
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-url=file:///home/#-ur_login-#/FTP
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-#env#
-#?server(ftp.host)==#
-[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
-#-sum(apporder,,apporder+1)-#
-#server#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=pager
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#показывать номер рабочего �тола - 0
-displayedText=0
-#отображать значки
-showWindowIcons=true
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=2
-plugin=showdesktop
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=tasks
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#группирование
-groupingStrategy=0
-#мак�имум �трок
-maxRows=1
-#показывать задачи только � текущего рабочего �тола
-showOnlyCurrentDesktop=true
-#�ортировка
-sortingStrategy=0
-# не показывать в�плывающие под�казки на панели задач
-showTooltip=false
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=trash
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=systemtray
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-hidden=kwalletmanager
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=digital-clock
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][998]
-immutability=2
-plugin=lockout
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][998][Configuration][General]
-show_leave=false
-[Containments][#-sum(cont,cont)-#][Applets][998][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][999]
-immutability=2
-plugin=lockout
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][999][Configuration][General]
-show_lock=false
-[Containments][#-sum(cont,cont)-#][Applets][999][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Configuration]
-maximumSize=#-os_x11_width-#,#-sum(panel,panel)-#
-minimumSize=#-os_x11_width-#,#-sum(panel,panel)-#
-
-#------------------------------------------------------------------------------
-#нижн�� панель
-#------------------------------------------------------------------------------
-
-#-sum(height,,56)-#
-#?hr_cdrom_set==on#
-#-sum(width,,height*13)-#
-#hr_cdrom_set#
-#?hr_cdrom_set==off#
-#-sum(width,,height*12)-#
-#hr_cdrom_set#
-#-sum(apporder,,0)-#
-
-#?pkg(net-irc/konversation)!=#
-#-sum(width,,width+height)-#
-#pkg#
-
-[Containments][-#-sum(cont,cont+1)-#]
-desktop=-1
-formfactor=2
-geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-#
-immutability=1
-location=4
-plugin=panel
-screen=0
-zvalue=150
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-browser.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-mail.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-#?pkg(net-irc/konversation)!=#
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-chat.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-#pkg#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-im.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-writer.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-calc.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-calculator.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-imageedit.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-audioplayer.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-videoplayer.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-#?hr_cdrom_set==on#
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-imageburn.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-#hr_cdrom_set#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-textedit.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/calculate-terminal.desktop
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
-Order=#-sum(apporder,apporder+1)-#
-
-[General]
-immutability=2
-
-[Containments][#-sum(cont,cont)-#][Configuration]
-maximumSize=#-sum(width,width)-#,#-sum(height,height)-#
-minimumSize=#-sum(width,width)-#,#-sum(height,height)-#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-desktoprc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-desktoprc
deleted file mode 100644
index e3ebabbd8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-desktoprc
+++ /dev/null
@@ -1,133 +0,0 @@
-# Calculate format=plasma path=~/.kde4/share/config
-
-# location of panels
-[PlasmaViews][1]
-Alignment=132
-Offset=0
-panelVisibility=1
-
-[PlasmaViews][2]
-Alignment=132
-Offset=0
-panelVisibility=1
-
-[PlasmaViews][3]
-Offset=0
-panelVisibility=0
-
-[PlasmaViews][3][Sizes]
-lastsize=0
-
-[PlasmaViews][3][Sizes][Horizontal1920]
-max=1920,36
-min=1920,36
-offset=0
-size=1920,36
-
-[PlasmaViews][3][Sizes][Horizontal640]
-max=640,36
-min=640,36
-offset=0
-size=640,36
-
-[PlasmaViews][3][Sizes][Horizontal720]
-max=720,36
-min=720,36
-offset=0
-size=720,36
-
-[PlasmaViews][3][Sizes][Horizontal800]
-max=800,36
-min=800,36
-offset=0
-size=800,36
-
-[PlasmaViews][3][Sizes][Horizontal1024]
-max=1024,36
-min=1024,36
-offset=0
-size=1024,36
-
-[PlasmaViews][3][Sizes][Horizontal1152]
-max=1152,36
-min=1152,36
-offset=0
-size=1152,36
-
-[PlasmaViews][3][Sizes][Horizontal1200]
-max=1200,36
-min=1200,36
-offset=0
-size=1200,36
-
-[PlasmaViews][3][Sizes][Horizontal1280]
-max=1280,36
-min=1280,36
-offset=0
-size=1280,36
-
-[PlasmaViews][3][Sizes][Horizontal1360]
-max=1360,36
-min=1360,36
-offset=0
-size=1360,36
-
-[PlasmaViews][3][Sizes][Horizontal1366]
-max=1366,36
-min=1366,36
-offset=0
-size=1366,36
-
-[PlasmaViews][3][Sizes][Horizontal1368]
-max=1368,36
-min=1368,36
-offset=0
-size=1368,36
-
-[PlasmaViews][3][Sizes][Horizontal1400]
-max=1400,36
-min=1400,36
-offset=0
-size=1400,36
-
-[PlasmaViews][3][Sizes][Horizontal1440]
-max=1440,36
-min=1440,36
-offset=0
-size=1440,36
-
-[PlasmaViews][3][Sizes][Horizontal1600]
-max=1600,36
-min=1600,36
-offset=0
-size=1600,36
-
-[PlasmaViews][3][Sizes][Horizontal1680]
-max=1680,36
-min=1680,36
-offset=0
-size=1680,36
-
-[PlasmaViews][3][Sizes][Horizontal1920]
-max=1920,36
-min=1920,36
-offset=0
-size=1920,36
-
-[PlasmaViews][3][Sizes][Horizontal2048]
-max=2048,36
-min=2048,36
-offset=0
-size=2048,36
-
-[PlasmaViews][3][Sizes][Horizontal2560]
-max=2560,36
-min=2560,36
-offset=0
-size=2560,36
-
-[ViewIds]
-1=1
-2=3
-3=2
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc
deleted file mode 100644
index 888d3a43f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc
+++ /dev/null
@@ -1,44 +0,0 @@
-# Calculate format=plasma path=~/.kde4/share/config
-[ActionPlugins]
-RightButton;NoModifier=minimalcontextmenu
-
-[Containments][1]
-ActionPluginsSource=Global
-activity=
-activityId=
-desktop=-1
-formfactor=0
-immutability=1
-lastDesktop=-1
-lastScreen=0
-location=0
-plugin=saverdesktop
-screen=0
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-zvalue=0
-
-[Containments][1][Applets][2]
-geometry=4,4,256,256
-immutability=1
-plugin=clock
-zvalue=0
-
-[Containments][1][Applets][2][Configuration]
-timezone=Local
-
-[Containments][1][Wallpaper][image]
-slideTimer=10
-slidepaths=/usr/share/wallpapers/
-userswallpapers=
-#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
-wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-wallpaper(#-os_x11_resolution-#,/usr/share/wallpapers/Calculate-dm/contents/images)-#
-#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
-wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
-#pkg#
-wallpapercolor=0,0,0
-wallpaperposition=0
-
-[General]
-immutability=2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasmarc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasmarc
deleted file mode 100644
index b95f60c95..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasmarc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=plasma path=~/.kde4/share/config
-#оформление
-[Theme]
-name=Calculate
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
deleted file mode 100644
index e237b54d3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()>=5.21&&ini(update.breeze-icons)!=off&&ini(ver.breeze-icons)<5.21
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
deleted file mode 100644
index bc8ca1b22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-breeze-icons = 5.21
-
-[update]
-breeze-icons = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
deleted file mode 100644
index 739299626..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.cache name=icon-cache.kcache append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
deleted file mode 100644
index ff871d4ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.kwallet)!=off&&ini(ver.kwallet)<5.21&&pkg()>=5.21
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
deleted file mode 100644
index 225fe8de3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kwallet = 5.21
-
-[update]
-kwallet = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
deleted file mode 100644
index 26bc0bf40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.local/share exists(~/.local/share/kwalletd/kdewallet.kwl)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl
deleted file mode 100644
index a976d8c64..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
deleted file mode 100644
index bb68a8f2a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
+++ /dev/null
@@ -1,2 +0,0 @@
-¯"TKuFW „~{÷GÀ^›¶·"²rÙˇ®ó
-šË©žAÞôiKÂÑÖ‘5
ŒÈ
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletrc
deleted file mode 100644
index 8b0ee1fa5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=~/.config
-
-[Wallet]
-First Use=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
deleted file mode 100644
index ed837f185..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(lxqt-base/lxqt-session)!=&&ini(update.lxqt)!=off&&ini(ver.lxqt)==&&pkg(lxqt-base/lxqt-session)>=0.10
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
deleted file mode 100644
index 9e540dfca..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=kde
-
-[Print.1]
-Comment=Print Screen
-Enabled=true
-Exec=screengrab
-
-[Alt%2BPrint.2]
-Comment=Print active screen
-Enabled=true
-Exec=screengrab, --active
-
-[Control%2BAlt%2BEscape.3]
-Comment=Kill window
-Enabled=true
-Exec=xkill
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
deleted file mode 100644
index 0fda7599e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde
-[Formats]
-LANG=#-os_locale_lang-#.UTF-8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
deleted file mode 100644
index 259675e57..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde
-[General]
-__userfile__=true
-#?hr_laptop==#
-enableBatteryWatcher=false
-enableLidWatcher=false
-#hr_laptop#
-idlenessAction=-2
-idlenessTimeSecs=1200
-powerLowLevel=10
-runCheckLevel=1
-useThemeIcons=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
deleted file mode 100644
index a9a59edf4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde
-[General]
-__userfile__=true
-icon_theme=Calculate
-single_click_activate=true
-theme=dark
-
-[Qt]
-font="Droid Sans,10,-1,5,50,0,0,0,0,0"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
deleted file mode 100644
index a993756ec..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-[General]
-__userfile__=true
-placement=top-right
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
deleted file mode 100644
index 1bb582083..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
+++ /dev/null
@@ -1,159 +0,0 @@
-# Calculate format=kde
-[General]
-__userfile__=true
-panels=panel1, panel2
-
-[panel1]
-alignment=-1
-background-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0)
-background-image=
-desktop=0
-font-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0)
-hidable=false
-iconSize=22
-lineCount=1
-opacity=100
-panelSize=32
-plugins=mainmenu1, directorymenu1, desktopswitch1, showdesktop1, taskbar1, tray1, mount1, volume1, kbindicator1, clock1, quicklaunch1
-position=Top
-width=100
-width-percent=true
-
-[mainmenu1]
-alignment=Left
-type=mainmenu
-
-[directorymenu1]
-alignment=Left
-type=directorymenu
-baseDirectory=/home/#-ur_login-#
-icon=/usr/share/icons/oxygen/base/32x32/places/user-home.png
-
-[desktopswitch1]
-alignment=Left
-type=desktopswitch
-
-[showdesktop1]
-alignment=Left
-type=showdesktop
-
-[taskbar1]
-alignment=Left
-buttonWidth=280
-groupingEnabled=false
-showOnlyOneDesktopTasks=true
-type=taskbar
-
-[tray1]
-alignment=Right
-type=tray
-
-[mount1]
-alignment=Right
-newDeviceAction=showInfo
-type=mount
-
-[volume1]
-alignment=Right
-type=volume
-#?install.os_audio==alsa#
-audioEngine=Alsa
-mixerCommand=qasmixer
-#install.os_audio#
-#?install.os_audio==pulseaudio#
-audioEngine=PulseAudio
-mixerCommand=pavucontrol
-#install.os_audio#
-
-[kbindicator1]
-alignment=Right
-keeper_type=application
-show_caps_lock=false
-show_layout=true
-show_num_lock=false
-show_scroll_lock=false
-type=kbindicator
-
-[clock1]
-alignment=Right
-type=clock
-
-[quicklaunch1]
-alignment=Left
-apps\1\desktop=/usr/share/applications/lxqt-lockscreen.desktop
-apps\2\desktop=/usr/share/applications/lxqt-shutdown.desktop
-apps\size=2
-type=quicklaunch
-
-[quicklaunch2]
-alignment=Left
-#?exists(/usr/share/applications/calculate-browser.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-browser.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-mail.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-mail.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-chat.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-chat.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-im.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-im.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-writer.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-writer.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-calc.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-calc.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-calculator.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-calculator.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-imageedit.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-imageedit.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-imageview.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-imageview.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-audioplayer.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-audioplayer.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-videoplayer.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-videoplayer.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-textedit.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-textedit.desktop
-#-sum(width,,width+57)-#
-#exists#
-#?exists(/usr/share/applications/calculate-terminal.desktop)!=#
-apps\#-sum(num,num+1)-#\desktop=/usr/share/applications/calculate-terminal.desktop
-#-sum(width,,width+57)-#
-#exists#
-apps\size=#-sum(sum,num)-#
-type=quicklaunch
-
-[panel2]
-alignment=0
-background-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0)
-background-image=
-desktop=0
-font-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0)
-hidable=true
-iconSize=48
-lineCount=1
-opacity=100
-panelSize=56
-plugins=quicklaunch2
-position=Bottom
-width=#-sum(width,width)-#
-width-percent=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
deleted file mode 100644
index febc1e074..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=kde
-[General]
-__userfile__=true
-
-[Environment]
-#?ini(desktop.browser)#
-BROWSER=#-ini(desktop.browser)-#
-#ini#
-#?ini(desktop.terminal)#
-TERM=#-ini(desktop.terminal)-#
-#ini#
-
-[Mouse]
-cursor_theme=Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
deleted file mode 100644
index 391eaa714..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=rc.xml symbolic
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
deleted file mode 100644
index 727d88f51..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=kde
-[Home-nodomain.desktop]
-pos=@Point(12 44)
-
-[README.desktop]
-pos=@Point(12 150)
-
-[calculate-community.desktop]
-pos=@Point(108 150)
-
-[calculate-install.desktop]
-pos=@Point(12 256)
-
-[gparted.desktop]
-pos=@Point(108 256)
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
deleted file mode 100644
index edee09283..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=kde
-[Behavior]
-SingleClick=true
-
-[Desktop]
-Font="Droid Sans,10,-1,5,50,0,0,0,0,0"
-Wallpaper=/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-install.os_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-#
-WallpaperMode=stretch
-
-[System]
-Archiver=xarchiver
-SuCommand=lxqt-sudo -s %s
-Terminal=qterminal
-
-[Volume]
-MountOnStartup=false
-MountRemovable=false
-
-[Window]
-AlwaysShowTabs=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
deleted file mode 100644
index 7ad710d27..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde
-[General]
-AlwaysShowTabs=false
-AskOnExit=false
-font=@Variant(\0\0\0@\0\0\0.\0\x44\0r\0o\0i\0\x64\0 \0S\0\x61\0n\0s\0 \0M\0o\0n\0o\0 \0S\0l\0\x61\0s\0h\0\x65\0\x64@$\0\0\0\0\0\0\xff\xff\xff\xff\x2\x1\0\x32\x10)
-HistoryLimitedTo=10000
-highlightCurrentTerminal=false
-colorScheme=Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
deleted file mode 100644
index 879d99897..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
deleted file mode 100644
index 8f91d3264..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=FTP
-Comment=Browser FTP
-Categories=Application;
-Exec=pcmanfm-qt /home/#-ur_login-#/FTP
-Icon=update-manager
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
deleted file mode 100644
index 8e7a0d057..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)==||ur_domain_set==off append=replace
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Home
-Name[ru]=Домашн�� папка
-Comment=Browser Home
-Categories=Application;
-Exec=pcmanfm-qt /home/#-ur_login-#
-Icon=user-home
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
deleted file mode 100644
index c2ef3e1da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on append=replace
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Home
-Comment=Browser Home
-Categories=Application;
-Exec=pcmanfm-qt /home/#-ur_login-#/Home
-Icon=user-home
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
deleted file mode 100644
index 3e286ae40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate chmod=755 os_root_type==livecd
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name[bg]=Ръковод�тво за ин�талиране
-Name[ru]=Руковод�тво по у�тановке
-Name=Installation Guide
-Comment=
-Categories=Application;
-#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
-#os_locale_language#
-#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
-#os_locale_language#
-Icon=help-contents
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
deleted file mode 100644
index 4b0907ce0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Share
-Comment=Browser Share
-Categories=Application;
-Exec=pcmanfm-qt /home/#-ur_login-#/Share
-Icon=folder-remote
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
deleted file mode 100644
index c58ec7438..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/calculate-chat.desktop mirror os_root_type==livecd
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
deleted file mode 100644
index b65a60076..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/cl-console-gui-install.desktop os_root_type==livecd mirror
-[Desktop Entry]
-NoDisplay=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
deleted file mode 100644
index fadd87f4d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/gparted.desktop mirror os_root_type==livecd
-[Desktop Entry]
-Exec=sudo /usr/sbin/gparted %f
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
deleted file mode 100644
index 610795566..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate path=~/.calculate format=samba
-
-[ver]
-lxqt = 0.10
-
-[update]
-lxqt = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
deleted file mode 100644
index 84c67cf2a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-claws-mail = 3.10
-
-[update]
-claws-mail = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
deleted file mode 100644
index 252664520..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.claws-mail)!=off&&ini(ver.claws-mail)==&&pkg()>=3.10
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
deleted file mode 100644
index a7e3f35ac..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
+++ /dev/null
@@ -1,97 +0,0 @@
-# Calculate format=samba
-[AccountTemplate]
-#you can use $DEFAULTDOMAIN here
-#domain must be defined before the variables that use it
-#by default, domain is extracted from the hostname
-#domain=
-
-#you can use $USERNAME for name (this is the default)
-name=#-ur_fullname-#
-
-#you can use $LOGIN, $NAME_MAIL and $DOMAIN here 
-#$NAME_MAIL is the name without uppercase and with dots instead
-#of spaces
-#the default is $NAME_MAIL@$DOMAIN
-email=#-ur_mail-#
-
-#you can use $DOMAIN here
-#the default organization is empty
-organization=#-server(mail.organization)-#
-
-#you can use $DOMAIN here 
-#the default is smtp.$DOMAIN
-smtpserver=#-server(mail.send_host)-#
-
-#Whether to use smtp authentication
-#the default is 0 (no)
-#smtpauth=
-
-#SMTP username
-#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here
-#the default is empty (same as reception username)
-#smtpuser=
-
-#SMTP password
-#the default is empty (same as reception password)
-#smtppass=
-
-#recvtype can be:
-#0 for pop3
-#3  for imap
-#5  for a local mbox file
-recvtype=3
-
-imap_subsonly=0
-
-#you can use $DOMAIN here 
-#the default is {pop,imap}.$DOMAIN
-recvserver=#-server(mail.host)-#
-
-#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here
-#default is $LOGIN
-#recvuser=
-
-#default is empty
-#recvpass=
-
-#imap dir if imap (relative to the home on the server)
-#default is empty
-#imapdir=
-
-#show subscribed folders only, if imap
-#default is TRUE
-#subsonly=
-
-#mbox file if local
-#you can use $LOGIN here
-#default is /var/mail/$LOGIN
-#mboxfile=
-
-#mailbox name if pop3 or local
-#relative path from the user's home
-#default is "Mail"
-#mailbox=
-
-#whether to use ssl on smtp connections
-#default is 0, 1 is ssl, 2 is starttls
-#smtpssl=
-
-#whether to use ssl on pop or imap connections
-#default is 0, 1 is ssl, 2 is starttls
-recvssl=2
-
-#SSL client certificate path for SMTP
-#default is empty (no certificate)
-#smtpssl_cert=
-
-#SSL client certificate path for POP/IMAP
-#default is empty (no certificate)
-#recvssl_cert=
-
-#SSL client certificate password for SMTP
-#default is empty (no password)
-#smtpssl_cert_pass=
-
-#SSL client certificate password for POP/IMAP
-#default is empty (no password)
-#recvssl_cert_pass=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
deleted file mode 100644
index dd0310837..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
+++ /dev/null
@@ -1,55 +0,0 @@
-[Common]
-#открывать выбранные �ообщени�
-always_show_message_when_selected=1
-#автоматиче�ки провер�ть наличие новых �ообщений
-autochk_newmail=1
-#интервал проверки почты
-autochk_interval=5
-#провер�ть почту при запу�ке
-check_on_startup=1
-#показывать кол-во �ообщений в имени папки
-display_folder_unread_num=2
-#отображаемые �толбцы
-folder_col_show_new=0
-folder_col_show_unread=0
-folder_col_show_total=0
-folder_col_pos_folder=3
-folder_col_pos_new=2
-folder_col_pos_unread=1
-folder_col_pos_total=0
-message_font_gtk2=Droid Sans Mono Slashed 10
-normal_font_gtk2=Droid Sans 10
-never_send_retrcpt=1
-uri_open_command=xdg-open '%s'
-ext_editor_command=xdg-open '%s'
-mime_textviewer=xdg-open '%s'
-#?pkg(x11-themes/claws-mail-theme-calculate)!=#
-pixmap_theme_path=/usr/share/claws-mail/themes/Calculate
-#pkg#
-#?os_locale_lang!=en_US#
-alt_dictionary=en_US
-use_alternate_dict=1
-use_both_dicts=1
-#os_locale_lang#
-reply_quote_format=%X\n\nOn %d\n%f wrote:\n\n%q
-
-[NotificationPlugin]
-popup_show=0
-trayicon_close_to_tray=1
-trayicon_enabled=1
-trayicon_popup_enabled=0
-
-[Plugins_GTK2]
-/usr/lib/claws-mail/plugins/address_keeper.so
-/usr/lib/claws-mail/plugins/fancy.so
-/usr/lib/claws-mail/plugins/libravatar.so
-/usr/lib/claws-mail/plugins/notification.so
-/usr/lib/claws-mail/plugins/pdf_viewer.so
-
-[AddressKeeper]
-addressbook_folder=addrbook-000001.xml
-
-[fancy]
-auto_load_images=1
-open_external=1
-lock_extern_content=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
deleted file mode 100644
index 03d7ea505..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
+++ /dev/null
@@ -1 +0,0 @@
-#-server(mail.signature,signature)-##-replace('\n',"\n",signature)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
deleted file mode 100644
index 84c67cf2a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-claws-mail = 3.10
-
-[update]
-claws-mail = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
deleted file mode 100644
index 1ee06ba61..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(mail-client/claws-mail)!=&&ini(update.claws-mail)!=off&&ini(ver.claws-mail)!=&&ini(ver.claws-mail)>=3.7&&ini(ver.claws-mail)<3.10&&pkg(mail-client/claws-mail)>=3.10
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
deleted file mode 100644
index ad4cf24f2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=patch dotall
-<reg>\[NotificationPlugin\].*?(?=\[|$)</reg>
-<text></text>
-<reg>\[Plugins_GTK2\].*?(?=\[|$)</reg>
-<text>[Plugins_GTK2]
-/usr/lib/claws-mail/plugins/address_keeper.so
-/usr/lib/claws-mail/plugins/fancy.so
-/usr/lib/claws-mail/plugins/libravatar.so
-/usr/lib/claws-mail/plugins/notification.so
-/usr/lib/claws-mail/plugins/pdf_viewer.so
-
-[NotificationPlugin]
-popup_show=0
-trayicon_close_to_tray=1
-trayicon_enabled=1
-trayicon_popup_enabled=0
-
-</text>
-<reg>\[TrayIcon\].*?(?=\[|$)</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
deleted file mode 100644
index f3e5dc686..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-claws-mail = 3.7
-
-[update]
-claws-mail = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
deleted file mode 100644
index ac212ba19..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.claws-mail)!=off&&ini(ver.claws-mail)==&&pkg()>=3.7&&pkg()<3.10
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
deleted file mode 100644
index a7e3f35ac..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
+++ /dev/null
@@ -1,97 +0,0 @@
-# Calculate format=samba
-[AccountTemplate]
-#you can use $DEFAULTDOMAIN here
-#domain must be defined before the variables that use it
-#by default, domain is extracted from the hostname
-#domain=
-
-#you can use $USERNAME for name (this is the default)
-name=#-ur_fullname-#
-
-#you can use $LOGIN, $NAME_MAIL and $DOMAIN here 
-#$NAME_MAIL is the name without uppercase and with dots instead
-#of spaces
-#the default is $NAME_MAIL@$DOMAIN
-email=#-ur_mail-#
-
-#you can use $DOMAIN here
-#the default organization is empty
-organization=#-server(mail.organization)-#
-
-#you can use $DOMAIN here 
-#the default is smtp.$DOMAIN
-smtpserver=#-server(mail.send_host)-#
-
-#Whether to use smtp authentication
-#the default is 0 (no)
-#smtpauth=
-
-#SMTP username
-#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here
-#the default is empty (same as reception username)
-#smtpuser=
-
-#SMTP password
-#the default is empty (same as reception password)
-#smtppass=
-
-#recvtype can be:
-#0 for pop3
-#3  for imap
-#5  for a local mbox file
-recvtype=3
-
-imap_subsonly=0
-
-#you can use $DOMAIN here 
-#the default is {pop,imap}.$DOMAIN
-recvserver=#-server(mail.host)-#
-
-#you can use $LOGIN, $NAME_MAIL, $DOMAIN or $EMAIL here
-#default is $LOGIN
-#recvuser=
-
-#default is empty
-#recvpass=
-
-#imap dir if imap (relative to the home on the server)
-#default is empty
-#imapdir=
-
-#show subscribed folders only, if imap
-#default is TRUE
-#subsonly=
-
-#mbox file if local
-#you can use $LOGIN here
-#default is /var/mail/$LOGIN
-#mboxfile=
-
-#mailbox name if pop3 or local
-#relative path from the user's home
-#default is "Mail"
-#mailbox=
-
-#whether to use ssl on smtp connections
-#default is 0, 1 is ssl, 2 is starttls
-#smtpssl=
-
-#whether to use ssl on pop or imap connections
-#default is 0, 1 is ssl, 2 is starttls
-recvssl=2
-
-#SSL client certificate path for SMTP
-#default is empty (no certificate)
-#smtpssl_cert=
-
-#SSL client certificate path for POP/IMAP
-#default is empty (no certificate)
-#recvssl_cert=
-
-#SSL client certificate password for SMTP
-#default is empty (no password)
-#smtpssl_cert_pass=
-
-#SSL client certificate password for POP/IMAP
-#default is empty (no password)
-#recvssl_cert_pass=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
deleted file mode 100644
index 3903d0016..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
+++ /dev/null
@@ -1,54 +0,0 @@
-[Common]
-#открывать выбранные �ообщени�
-always_show_message_when_selected=1
-#автоматиче�ки провер�ть наличие новых �ообщений
-autochk_newmail=1
-#интервал проверки почты
-autochk_interval=5
-#провер�ть почту при запу�ке
-check_on_startup=1
-#показывать кол-во �ообщений в имени папки
-display_folder_unread_num=2
-#отображаемые �толбцы
-folder_col_show_new=0
-folder_col_show_unread=0
-folder_col_show_total=0
-folder_col_pos_folder=3
-folder_col_pos_new=2
-folder_col_pos_unread=1
-folder_col_pos_total=0
-message_font_gtk2=Droid Sans Mono Slashed 10
-normal_font_gtk2=Droid Sans 10
-never_send_retrcpt=1
-uri_open_command=xdg-open '%s'
-ext_editor_command=xdg-open '%s'
-mime_textviewer=xdg-open '%s'
-#?pkg(x11-themes/claws-mail-theme-calculate)!=#
-pixmap_theme_path=/usr/share/claws-mail/themes/Calculate
-#pkg#
-#?os_locale_lang!=en_US#
-alt_dictionary=en_US
-use_alternate_dict=1
-use_both_dicts=1
-#os_locale_lang#
-
-[Plugins_GTK2]
-/usr/lib/claws-mail/plugins/address_keeper.so
-# плагин �ворачивани� окна в трей
-/usr/lib/claws-mail/plugins/trayicon.so
-# плагин отображени� HTML
-/usr/lib/claws-mail/plugins/fancy.so
-
-[TrayIcon]
-# закрывать окно в трей
-close_to_tray=1
-# не минимизировать окно в трей
-hide_when_iconified=0
-
-[AddressKeeper]
-addressbook_folder=addrbook-000001.xml
-
-[fancy]
-auto_load_images=1
-open_external=1
-lock_extern_content=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
deleted file mode 100644
index 03d7ea505..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
+++ /dev/null
@@ -1 +0,0 @@
-#-server(mail.signature,signature)-##-replace('\n',"\n",signature)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.calculate/ini.env
deleted file mode 100644
index b53ddc7d0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-evolution = 2.26
-
-[update]
-evolution = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.calculate_directory
deleted file mode 100644
index 5227cd08b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.evolution)!=off&&ini(ver.evolution)==&&pkg()>=2.26
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml
deleted file mode 100644
index 8af96fa33..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<tree-state>
-#-push(serial,#-rnd(num,2)-#)-#
-#-push(pid,#-rnd(num,5)-#)-#
-#-push(mtime,#-rnd(num,10)-#)-#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-  <node name="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#" expand="true"/>
-  <selected uri="imap://#-ur_login-#@#server(mail.host)-#/INBOX"/>
-#env#
-</tree-state>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.evolution/signatures/default b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.evolution/signatures/default
deleted file mode 100644
index 03d7ea505..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.evolution/signatures/default
+++ /dev/null
@@ -1 +0,0 @@
-#-server(mail.signature,signature)-##-replace('\n',"\n",signature)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/%gconf.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/%gconf.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/%gconf.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/%gconf.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/%gconf.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/%gconf.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
deleted file mode 100644
index e7e97c6f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calculate format=xml_gconf env(client.os_remote_auth)!=&&ur_domain_set==on
-<?xml version="1.0"?>
-<gconf>
-	#-pop(mtime)-#
-	#-pop(pid)-#
-	#-pop(serial)-#
-	<entry name="signatures" type="list" ltype="string">
-		<li type="string">
-			<stringvalue>&lt;?xml version=&quot;1.0&quot;?&gt;
-&lt;signature name=&quot;Default&quot; uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#&quot; auto=&quot;false&quot; format=&quot;text/plain&quot;&gt;&lt;filename&gt;/home/#-ur_login-#/.evolution/signatures/default&lt;/filename&gt;&lt;/signature&gt;
-</stringvalue>
-		</li>
-	</entry>
-	<entry name="default_account" type="string">
-		<stringvalue>#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#</stringvalue>
-	</entry>
-	<entry name="accounts" type="list" ltype="string">
-		<li type="string">
-			<stringvalue>&lt;?xml version=&quot;1.0&quot;?&gt;
-&lt;account name=&quot;IMAP&quot; uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#&quot; enabled=&quot;true&quot;&gt;&lt;identity&gt;&lt;name&gt;#-ur_fullname-#&lt;/name&gt;&lt;addr-spec&gt;#-ur_mail-#&lt;/addr-spec&gt;&lt;reply-to&gt;#-ur_mail-#&lt;/reply-to&gt;&lt;organization&gt;#-server(mail.organization)-#&lt;/organization&gt;&lt;signature uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#&quot;/&gt;&lt;/identity&gt;&lt;source save-passwd=&quot;true&quot; keep-on-server=&quot;false&quot; auto-check=&quot;true&quot; auto-check-timeout=&quot;5&quot;&gt;&lt;url&gt;imap://#-ur_login-#@#-server(mail.host)-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all&lt;/url&gt;&lt;/source&gt;&lt;transport save-passwd=&quot;false&quot;&gt;&lt;url&gt;smtp://#-ur_login-#@#-server(mail.host)-#/;use_ssl=never&lt;/url&gt;&lt;/transport&gt;&lt;drafts-folder&gt;imap://#-ur_login-#@#-server(mail.host)-#/Drafts&lt;/drafts-folder&gt;&lt;sent-folder&gt;imap://#-ur_login-#@#-server(mail.host)-#/Sent&lt;/sent-folder&gt;&lt;auto-cc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-cc&gt;&lt;auto-bcc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-bcc&gt;&lt;receipt-policy policy=&quot;never&quot;/&gt;&lt;pgp encrypt-to-self=&quot;false&quot; always-trust=&quot;false&quot; always-sign=&quot;false&quot; no-imip-sign=&quot;false&quot;/&gt;&lt;smime sign-default=&quot;false&quot; encrypt-default=&quot;false&quot; encrypt-to-self=&quot;false&quot;/&gt;&lt;/account&gt;
-</stringvalue>
-		</li>
-	</entry>
-</gconf>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml
deleted file mode 100644
index c737bc455..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mail-client/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=xml_gconf
-<?xml version="1.0"?>
-<gconf>
-	<entry name="paned_size" type="int" value="#-sum(ysize,,#-os_x11_height-# / 3)-#"/>
-</gconf>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
deleted file mode 100644
index 80d9b0e94..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(mate-base/mate-session-manager)!=&&ini(update.mate)!=off&&ini(ver.mate)==&&exists(~/.config/mate)==&&pkg(mate-base/mate-session-manager)>=1.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
deleted file mode 100644
index 879d99897..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
deleted file mode 100644
index 9a453681c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
-[Desktop Entry]
-Version=1.0
-Name=FTP
-Comment=Open FTP network folder
-Comment[ru_RU]=Открыть �етевой ди�к FTP
-#?pkg(x11-themes/elementary-icon-theme)!=#
-Icon=folder-download
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)==#
-Icon=update-manager
-#pkg#
-URL=file:////home/#-ur_login-#/FTP
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
deleted file mode 100644
index 29c5bc16e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on append=replace
-[Desktop Entry]
-Version=1.0
-Name=Home
-Comment=Open home network folder
-Comment[ru_RU]=Открыть �етевой ди�к � личными файлами
-Icon=user-home
-URL=file:////home/#-ur_login-#/Home
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
deleted file mode 100644
index 3e286ae40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate chmod=755 os_root_type==livecd
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name[bg]=Ръковод�тво за ин�талиране
-Name[ru]=Руковод�тво по у�тановке
-Name=Installation Guide
-Comment=
-Categories=Application;
-#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
-#os_locale_language#
-#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
-#os_locale_language#
-Icon=help-contents
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
deleted file mode 100644
index 18f2a6e92..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Version=1.0
-Name=Share
-Comment=Open share network folder
-Comment[ru_RU]=Открыть �етевой ди�к � �етевыми ре�ур�ами
-Icon=folder-remote
-URL=file:////home/#-ur_login-#/Share
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
deleted file mode 100644
index c58ec7438..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/calculate-chat.desktop mirror os_root_type==livecd
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
deleted file mode 100644
index b65a60076..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/cl-console-gui-install.desktop os_root_type==livecd mirror
-[Desktop Entry]
-NoDisplay=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
deleted file mode 100644
index fadd87f4d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/gparted.desktop mirror os_root_type==livecd
-[Desktop Entry]
-Exec=sudo /usr/sbin/gparted %f
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
deleted file mode 100644
index 4ef7b77ce..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate path=~/.config/autostart name=pidgin.desktop link=/usr/share/applications/pidgin.desktop mirror env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=&&ur_jid!=
-[Desktop Entry]
-Hidden=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
deleted file mode 100644
index 3852fe26e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=dconf dconf=/org/mate/eom
-
-[plugins]
-active-plugins=['fullscreen']
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata
deleted file mode 100644
index db11b705b..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
deleted file mode 100644
index 0d5d5c44b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate path=~/.themes/Calculate
-[Desktop Entry]
-Name=Calculate
-Type=X-GNOME-Metatheme
-Comment=
-
-[X-GNOME-Metatheme]
-GtkTheme=Calculate
-MetacityTheme=Dopple-Left
-IconTheme=Calculate
-GtkColorScheme=base_color:#ffffff,fg_color:#000000,tooltip_fg_color:#000000,selected_bg_color:#86ABD9,selected_fg_color:#ffffff,text_color:#1A1A1A,bg_color:#EDECEB,tooltip_bg_color:#F5F5B5
-CursorTheme=Calculate
-CursorSize=32
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
deleted file mode 100644
index f8503e32e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-mate = 1.8
-
-[update]
-mate = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
deleted file mode 100644
index 22e1ecf63..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate path=~/.config/mate/panel2.d/default/launchers chmod=755 env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
-
-[Desktop Entry]
-Version=1.0
-Name=FTP
-Comment=Open FTP network folder
-Comment[ru_RU]=Открыть �етевой ди�к FTP
-#?pkg(x11-themes/elementary-icon-theme)!=#
-Icon=folder-download
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)==#
-Icon=update-manager
-#pkg#
-URL=file:////home/#-ur_login-#/FTP
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
deleted file mode 100644
index e2b1819e6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=samba path=~/.config/mate/panel2.d/default/launchers chmod=755
-
-[Desktop Entry]
-Version=1.0
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-Name=Home
-Name[ru_RU]=Домашн�� папка
-URL=file:///home/#-ur_login-#
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-Name=Home
-Comment=Open home network folder
-Comment[ru_RU]=Открыть �етевой ди�к � личными файлами
-URL=file:///home/#-ur_login-#/Home
-#env#
-Icon=user-home
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
deleted file mode 100644
index 47a848ff9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate path=~/.config/mate/panel2.d/default/launchers chmod=755 env(client.os_remote_auth)!=&&ur_domain_set==on
-
-[Desktop Entry]
-Version=1.0
-Name=Share
-Comment=Open share network folder
-Comment[ru_RU]=Открыть �етевой ди�к � �етевыми ре�ур�ами
-Icon=folder-remote
-URL=file:////home/#-ur_login-#/Share
-Type=Link
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/livecd b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/livecd
deleted file mode 100644
index 773787d56..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/livecd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=dconf dconf=/org/mate os_root_type==livecd
-
-[screensaver]
-idle-activation-enabled=false
-lock-enabled=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
deleted file mode 100644
index 25ab04e71..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
+++ /dev/null
@@ -1,113 +0,0 @@
-# Calculate format=dconf dconf=/org/mate
-[calc]
-show-thousands=true
-
-[caja/desktop]
-computer-icon-visible=false
-font='Droid Sans 10'
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-home-icon-visible=true
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-home-icon-visible=false
-#env#
-trash-icon-visible=false
-volumes-visible=false
-
-[caja/preferences]
-click-policy='single'
-
-#pkg(media-gfx/calculate-wallpapers)!=#
-[desktop/background]
-color-shading-type='solid'
-primary-color='#000000000000'
-picture-options='zoom'
-picture-filename='/usr/share/backgrounds/calculate/Calculate Linux'
-secondary-color='#000000000000'
-#pkg#
-
-[desktop/interface]
-document-font-name='Droid Sans 10'
-font-name='Droid Sans 10'
-gtk-theme='Calculate'
-icon-theme='Calculate'
-monospace-font-name='Droid Sans Mono Slashed 10'
-
-[desktop/keybindings/custom0]
-action='xkill'
-binding='<Primary><Alt>Escape'
-#?os_locale_lang!=ru_RU#
-name='Kill a client by its X resource'
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-name='Убить клиент X ре�ур�а'
-#os_locale_lang#
-
-[desktop/keybindings/custom1]
-action='mate-session-save --force-logout'
-binding='<Primary><Shift><Alt>Delete'
-#?os_locale_lang!=ru_RU#
-name='Log out, ignoring any existing inhibitors'
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-name='Завершить �еан�, игнориру� любые �уще�твующие преп�т�тви�'
-#os_locale_lang#
-
-[desktop/media-handling]
-automount=false
-
-[desktop/peripherals/keyboard]
-cursor-theme='Calculate'
-delay=360
-#?hr_laptop==#
-numlock-state='on'
-#hr_laptop#
-#?hr_laptop!=#
-numlock-state='off'
-#hr_laptop#
-
-[desktop/peripherals/keyboard/general]
-default-group=0
-
-[desktop/peripherals/keyboard/indicator]
-font-family='Droid Sans 18'
-
-[desktop/peripherals/mouse]
-cursor-theme='Calculate'
-
-[desktop/peripherals/touchpad]
-disable-while-typing=false
-tap-to-click=true
-
-[dictionary]
-print-font='Droid Sans 12'
-
-[marco/general]
-side-by-side-tiling=false
-theme='Dopple-Left'
-titlebar-font='Droid Sans Bold 10'
-
-[marco/general]
-center-new-windows=false
-compositing-manager=true
-
-[marco/global-keybindings]
-#о�вобожаю �очетание клавиш Ctrl+Alt+Ecs
-cycle-panels='disabled'
-switch-to-workspace-1='<Primary>F1'
-switch-to-workspace-2='<Primary>F2'
-switch-to-workspace-3='<Primary>F3'
-switch-to-workspace-4='<Primary>F4'
-
-[notification-daemon]
-theme='slider'
-
-[screenshot]
-last-save-directory='file://#-ini(resource.pictures)-#'
-
-[settings-daemon/plugins/media-keys]
-screensaver='Scroll_Lock'
-
-[stickynotes]
-default-font='Droid Sans 10'
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
deleted file mode 100644
index 295f8ff76..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde path=~/.local/share/desktop-directories link=/usr/share/mate/desktop-directories/mate-settings.directory
-# �пр�чем дублирование отображени� раздела Параметры Центра управлени� отдельными пунктами меню
-[Desktop Entry]
-NoDisplay=true
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
deleted file mode 100644
index 17e6a87bc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde path=~/.local/share/desktop-directories link=/usr/share/mate/desktop-directories/mate-settings.directory
-# �пр�чем дублирование отображени� Центра управлени� отдельными пунктами меню
-[Desktop Entry]
-NoDisplay=true
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
deleted file mode 100644
index 7d6d2a377..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
+++ /dev/null
@@ -1,286 +0,0 @@
-# Calculate format=dconf dconf=/org/mate/panel
-[general]
-toplevel-id-list=['toplevel_top', 'toplevel_bottom']
-object-id-list=['object_menu', 'object_home', 'object_workspace', 'object_showdesktop', 'object_windowlist', 'object_trash', 'object_notification', 'object_clock', 'object_lock', 'object_shutdown', 'object_browser', 'object_mail', 'object_chat', 'object_im', 'object_writer', 'object_calc', 'object_calculator', 'object_imageedit', 'object_imageview', 'object_audioplayer', 'object_videoplayer', 'object_textedit', 'object_terminal', 'object_separator_1', 'object_separator_2', 'object_separator_3'#?env(client.os_remote_auth)!=&&ur_domain_set==on#, 'object_share', 'object_ftp'#env#]
-
-[toplevels/toplevel_top]
-orientation='top'
-size=32
-screen=0
-monitor=0
-
-[toplevels/toplevel_bottom]
-y-bottom=0
-orientation='bottom'
-auto-hide=true
-enable-buttons=false
-expand=false
-size=56
-screen=0
-monitor=0
-x-right=0
-x-centered=true
-
-[objects/object_menu]
-toplevel-id='toplevel_top'
-position=#-sum(pos,0)-#
-object-type='menu'
-use-menu-path=false
-panel-right-stick=false
-locked=true
-#?os_locale_lang==en_US#
-tooltip='Main Menu'
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-tooltip='Главное меню'
-#os_locale_lang#
-#?os_locale_lang==de_DE#
-tooltip='Hauptmenü'
-#os_locale_lang#
-#?os_locale_lang==es_ES#
-tooltip='Menú principal'
-#os_locale_lang#
-#?os_locale_lang==it_IT#
-tooltip='Menù principale'
-#os_locale_lang#
-#?os_locale_lang==fr_FR#
-tooltip='Menu principal'
-#os_locale_lang#
-#?os_locale_lang==pl_PL#
-tooltip='Menu główne'
-#os_locale_lang#
-#?os_locale_lang==pt_PT#
-tooltip='Menu principal'
-#os_locale_lang#
-#?os_locale_lang==pt_BR#
-tooltip='Menu Principal'
-#os_locale_lang#
-#?os_locale_lang==bg_BG#
-tooltip='О�новно меню'
-#os_locale_lang#
-#?os_locale_lang==ro_RO#
-tooltip='Meniu principal'
-#os_locale_lang#
-#?os_locale_lang==uk_UA#
-tooltip='головне меню'
-#os_locale_lang#
-
-[objects/object_separator_1]
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='separator'
-locked=true
-panel-right-stick=false
-
-[objects/object_home]
-launcher-location='launcher-home.desktop'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-[objects/object_share]
-launcher-location='launcher-share.desktop'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_ftp]
-launcher-location='launcher-ftp.desktop'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-#env#
-
-[objects/object_workspace]
-applet-iid='WnckletFactory::WorkspaceSwitcherApplet'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='applet'
-locked=true
-panel-right-stick=false
-
-[objects/object_showdesktop]
-applet-iid='WnckletFactory::ShowDesktopApplet'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='applet'
-locked=true
-panel-right-stick=false
-
-[objects/object_windowlist]
-applet-iid='WnckletFactory::WindowListApplet'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='applet'
-locked=true
-panel-right-stick=false
-
-[objects/object_trash]
-applet-iid='TrashAppletFactory::TrashApplet'
-toplevel-id='toplevel_top'
-position=#-sum(pos,10000)-#
-object-type='applet'
-locked=true
-panel-right-stick=false
-
-[objects/object_notification]
-applet-iid='NotificationAreaAppletFactory::NotificationArea'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='applet'
-locked=true
-panel-right-stick=false
-
-[objects/object_separator_2]
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='separator'
-locked=true
-panel-right-stick=false
-
-[objects/object_clock]
-applet-iid='ClockAppletFactory::ClockApplet'
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='applet'
-locked=true
-panel-right-stick=false
-
-[objects/object_clock/prefs]
-format='24-hour'
-show-date=false
-custom-format=''
-
-[objects/object_separator_3]
-toplevel-id='toplevel_top'
-position=#-sum(pos,pos+1)-#
-object-type='separator'
-locked=true
-panel-right-stick=false
-
-[objects/object_lock]
-toplevel-id='toplevel_top'
-action-type='lock'
-position=#-sum(pos,pos+1)-#
-object-type='action'
-locked=true
-panel-right-stick=false
-
-[objects/object_shutdown]
-toplevel-id='toplevel_top'
-action-type='shutdown'
-position=#-sum(pos,pos+1)-#
-object-type='action'
-locked=true
-panel-right-stick=false
-
-[objects/object_browser]
-launcher-location='calculate-browser.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,0)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_mail]
-launcher-location='calculate-mail.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_chat]
-launcher-location='calculate-chat.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_im]
-launcher-location='calculate-im.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_writer]
-launcher-location='calculate-writer.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_calc]
-launcher-location='calculate-calc.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_calculator]
-launcher-location='mate-calc.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_imageedit]
-launcher-location='calculate-imageedit.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_imageview]
-launcher-location='calculate-imageview.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_audioplayer]
-launcher-location='calculate-audioplayer.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_videoplayer]
-launcher-location='calculate-videoplayer.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_textedit]
-launcher-location='calculate-textedit.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
-
-[objects/object_terminal]
-launcher-location='mate-terminal.desktop'
-toplevel-id='toplevel_bottom'
-position=#-sum(pos,pos+1)-#
-object-type='launcher'
-locked=true
-panel-right-stick=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
deleted file mode 100644
index 36eb4c5e1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=dconf dconf=/org/mate/pluma
-
-#?pkg(media-fonts/droid)!=#
-[/]
-editor-font='Droid Sans Mono Slashed 10'
-print-font-body-pango='Droid Sans Mono Slashed 9'
-print-font-header-pango='Droid Sans 10'
-print-font-numbers-pango='Droid Sans 8'
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
deleted file mode 100644
index 60b83500b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=dconf dconf=/org/mate/terminal
-[global]
-confirm-window-close=false
-use-menu-accelerators=false
-
-[profiles/default]
-background-color='#2C2C2C2C2C2C'
-palette='#2C2C2C2C2C2C:#707050505050:#6060B4B48A8A:#DFDFAFAF8F8F:#9A9AB8B8D7D7:#DCDC8C8CC3C3:#8C8CD0D0D3D3:#DCDCDCDCCCCC:#707090908080:#DCDCA3A3A3A3:#7272D5D5A3A3:#F0F0DFDFAFAF:#9494BFBFF3F3:#ECEC9393D3D3:#9393E0E0E3E3:#FFFFFFFFFFFF'
-foreground-color='#DCDCDCDCCCCC'
-use-theme-colors=false
-scrollback-lines=4000
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
deleted file mode 100644
index b5e00d675..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.digikam)!=off&&ini(ver.digikam)==&&pkg()>=1.5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
deleted file mode 100644
index 01178a5e7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-
-[Album Settings]
-Icon Show Comments=true
-
-[Database Settings]
-Database Name=#-ur_home_path-#/.kde4/share/apps/digikam/
-Database Name Thumbnails=#-ur_home_path-#/.kde4/share/apps/digikam/
-Database Type=QSQLITE
-
-[TipOfDay]
-RunOnStart=false
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
deleted file mode 100644
index 9aaf6652d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-digikam = 1.5
-
-[update]
-digikam = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
deleted file mode 100644
index ad1d3e870..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-gimp = 2.6
-
-[update]
-gimp = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
deleted file mode 100644
index f15636af6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.gimp)!=off&&ini(ver.gimp)==&&pkg()>=2.6&&pkg()<=2.7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
deleted file mode 100644
index be2a1f931..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gimp.desktop mirror
-
-[Desktop Entry]
-Name=Gimp
-Name[de]=Gimp
-Name[es]=Gimp
-Name[fr]=Gimp
-Name[it]=Gimp
-Name[pl]=Gimp
-Name[pt_BR]=Gimp
-Name[ru]=Gimp
-Name[uk]=Gimp
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
deleted file mode 100644
index 242b86fd4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-gimp = 2.8
-
-[update]
-gimp = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
deleted file mode 100644
index cb2e3bb7c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.gimp)!=off&&ini(ver.gimp)<2.8&&pkg()>=2.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
deleted file mode 100644
index d022a5c59..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
+++ /dev/null
@@ -1,51 +0,0 @@
-# GIMP sessionrc
-# 
-# This file takes session-specific info (that is info, you want to keep
-# between two GIMP sessions).  You are not supposed to edit it manually, but
-# of course you can do.  The sessionrc will be entirely rewritten every time
-# you quit GIMP.  If this file isn't found, defaults are used.
-
-(session-info "toplevel"
-    (factory-entry "gimp-empty-image-window")
-    (open-on-exit))
-(session-info "toplevel"
-    (factory-entry "gimp-single-image-window")
-    (open-on-exit)
-    (aux-info
-        (left-docks-width "120"))
-    (gimp-toolbox
-        (side left)
-        (book
-            (current-page 0)
-            (dockable "gimp-tool-options"
-                (tab-style automatic))))
-    (gimp-dock
-        (side right)
-        (book
-            (current-page 0)
-            (dockable "gimp-layer-list"
-                (tab-style automatic)
-                (preview-size 32))
-            (dockable "gimp-channel-list"
-                (tab-style automatic)
-                (preview-size 32))
-            (dockable "gimp-vectors-list"
-                (tab-style automatic)
-                (preview-size 32))
-            (dockable "gimp-undo-history"
-                (tab-style automatic)))
-        (book
-            (position 387)
-            (current-page 0)
-            (dockable "gimp-brush-grid"
-                (tab-style automatic))
-            (dockable "gimp-pattern-grid"
-                (tab-style automatic))
-            (dockable "gimp-gradient-list"
-                (tab-style automatic)))))
-
-(hide-docks no)
-(single-window-mode yes)
-(last-tip-shown 0)
-
-# end of sessionrc
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
deleted file mode 100644
index be2a1f931..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gimp.desktop mirror
-
-[Desktop Entry]
-Name=Gimp
-Name[de]=Gimp
-Name[es]=Gimp
-Name[fr]=Gimp
-Name[it]=Gimp
-Name[pl]=Gimp
-Name[pt_BR]=Gimp
-Name[ru]=Gimp
-Name[uk]=Gimp
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
deleted file mode 100644
index bb4b21cac..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-gqview = 2.1
-
-[update]
-gqview = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
deleted file mode 100644
index 3acc7e614..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.gqview)!=off&&ini(ver.gqview)==&&pkg()>=2.1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
deleted file mode 100644
index 0c398e96e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate path=~/.gqview
-# черный фон окна
-black_window_background: true
-# автовращение по exit
-exif_auto_rotate: true
-# ра�т�нуть по размеру окна
-zoom_mode: fit
-thumbnail_quality: 2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/.calculate_directory
deleted file mode 100644
index 01b1ff409..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(media-gfx/kdm-themes-calculate)!=&&pkg(media-gfx/kdm-themes-calculate)>=14&&ini(ver.ksplash-themes)<14&&pkg(kde-base/ksplash)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/ini.env
deleted file mode 100644
index 6223401f7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-ksplash-themes = 14
-
-[update]
-ksplash-themes = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/ksplashrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/ksplashrc
deleted file mode 100644
index 3c90e248c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/kdm-themes-calculate-14/ksplashrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-
-[KSplash]
-Theme=CalculateSplash
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
deleted file mode 100644
index a7620b533..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-nomacs = 1.6
-
-[update]
-nomacs = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
deleted file mode 100644
index f0e3198cf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.nomacs)!=off&&ini(ver.nomacs)==&&pkg()>=1.6
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf
deleted file mode 100644
index 63595232e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf	
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=kde path=~/.config/nomacs
-[AppSettings]
-firstTime=false
-firstTime.nomacs.3=false
-
-[GlobalSettings]
-language=#-os_locale_language-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
deleted file mode 100644
index 98bd93df9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.kipi-plugins)!=off&&ini(ver.kipi-plugins)==&&pkg()>=4.7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
deleted file mode 100644
index da92f3747..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications link=/usr/share/applications/kde4/dngconverter.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
deleted file mode 100644
index a7510173e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kipi-plugins = 4.7
-
-[update]
-kipi-plugins = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
deleted file mode 100644
index ef72f7fdb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.amarok)!=off&&ini(ver.amarok)==&&pkg()>=2.3
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
deleted file mode 100644
index 1854859b6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-
-[Collection]
-Use Charset Detector=true
-
-[Collection Folders]
--1=.#-ini(resource.music)-#
-
-[File Browser]
-Current Directory=#-ini(resource.path)-#
-
-[General]
-First Run=false
-
-[Notification Messages]
-hideOnCloseInfo=false
-systemtrayquitAmarok=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
deleted file mode 100644
index 0d42472a7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications/kde4 link=/usr/share/applications/kde4/amzdownloader.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
deleted file mode 100644
index 8475773fc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-amarok = 2.3
-
-[update]
-amarok = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
deleted file mode 100644
index fcb8de241..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-audacious = 3.2
-
-[update]
-audacious = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
deleted file mode 100644
index 897e13b3e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.audacious)!=off&&ini(ver.audacious)==&&pkg()>=3.2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
deleted file mode 100644
index 149c7e457..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
+++ /dev/null
@@ -1,50 +0,0 @@
-# Calculate format=samba path=~/.config/audacious
-
-[audacious]
-chardet_fallback=UTF-8
-#?os_locale_lang==ru_RU#
-chardet_detector=russian
-#os_locale_lang#
-
-[search-tool]
-path=/home/#-ur_login-#/#-ini(resource.music)-#
-
-[statusicon]
-close_to_tray=FALSE
-scroll_action=1
-rclick_menu=1
-
-[globalHotkey]
-Hotkey_0_key=173
-Hotkey_0_mask=0
-Hotkey_0_type=0
-Hotkey_0_event=0
-Hotkey_1_key=172
-Hotkey_1_mask=0
-Hotkey_1_type=0
-Hotkey_1_event=2
-Hotkey_2_key=174
-Hotkey_2_mask=0
-Hotkey_2_type=0
-Hotkey_2_event=3
-Hotkey_3_key=171
-Hotkey_3_mask=0
-Hotkey_3_type=0
-Hotkey_3_event=4
-Hotkey_4_key=121
-Hotkey_4_mask=0
-Hotkey_4_type=0
-Hotkey_4_event=7
-Hotkey_5_key=123
-Hotkey_5_mask=0
-Hotkey_5_type=0
-Hotkey_5_event=8
-Hotkey_6_key=122
-Hotkey_6_mask=0
-Hotkey_6_type=0
-Hotkey_6_event=9
-Hotkey_7_key=122
-Hotkey_7_mask=0
-Hotkey_7_type=0
-Hotkey_7_event=9
-NumHotkeys=7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
deleted file mode 100644
index 9223d1b02..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=raw path=~/.config/audacious
-format 8
-#?os_arch_machine!=x86_64#
-general /usr/lib/audacious/General/statusicon.so
-#os_arch_machine#
-#?os_arch_machine==x86_64#
-general /usr/lib64/audacious/General/statusicon.so
-#os_arch_machine#
-stamp 1337861282
-name Status Icon
-priority 0
-about 1
-config 1
-enabled 1
-#?os_arch_machine!=x86_64#
-general /usr/lib/audacious/General/hotkey.so
-#os_arch_machine#
-#?os_arch_machine==x86_64#
-general /usr/lib64/audacious/General/hotkey.so
-#os_arch_machine#
-stamp 1371068438
-name Global Hotkeys
-priority 0
-about 1
-config 1
-enabled 1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
deleted file mode 100644
index 3b7724f21..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.qastools)!=off&&ini(ver.qastools)<0.21&&pkg()>=0.21
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
deleted file mode 100644
index 996042499..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-qastools = 0.21
-
-[update]
-qastools = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
deleted file mode 100644
index 2de6f8f0a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde path=~/.config/qastools
-
-[General]
-tray_is_minimized=false
-tray_on_close=false
-tray_show_icon=false
-
-[simple_mixer]
-show_slider_value_labels=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
deleted file mode 100644
index cd78c1d1c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-volumeicon = 0.4
-
-[update]
-volumeicon = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
deleted file mode 100644
index 9516b19d8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.volumeicon)!=off&&ini(ver.volumeicon)==&&pkg()>=0.4&&pkg()<0.5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
deleted file mode 100644
index 54f038d07..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate format=kde path=~/.config/volumeicon
-
-[StatusIcon]
-stepsize=5
-lmb_slider=true
-mmb_mute=false
-use_horizontal_slider=false
-show_sound_level=false
-onclick=pavucontrol
-theme=Default
-
-[Hotkeys]
-up_enabled=true
-down_enabled=true
-mute_enabled=true
-up=XF86AudioRaiseVolume
-down=XF86AudioLowerVolume
-mute=XF86AudioMute
-
-[Alsa]
-card=default
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
deleted file mode 100644
index 30bb9a0da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.volumeicon)!=off&&ini(ver.volumeicon)<0.5&&pkg()>=0.5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
deleted file mode 100644
index 942316c90..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-volumeicon = 0.5
-
-[update]
-volumeicon = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
deleted file mode 100644
index ac1430d5b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate format=kde path=~/.config/volumeicon cl_ver>=3.4.7
-[Notification]
-show_notification=true
-notification_type=1
-
-[StatusIcon]
-#?install.os_audio==alsa&&pkg(media-sound/qastools)!=#
-onclick=qasmixer
-#install.os_audio#
-#?install.os_audio==pulseaudio&&pkg(media-sound/pavucontrol)!=#
-onclick=pavucontrol
-#install.os_audio#
-lmb_slider=true
-
-[Hotkeys]
-up_enabled=true
-down_enabled=true
-mute_enabled=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon.old b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon.old
deleted file mode 100644
index 3b20c4a0e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon.old
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=kde path=~/.config/volumeicon cl_ver<3.4.7
-[Notification]
-show_notification=true
-notification_type=1
-
-[StatusIcon]
-onclick=pavucontrol
-lmb_slider=true
-
-[Hotkeys]
-up_enabled=true
-down_enabled=true
-mute_enabled=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
deleted file mode 100644
index 900f5d96d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.kodi)!=off&&ini(ver.kodi)==&&pkg()>=14.1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
deleted file mode 100644
index 63984df65..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Calculate path=~/.kodi/userdata
-<settings>
-    <locale>
-#?os_locale_lang==en_US#
-        <language>English (US)</language>
-        <timezone>America/New_York</timezone>
-        <timezonecountry>United States</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-        <charset>CP1251</charset>
-	<language>Russian</language>
-	<timezone>Europe/Moscow</timezone>
-	<timezonecountry>Russia</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==de_DE#
-        <language>German</language>
-        <timezone>Europe/Berlin</timezone>
-        <timezonecountry>Germany</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==es_ES#
-        <language>Russian</language>
-        <timezone>Europe/Moscow</timezone>
-        <timezonecountry>Russia</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==it_IT#
-        <language>Italian</language>
-        <timezone>Europe/Rome</timezone>
-        <timezonecountry>Italy</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==fr_FR#
-        <language>French</language>
-        <timezone>Europe/Paris</timezone>
-        <timezonecountry>France</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==pl_PL#
-        <language>Polish</language>
-        <timezone>Europe/Warsaw</timezone>
-        <timezonecountry>Poland</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==pt_PT#
-        <language>Portuguese</language>
-        <timezone>Europe/Lisbon</timezone>
-        <timezonecountry>Portugal</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==pt_BR#
-        <language>Portuguese (Brazil)</language>
-        <timezone>America/Puerto_Rico</timezone>
-        <timezonecountry>Puerto Rico</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==bg_BG#
-        <language>Bulgarian</language>
-        <timezone>Europe/Sofia</timezone>
-        <timezonecountry>Bulgaria</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==ro_RO#
-        <language>Romanian</language>
-        <timezone>Europe/Bucharest</timezone>
-        <timezonecountry>Romania</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==uk_UA#
-        <language>Ukrainian</language>
-        <timezone>Europe/Kiev</timezone>
-        <timezonecountry>Ukraine</timezonecountry>
-#os_locale_lang#
-    </locale>
-    <powermanagement>
-        <shutdownstate>1</shutdownstate>
-    </powermanagement>
-</settings>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
deleted file mode 100644
index fb2dd5f4e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate path=~/.calculate format=samba
-
-[ver]
-kodi = 14.1
-
-[update]
-kodi = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
deleted file mode 100644
index a3a3b150c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Calculate path=~/.kodi/userdata
-<sources>
-    <programs>
-        <default pathversion="1"></default>
-    </programs>
-    <video>
-        <default pathversion="1"></default>
-        <source>
-#?os_locale_lang==en_US#
-            <name>My Video</name>
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-            <name>Моё видео</name>
-#os_locale_lang#
-            <path pathversion="1">#-ini(resource.videos)-#</path>
-        </source>
-    </video>
-    <music>
-        <default pathversion="1"></default>
-        <source>
-#?os_locale_lang==en_US#
-            <name>My Music</name>
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-            <name>Мо� музыка</name>
-#os_locale_lang#
-            <path pathversion="1">#-ini(resource.music)-#</path>
-        </source>
-    </music>
-    <pictures>
-        <default pathversion="1"></default>
-        <source>
-#?os_locale_lang==en_US#
-            <name>My Pictures</name>
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-            <name>Мои фотографии</name>
-#os_locale_lang#
-            <path pathversion="1">#-ini(resource.pictures)-#</path>
-        </source>
-    </pictures>
-    <files>
-        <default pathversion="1"></default>
-    </files>
-</sources>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
deleted file mode 100644
index 764e4ad07..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-xbmc = 10.1
-
-[update]
-xbmc = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
deleted file mode 100644
index 439240c47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.xbmc)!=off&&ini(ver.xbmc)==&&pkg()>=10.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
deleted file mode 100644
index 1e009ecf5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Calculate path=~/.xbmc/userdata
-<settings>
-    <locale>
-#?os_locale_lang==en_US#
-        <language>English (US)</language>
-        <timezone>America/New_York</timezone>
-        <timezonecountry>United States</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==ru_RU#
-        <charset>CP1251</charset>
-	<language>Russian</language>
-	<timezone>Europe/Moscow</timezone>
-	<timezonecountry>Russia</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==de_DE#
-        <language>German</language>
-        <timezone>Europe/Berlin</timezone>
-        <timezonecountry>Germany</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==es_ES#
-        <language>Russian</language>
-        <timezone>Europe/Moscow</timezone>
-        <timezonecountry>Russia</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==it_IT#
-        <language>Italian</language>
-        <timezone>Europe/Rome</timezone>
-        <timezonecountry>Italy</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==fr_FR#
-        <language>French</language>
-        <timezone>Europe/Paris</timezone>
-        <timezonecountry>France</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==pl_PL#
-        <language>Polish</language>
-        <timezone>Europe/Warsaw</timezone>
-        <timezonecountry>Poland</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==pt_PT#
-        <language>Portuguese</language>
-        <timezone>Europe/Lisbon</timezone>
-        <timezonecountry>Portugal</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==pt_BR#
-        <language>Portuguese (Brazil)</language>
-        <timezone>America/Puerto_Rico</timezone>
-        <timezonecountry>Puerto Rico</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==bg_BG#
-        <language>Bulgarian</language>
-        <timezone>Europe/Sofia</timezone>
-        <timezonecountry>Bulgaria</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==ro_RO#
-        <language>Romanian</language>
-        <timezone>Europe/Bucharest</timezone>
-        <timezonecountry>Romania</timezonecountry>
-#os_locale_lang#
-#?os_locale_lang==uk_UA#
-        <language>Ukrainian</language>
-        <timezone>Europe/Kiev</timezone>
-        <timezonecountry>Ukraine</timezonecountry>
-#os_locale_lang#
-    </locale>
-    <powermanagement>
-        <shutdownstate>1</shutdownstate>
-    </powermanagement>
-</settings>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
deleted file mode 100644
index ca2bedf66..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate path=~/.xbmc/userdata
-<sources>
-    <programs>
-        <default pathversion="1"></default>
-    </programs>
-    <video>
-        <default pathversion="1"></default>
-        <source>
-            <name>My Video</name>
-            <path pathversion="1">#-ini(resource.videos)-#</path>
-        </source>
-    </video>
-    <music>
-        <default pathversion="1"></default>
-        <source>
-            <name>My Music</name>
-            <path pathversion="1">#-ini(resource.music)-#</path>
-        </source>
-    </music>
-    <pictures>
-        <default pathversion="1"></default>
-        <source>
-            <name>My Pictures</name>
-            <path pathversion="1">#-ini(resource.pictures)-#</path>
-        </source>
-    </pictures>
-    <files>
-        <default pathversion="1"></default>
-    </files>
-</sources>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
deleted file mode 100644
index 190dfad29..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.kdenlive)!=off&&ini(ver.kdenlive)==&&pkg()>=0.7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
deleted file mode 100644
index 1db0ffc2c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kdenlive = 0.7
-
-[update]
-kdenlive = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
deleted file mode 100644
index 0de8e00ef..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=kde path=~/.kde4/share/config
-[env]
-capturefolder[$e]=#-ini(resource.videos)-#
-defaultprojectfolder[$e]=#-ini(resource.videos)-#/kdenlive
-
-[version]
-version=0.7.8
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
deleted file mode 100644
index e308a94a8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.smplayer)!=off&&ini(ver.smplayer)==&&pkg()>=0.6
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
deleted file mode 100644
index e982fea9e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-smplayer = 0.6
-
-[update]
-smplayer = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
deleted file mode 100644
index e114b3d48..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# Calculate format=kde path=~/.config/smplayer
-
-[drives]
-#включить DVD-меню
-use_dvdnav=true
-
-[gui]
-#закрывать по окончании во�произведени�
-close_on_finish=true
-#�зык интерфей�а
-language=#-os_locale_lang-#
-
-[instances]
-#запу�кать только одну копию SMPlayer
-use_single_instance=false
-
-[performance]
-#set cache for mount resources
-cache_for_files=1000
-#петелевой фильтр (1-включено, 0-пропу�кать в�егда, 2-пропу�кать только дл� HD видео)
-h264_skip_loop_filter=2
-
-[reminder]
-dont_show_anymore=true
-
-[subtitles]
-driver\audio_output=alsa
-styles\fontname=Droid Sans
-#?os_locale_lang==ru_RU#
-subcp=CP1251
-#os_locale_lang#
-enca_lang=#-os_locale_language-#
-use_enca=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
deleted file mode 100644
index 67dc6ce14..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.smtube)!=off&&ini(ver.smtube)==&&pkg()>=15.5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
deleted file mode 100644
index 333e614da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-smtube = 15.5
-
-[update]
-smtube = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
deleted file mode 100644
index 8d6f36042..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde path=~/.config/smtube
-
-[%General]
-shown_notes=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
deleted file mode 100644
index 5e60b2e29..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-pidgin = 2.6
-
-[update]
-pidgin = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
deleted file mode 100644
index 58074375c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.pidgin)!=off&&ini(ver.pidgin)==&&pkg()>=2.6
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
deleted file mode 100644
index c86f5613a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate format=raw comment=;
-(gtk_accel_path "<main>/Conversation/Close" "Escape")
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
deleted file mode 100644
index 0aa4a1ae7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<account version='1.0'>
-	<account>
-		<protocol>prpl-jabber</protocol>
-		<name>#-ur_jid-#/</name>
-		<password></password>
-		<alias>#-ur_fullname-#</alias>
-		<settings>
-			<setting name='require_tls' type='bool'>1</setting>
-			<setting name='check-mail' type='bool'>0</setting>
-			<setting name='connect_server' type='string'>#-server(jabber.host)-#</setting>
-			<setting name='old_ssl' type='bool'>1</setting>
-			<setting name='auth_plain_in_clear' type='bool'>1</setting>
-			<setting name='ft_proxies' type='string'> </setting>
-			<setting name='port' type='int'>#-server(jabber.port)-#</setting>
-			<setting name='custom_smileys' type='bool'>1</setting>
-		</settings>
-		<settings ui='gtk-gaim'>
-			<setting name='auto-login' type='bool'>1</setting>
-		</settings>
-		<proxy>
-			<type>none</type>
-		</proxy>
-		<current_error/>
-	</account>
-</account>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0 b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
deleted file mode 100644
index 6fd1d4765..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
+++ /dev/null
@@ -1,6 +0,0 @@
-binding "my-bindings"
-{
-    bind "Return" { "insert-at-cursor" ("\n") }
-    bind "<ctrl>Return" { "message_send" () }
-}
-widget "*pidgin_conv_entry" binding "my-bindings"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
deleted file mode 100644
index 52db9e70e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<pref version='1' name='/'>
-	<pref name='purple'>
-		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1'/>
-			<pref name='log_chats' type='bool' value='1'/>
-		</pref>
-	</pref>
-	<pref name='pidgin'>
-		<pref name='browsers'>
-			<pref name='browser' type='string' value='xdg-open'/>
-		</pref>
-		<pref name='conversations'>
-			<pref name='minimum_entry_lines' type='int' value='5'/>
-			<pref name='use_theme_font' type='bool' value='0'/>
-			<pref name='custom_font' type='string' value='Droid Sans 10'/>
-			<pref name='im'>
-				<pref name='hide_new' type='string' value='always'/>
-				<pref name='close_immediately' type='bool' value='0'/>
-			</pref>
-			<pref name='placement' type='string' value='new'/>
-		</pref>
-		<pref name='docklet'>
-			<pref name='blink' type='bool' value='1'/>
-		</pref>
-		<pref name='plugins'>
-			<pref name='loaded' type='pathlist'>
-				<item value='/usr/lib64/pidgin/enhancedhist.so'/>
-				<item value='/usr/lib/pidgin/history.so'/>
-				<item value='/usr/lib/pidgin/sendbutton.so'/>
-#?pkg(x11-plugins/pidgin-hotkeys)!=#
-				<item value='/usr/lib/pidgin/hotkeys.so' />
-#pkg#
-			</pref>
-		</pref>
-		<pref name='sound'>
-			<pref name='enabled'>
-				<pref name='login' type='bool' value='0'/>
-				<pref name='logout' type='bool' value='0'/>
-			</pref>
-			<pref name='conv_focus' type='bool' value='0'/>
-		</pref>
-	</pref>
-	<pref name='plugins'>
-		<pref name='gtk'>
-			<pref name='hotkeys'>
-				<pref name='use_hotkey_read_msg' type='bool' value='1'/>
-				<pref name='hotkey_read_msg' type='string' value='.*..grave'/>
-			</pref>
-			<pref name="plugin_pack">
-				<pref name="enhanced_history">
-					<pref name="number" type="int" value="100"/>
-					<pref name="bytes" type="int" value="5120"/>
-					<pref name="minutes" type="int" value="0"/>
-					<pref name="hours" type="int" value="0"/>
-					<pref name="days" type="int" value="0"/>
-					<pref name="dates" type="bool" value="1"/>
-					<pref name="im" type="bool" value="1"/>
-					<pref name="chat" type="bool" value="1"/>
-				 </pref>
-			</pref>
-		</pref>
-	</pref>
-</pref>
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
deleted file mode 100644
index 90508cc8d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.pidgin)!=off&&pkg()>=2.6&&ur_domain_set==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
deleted file mode 100644
index 8aa6b033d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate exec=/usr/bin/python2
-
-# -*- coding: utf-8 -*-
-
-import os,sys
-
-try:
-    from xml.dom import minidom
-    homedir = "#-ur_home_path-#"
-    blistfile="/.purple/blist.xml"
-    
-    if os.path.exists(homedir+blistfile) :
-        #Buddy list file opening and get groups-list
-        blist=minidom.parse(homedir+blistfile)
-        elements=blist.getElementsByTagName("group")
-        #Groups sorting
-        elements.sort(key=lambda elements:elements.getAttribute('name'))
-        #Deleting groups from source xml
-        for n in blist.childNodes[0].childNodes[1].getElementsByTagName('group'):
-            blist.childNodes[0].childNodes[1].removeChild(n)
-        #Add sorted groups
-        for n in elements:
-            blist.childNodes[0].childNodes[1].appendChild(n)
-        #Write to Buddy list file
-        blistout=open(homedir+blistfile,"w")
-        blistout.write(blist.toxml().encode("utf-8"))
-        blistout.close()
-except Exception as e:
-    sys.stderr.write(str(e))
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
deleted file mode 100644
index 674bf907a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-skype = 2.2
-
-[update]
-skype = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
deleted file mode 100644
index 4e8519d7d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.skype)!=off&&ini(ver.skype)==&&pkg()>=2.2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
deleted file mode 100644
index c30f5759d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.Skype
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin/.calculate_directory
deleted file mode 100644
index 2faa6702d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.telegram-desktop-bin)!=off
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin/telegramdesktop.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin/telegramdesktop.desktop
deleted file mode 100644
index 241f47597..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin/telegramdesktop.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=~/.local/share/applications
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
deleted file mode 100644
index fbad47c1b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-hexchat = 2.9
-
-[update]
-hexchat = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
deleted file mode 100644
index 2a3eef8bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.hexchat)!=off&&ini(ver.hexchat)==&&pkg()>=2.9
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
deleted file mode 100644
index d59cd8687..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Calculate pkg(sys-apps/calculate-utils:3)>=3.4.5.27
-dcc_completed_dir = #-ini(resource.downloads)-#
-gui_quit_dialog = 0
-gui_tray_close = 1
-gui_ulist_sort = 1
-gui_slist_skip = 1
-gui_join_dialog = 0
-input_balloon_priv = 1
-#?hr_virtual==virtualbox#
-#-ini(tmp.vm,VB)-#
-#hr_virtual#
-#?hr_virtual==vmware#
-#-ini(tmp.vm,VM)-#
-#hr_virtual#
-#?hr_virtual==qemu#
-#-ini(tmp.vm,QE)-#
-#hr_virtual#
-irc_nick1 = #-case(capitalize,ur_login)-##-ini(tmp.vm)-#-#-os_locale_language-#
-irc_nick2 = #-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#
-irc_nick3 = #-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#
-irc_real_name = #-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-#
-#-ini(tmp.vm,)-#
-#?os_root_type==hdd&&hr_virtual==#
-irc_user_name = #-os_linux_shortname-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual==#
-irc_user_name = Live#-os_linux_shortname-#
-#os_root_type#
-#?os_root_type==hdd&&hr_virtual!=#
-irc_user_name = #-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual!=#
-irc_user_name = Live#-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-text_font = Droid Sans Mono Slashed 10
-
-gui_win_left = 804
-gui_win_top = 261
-gui_tab_pos = 5
-gui_tab_layout = 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf.old b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf.old
deleted file mode 100644
index 0109ee1f3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf.old
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate pkg(sys-apps/calculate-utils:3)<3.4.5.27 name=hexchat.conf
-dcc_completed_dir = #-ini(resource.downloads)-#
-gui_quit_dialog = 0
-gui_tray_close = 1
-gui_ulist_sort = 1
-gui_slist_skip = 1
-gui_join_dialog = 0
-input_balloon_priv = 1
-irc_nick1 = #-case(capitalize,ur_login)-#-#-os_locale_language-#
-irc_nick2 = #-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-#
-irc_nick3 = #-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-#
-irc_real_name = #-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-#
-#?os_root_type==hdd&&hr_virtual==#
-irc_user_name = #-os_linux_shortname-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual==#
-irc_user_name = Live#-os_linux_shortname-#
-#os_root_type#
-#?os_root_type==hdd&&hr_virtual!=#
-irc_user_name = #-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual!=#
-irc_user_name = Live#-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-text_font = Droid Sans Mono Slashed 10
-
-gui_win_left = 804
-gui_win_top = 261
-gui_tab_pos = 5
-gui_tab_layout = 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
deleted file mode 100644
index 117fbc1c6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.local/share name=applications
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat.desktop
deleted file mode 100644
index 0c7660bb2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/hexchat.desktop mirror
-
-[Desktop Entry]
-#?os_locale_language==fr#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-fr"
-#os_locale_language#
-#?os_locale_language==ru#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
-#os_locale_language#
-#?in(os_locale_language,fr,ru)==#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
deleted file mode 100644
index 4d2dc19a2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-konversation = 1.2
-
-[update]
-konversation = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
deleted file mode 100644
index fee12d1ca..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.konversation)!=off&&ini(ver.konversation)==&&pkg()>=1.2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
deleted file mode 100644
index 831162569..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/python2
-# Calculate chmod=755 comment=#
-#This program is free software; you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation; either version 2 of the License, or
-#(at your option) any later version.
-
-#Copyright 2010 Vasily Petuhov aka norgen
-
-#Konversation script "Google for you"
-
-#Using:
-#Copy script to ~/.kde4/apps/konversation/scripts (mkdir if not exist), 
-#make executable. After go Konversation - Settings - Command aliases and  
-#add alias "/gog" with command line "/exec gog".
-
-#Using in chat:
-#/gog <nick> <message>
-
-import string
-import urllib
-import sys
-import subprocess
-
-SERVER = sys.argv[1];
-CHANNEL = sys.argv[2];
-target=sys.argv[3];
-mess=sys.argv[4:];
-
-TINYURL_API_URL="http://tinyurl.com/api-create.php?url=[url]"
-GOOGLE_FOR_YOU="http://lmgtfy.com/?q=[term]"
-
-def getTinyUrl(searchEngine, searchTerms, turlApiURL):
-        finalUrl = searchEngine.replace("[term]",searchTerms)
-        finalUrl = turlApiURL.replace("[url]",finalUrl)
-        return finalUrl
-
-def doWork(word, searchEngine):
-	if len(word) < 2:
-                print ("Very little word...");
-                return;
-        wordStr = "+".join(word)
-        wordStr = string.strip(wordStr)
-	tinyUrl=getTinyUrl(searchEngine,wordStr,TINYURL_API_URL)
-        endUrl = urllib.urlopen(tinyUrl).read()
-        args=['qdbus','org.kde.konversation', '/irc', 'say',SERVER, CHANNEL, (target+', '+endUrl)]
-        c='';
-        for i in args:
-            c=c+' "'+i+'"';
-        print 'command:'+c;
-        subprocess.Popen(args).communicate();
-
-doWork(mess, GOOGLE_FOR_YOU)
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
deleted file mode 100644
index e936e8008..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate format=kde
-[Event/dcc_incoming]
-Action=Sound|Popup|Taskbar
-Sound=file:///usr/share/sounds/Kopete_Received.ogg
-
-[Event/message]
-Action=Taskbar
-
-[Event/nick]
-Action=Taskbar
-
-[Event/query]
-Action=Sound|Popup|Taskbar
-Sound=file:///usr/share/sounds/Kopete_Event.ogg
-
-[Event/queryMessage]
-Action=Sound|Popup|Taskbar
-Sound=file:///usr/share/sounds/Kopete_Event.ogg
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
deleted file mode 100644
index 45aa2c985..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
+++ /dev/null
@@ -1,94 +0,0 @@
-# Calculate format=kde pkg(sys-apps/calculate-utils:3)>=3.4.5.27
-[$Version]
-update_info=konversation.upd:1.1-rememberline,konversation.upd:1.1-markerlines,konversation.upd:0.20-customfonts,konversation.upd:0.20-quickbuttons,konversation.upd:0.19-notifylists,konversation.upd:0.19-appearance,konversation.upd:0.19-browser,konversation.upd:0.19-flags,konversation.upd:0.19-highlightcolors,konversation.upd:0.19-osdcolors,konversation.upd:0.19-sortorder,konversation.upd:0.19-colors,konversation.upd:0.19-generaloptions,konversation.upd:0.19-cleanup-themes,konversation.upd:0.19-cleanup-notifylist,konversation.upd:0.19-cleanup-dcc,konversation.upd:0.19-cleanup-colors,konversation.upd:0.19-cleanup-hilightlist,konversation.upd:0.19-cleanup-notificationmessages,konversation.upd:0.19-cleanup-ledcolors,konversation.upd:0.19-cleanup-kmditaskbar,konversation.upd:0.19-channelsplitter
-
-[Aliases]
-#added gog script
-AliasList=cmd /exec cmd,bug /exec bug,fortune /exec fortune,kdeversion /exec kdeversion,gauge /exec gauge,mail /exec mail,video /exec media video,audio /exec media audio,media /exec media,tinyurl /exec tinyurl,sysinfo /exec sysinfo,sayclip /exec sayclip,uptime /exec uptime,gog /exec gog
-
-[Channel 0]
-#?os_locale_language==fr#
-Name=#calculate-fr
-#os_locale_language#
-#?os_locale_language==ru#
-Name=#calculate-ru
-#os_locale_language#
-#?in(os_locale_language,fr,ru)==#
-Name=#calculate
-#in#
-Password=
-
-[Identity 0]
-#?os_root_type==hdd&&hr_virtual==#
-Ident=#-os_linux_shortname-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual==#
-Ident=Live#-os_linux_shortname-#
-#os_root_type#
-#?os_root_type==hdd&&hr_virtual!=#
-Ident=#-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual!=#
-Ident=Live#-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-Name=Default Identity
-#?hr_virtual==virtualbox#
-#-ini(tmp.vm,VB)-#
-#hr_virtual#
-#?hr_virtual==vmware#
-#-ini(tmp.vm,VM)-#
-#hr_virtual#
-#?hr_virtual==qemu#
-#-ini(tmp.vm,QE)-#
-#hr_virtual#
-Nicknames=#-case(capitalize,ur_login)-##-ini(tmp.vm)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#
-Realname=#-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-#
-#-ini(tmp.vm,)-#
-
-[Flags]
-# ра�положить закладки наверху
-TabPlacement=Top
-# автоматиче�ки показывать новые каналы
-BringToFront=true
-# �редн�� кнопка закрывает вкладку
-MiddleClickClose=true
-
-[General Options]
-# отображать иконку в трее
-ShowTrayIcon=true
-# оповещать о �ообщении � канала
-TrayNotify=true
-# оповещать только о пер�ональных �ообщени�х
-TrayNotifyOnlyOwnNick=true
-
-[Path Settings]
-# директори� дл� принимаемых файлов
-DccPath=file:///home/#-ur_login-#
-# директори� дл� логов
-LogfilePath=file:///home/#-ur_login-#/.kde4/share/apps/konversation/logs
-
-[Server 0]
-Port=8001
-SSLEnabled=false
-Server=irc.freenode.net
-Password=
-
-[Notification Messages]
-# не задавать вопро� при �ворачивании кнопкой закрыть
-HideOnCloseInfo=false
-# не задавать вопро� при выходе
-systemtrayquitKonversation=false
-
-[ServerGroup 0]
-AutoConnect=true
-AutoJoinChannels=Channel 0
-EnableNotifications=true
-Expanded=true
-Identity=Default Identity
-Name=Freenode
-ServerList=Server 0
-
-[Tab Notifications]
-# цвет личных �ообщний при оповещении
-TabNotificationsPrivateColor=255,0,255
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc.old b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc.old
deleted file mode 100644
index 744a19cde..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc.old
+++ /dev/null
@@ -1,84 +0,0 @@
-# Calculate format=kde name=konversationrc pkg(sys-apps/calculate-utils:3)<3.4.5.27
-[$Version]
-update_info=konversation.upd:1.1-rememberline,konversation.upd:1.1-markerlines,konversation.upd:0.20-customfonts,konversation.upd:0.20-quickbuttons,konversation.upd:0.19-notifylists,konversation.upd:0.19-appearance,konversation.upd:0.19-browser,konversation.upd:0.19-flags,konversation.upd:0.19-highlightcolors,konversation.upd:0.19-osdcolors,konversation.upd:0.19-sortorder,konversation.upd:0.19-colors,konversation.upd:0.19-generaloptions,konversation.upd:0.19-cleanup-themes,konversation.upd:0.19-cleanup-notifylist,konversation.upd:0.19-cleanup-dcc,konversation.upd:0.19-cleanup-colors,konversation.upd:0.19-cleanup-hilightlist,konversation.upd:0.19-cleanup-notificationmessages,konversation.upd:0.19-cleanup-ledcolors,konversation.upd:0.19-cleanup-kmditaskbar,konversation.upd:0.19-channelsplitter
-
-[Aliases]
-#added gog script
-AliasList=cmd /exec cmd,bug /exec bug,fortune /exec fortune,kdeversion /exec kdeversion,gauge /exec gauge,mail /exec mail,video /exec media video,audio /exec media audio,media /exec media,tinyurl /exec tinyurl,sysinfo /exec sysinfo,sayclip /exec sayclip,uptime /exec uptime,gog /exec gog
-
-[Channel 0]
-#?os_locale_language==fr#
-Name=#calculate-fr
-#os_locale_language#
-#?os_locale_language==ru#
-Name=#calculate-ru
-#os_locale_language#
-#?in(os_locale_language,fr,ru)==#
-Name=#calculate
-#in#
-Password=
-
-[Identity 0]
-#?os_root_type==hdd&&hr_virtual==#
-Ident=#-os_linux_shortname-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual==#
-Ident=Live#-os_linux_shortname-#
-#os_root_type#
-#?os_root_type==hdd&&hr_virtual!=#
-Ident=#-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual!=#
-Ident=Live#-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-Name=Default Identity
-Nicknames=#-case(capitalize,ur_login)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-#
-Realname=#-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-#
-
-[Flags]
-# ра�положить закладки наверху
-TabPlacement=Top
-# автоматиче�ки показывать новые каналы
-BringToFront=true
-# �редн�� кнопка закрывает вкладку
-MiddleClickClose=true
-
-[General Options]
-# отображать иконку в трее
-ShowTrayIcon=true
-# оповещать о �ообщении � канала
-TrayNotify=true
-# оповещать только о пер�ональных �ообщени�х
-TrayNotifyOnlyOwnNick=true
-
-[Path Settings]
-# директори� дл� принимаемых файлов
-DccPath=file:///home/#-ur_login-#
-# директори� дл� логов
-LogfilePath=file:///home/#-ur_login-#/.kde4/share/apps/konversation/logs
-
-[Server 0]
-Port=8001
-SSLEnabled=false
-Server=irc.freenode.net
-Password=
-
-[Notification Messages]
-# не задавать вопро� при �ворачивании кнопкой закрыть
-HideOnCloseInfo=false
-# не задавать вопро� при выходе
-systemtrayquitKonversation=false
-
-[ServerGroup 0]
-AutoConnect=true
-AutoJoinChannels=Channel 0
-EnableNotifications=true
-Expanded=true
-Identity=Default Identity
-Name=Freenode
-ServerList=Server 0
-
-[Tab Notifications]
-# цвет личных �ообщний при оповещении
-TabNotificationsPrivateColor=255,0,255
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
deleted file mode 100644
index 71caa65ee..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.kvirc4.rc)==&&ini(update.kvirc)!=off&&ini(ver.kvirc)==&&pkg()>=4.99&&pkg(sys-apps/calculate-utils:3)>=3.4.5.27
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
deleted file mode 100644
index 0f87c09b1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.config/KVIrc
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
deleted file mode 100644
index 2311f8e96..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
+++ /dev/null
@@ -1,45 +0,0 @@
-# KVIrc configuration file
-[help]
-IconId=49
-Visible=1
-Label=Help
-Count=2
-0=kvirc.helpindex
-1=kvirc.kvircruhomepage
-[irccontext]
-3=kvirc.channelmenu
-IconId=212
-4=kvirc.separator
-Visible=1
-Label=IRC%20Context
-5=kvirc.nicknamemenu
-6=kvirc.irctools
-7=kvirc.usermodemenu
-8=kvirc.awayback
-9=kvirc.separator
-Count=11
-10=kvirc.filetransfer
-0=kvirc.connect
-1=kvirc.servermenu
-2=kvirc.newirccontext
-[scripting]
-3=kvirc.popupeditor
-IconId=81
-4=kvirc.raweditor
-Visible=0
-Label=Scripting
-5=kvirc.codetester
-6=kvirc.separator
-7=kvirc.executekvs
-Count=8
-0=kvirc.actioneditor
-1=kvirc.aliaseditor
-2=kvirc.eventeditor
-[options]
-IconId=20
-Visible=1
-Label=Options
-Count=3
-0=kvirc.identityoptions
-1=kvirc.generaloptions
-2=kvirc.themeoptions
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
deleted file mode 100644
index 54d7573ea..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
+++ /dev/null
@@ -1,12 +0,0 @@
-# KVIrc configuration file
-[KVIrc]
-AddonVersion=4.1.1
-ActionVersion=4.1.1
-AliasVersion=4.1.1.5653
-Date=2010-12-25
-Version=4.1.1
-EventVersion=4.1.1.5219
-PopupVersion=4.1.1.5979
-ClassVersion=4.1.1
-RawVersion=4.1.1
-ToolbarVersion=4.1.1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
deleted file mode 100644
index c95950e24..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
+++ /dev/null
@@ -1,111 +0,0 @@
-# KVIrc configuration file
-[OnNotifyListDefaultActionRequest]
-Buffer0=if($0%20!=%20"")%0a{%0a%09query%20$0;%20whois%20$0%20$0;%0a}
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnChannelLinkPopupRequest]
-Buffer0=if($0%20!=%20"")%20popup.show%20channelpopup%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnURLLinkPopupRequest]
-Buffer0=popup.show%20urlpopup%20$0
-Name0=URL%20popup
-NHandlers=1
-Enabled0=true
-[OnNotifyListPopupRequest]
-Buffer0=if($0%20!=%20"")%20popup.show%20defaulttextview%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnQueryPopupRequest]
-Buffer0=if($target)%20popup.show%20querytextview%20$target;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnQueryWindowCreated]
-Buffer0=button(w,Logging,119,$tr("Logging","defscript"))%0a{%0a%09popup.show%20-p=$0,$1%20logging;%0a}
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnKVIrcStartup]
-Buffer0=fish.load
-Name0=autoloadfish
-NHandlers=1
-Enabled0=true
-[OnConsolePopupRequest]
-Buffer0=popup.show%20consoletextview;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnHostLinkPopupRequest]
-Buffer0=popup.show%20hostpopup%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnChannelNickLinkClick]
-Buffer0=if($0%20!=%20"")%0a{%0a%09window.insertInInputText%20$window%20$0$option(stringNickCompletionPostfix);%0a%09userlist.select%20$0%0a%09userlist.ensureVisible%20$0%0a}
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnChannelNickDefaultActionRequest]
-Buffer0=if(!$isEmpty($0))%20query%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnChannelNickPopupRequest]
-Buffer0=if($0%20!=%20"")%20popup.show%20channel%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnURLLinkClick]
-Buffer0=openurl%20$0
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnChannelPopupRequest]
-Buffer0=popup.show%20channeltextview%20$target;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnChannelWindowCreated]
-Buffer0=button(w,Logging,119,$tr("Logging","defscript"))%0a{%0a%09popup.show%20-p=$0,$1%20logging;%0a}
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnDCCChatPopupRequest]
-Buffer0=popup.show%20dccchat%20$dcc.remoteNick($0);
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnQueryFileDropped]
-Buffer0=if($0%20!=%20"")%20dcc.send%20$target%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnDCCChatWindowCreated]
-Buffer0=button(w,Logging,119,$tr("Logging","defscript"))%0a{%0a%09popup.show%20-p=$0,$1%20logging;%0a}
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnNickLinkDefaultActionRequest]
-Buffer0=if($0%20!=%20"")%20whois%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnWindowPopupRequest]
-Buffer0=popup.show%20windowpopup;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnNickLinkPopupRequest]
-Buffer0=if($0%20!=%20"")%20popup.show%20defaulttextview%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
-[OnQueryNickPopupRequest]
-Buffer0=if($0%20!=%20"")%20popup.show%20querytextview%20$0;
-Name0=default
-NHandlers=1
-Enabled0=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
deleted file mode 100644
index 56021f0e1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
+++ /dev/null
@@ -1,43 +0,0 @@
-# Calculate format=kde
-[Frame]
-boolCloseInTray=true
-boolShowChannelsJoinOnIrc=false
-boolShowServersConnectDialogOnStart=false
-
-[Geometry]
-rectFrameGeometry=839,112,905,560
-
-[Url]
-uintUrlMouseClickNum=1
-
-[User]
-#?hr_virtual==virtualbox#
-#-ini(tmp.vm,VB)-#
-#hr_virtual#
-#?hr_virtual==vmware#
-#-ini(tmp.vm,VM)-#
-#hr_virtual#
-#?hr_virtual==qemu#
-#-ini(tmp.vm,QE)-#
-#hr_virtual#
-stringNickname1=#-case(capitalize,ur_login)-##-ini(tmp.vm)-#-#-os_locale_language-#
-stringNickname2=#-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#
-stringNickname3=#-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#
-stringNickname4=#-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#
-stringRealname=#-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-#
-#-ini(tmp.vm,)-#
-#?os_root_type==hdd&&hr_virtual==#
-stringUsername = #-os_linux_shortname-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual==#
-stringUsername = Live#-os_linux_shortname-#
-#os_root_type#
-#?os_root_type==hdd&&hr_virtual!=#
-stringUsername = #-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-#?os_root_type!=hdd&&hr_virtual!=#
-stringUsername = Live#-os_linux_shortname-#|#-hr_virtual-#
-#os_root_type#
-stringQuitMessage=Get%20Calculate%20http://www.calculate-linux.org
-stringPartMessage=Easy%20Linux%20from%20the%20Source
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
deleted file mode 100644
index 0752c2e06..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
+++ /dev/null
@@ -1,1439 +0,0 @@
-# KVIrc configuration file
-[highlight]
-_Prologue0=if($0!="")%0a{%0a%09%25:regName%20=%20$reguser.match($mask($0))%0a%09%25:beingHl%20=%20$reguser.property(%25:regName,highlight)%0a%09if($channel)%0a%09%09%25:beingHlTmp%20=%20$tmphighlight.isNickHighLighted($0)%0a%09else%0a%09%09%25:beingHlTmp%20=%20$false;%0a}
-_0_Icon=44
-_2_0_Type=1
-_2_3_Expr="$reguser.exactMatch($mask($0,3))"%20==%20""
-_2_5_Code=reguser.add%20-f%20-q%20$0%20$mask($0,5);%20reguser.setproperty%20$0%20highlight%201;
-_PrologueId0=prologue_0_for_highlight
-_0_Id=highlight.item0
-_1_Icon=269
-_2_1_Type=1
-_2_4_Expr="$reguser.exactMatch($mask($0,4))"%20==%20""
-_Count=5
-_1_Id=highlight.item1
-_2_Icon=269
-_2_EpilogueCount=0
-_2_2_Type=1
-_2_5_Expr="$reguser.exactMatch($mask($0,5))"%20==%20""
-_0_Code=tmphighlight.removeNick%20$0
-_2_Id=highlight.subpopup2
-_2_0_Text=$tr("Highlight%20As","defscript")%20$0%20"("$mask($0,11)")"
-_2_3_Type=1
-_3_Icon=269
-_1_Code=tmphighlight.addNick%20$0
-_2_PrologueCount=0
-_2_1_Text=$tr("Highlight%20As","defscript")%20$0%20"("$mask($0,12)")"
-_2_4_Type=1
-_3_Id=highlight.item3
-_4_Icon=44
-_0_Expr=%25:beingHlTmp%20&&%20!%25:beingHl
-_2_2_Text=$tr("Highlight%20As","defscript")%20$0%20"("$mask($0,13)")"
-_2_5_Type=1
-_4_Id=highlight.item4
-_1_Expr=!%25:beingHlTmp%20&&%20!%25:beingHl
-_2_3_Text=$tr("Highlight%20As","defscript")%20$0%20"("$mask($0,3)")"
-_3_Code=reguser.setproperty%20$0%20highlight%201
-_2_Expr=!%25:beingHl%20&&%20!%25:regName
-_2_4_Text=$tr("Highlight%20As","defscript")%20$0%20"("$mask($0,4)")"
-_4_Code=reguser.setproperty%20$0%20highlight%200
-_0_Type=1
-_2_5_Text=$tr("Highlight%20As","defscript")%20$0%20"("$mask($0,5)")"
-_3_Expr=!%25:beingHl%20&&%20%25:regName
-_1_Type=1
-_4_Expr=%25:beingHl
-_EpilogueCount=0
-_2_Type=2
-_2_0_Id=highlight.subpopup2.item0
-_0_Text=$tr("Stop%20Highlighting%20(Local)","defscript")
-_2_Count=6
-_2_1_Id=highlight.subpopup2.item1
-_3_Type=1
-_PrologueCount=1
-_1_Text=$tr("Start%20Highlighting%20(Local)","defscript")
-_2_0_Code=reguser.add%20-f%20-q%20$0%20$mask($0,11);%20reguser.setproperty%20$0%20highlight%201;
-_2_2_Id=highlight.subpopup2.item2
-_4_Type=1
-_2_Text=$tr("Always%20Highlight","defscript")
-_2_1_Code=reguser.add%20-f%20-q%20$0%20$mask($0,12);%20reguser.setproperty%20$0%20highlight%201;
-_2_3_Id=highlight.subpopup2.item3
-_2_0_Expr="$reguser.exactMatch($mask($0,11))"%20==%20""
-_2_2_Code=reguser.add%20-f%20-q%20$0%20$mask($0,13);%20reguser.setproperty%20$0%20highlight%201;
-_2_4_Id=highlight.subpopup2.item4
-_3_Text=$tr("Always%20Highlight","defscript")
-_2_1_Expr="$reguser.exactMatch($mask($0,12))"%20==%20""
-_2_3_Code=reguser.add%20-f%20-q%20$0%20$mask($0,3);%20reguser.setproperty%20$0%20highlight%201;
-_2_5_Id=highlight.subpopup2.item5
-_4_Text=$tr("Stop%20Highlighting","defscript")
-_2_2_Expr="$reguser.exactMatch($mask($0,13))"%20==%20""
-_2_4_Code=reguser.add%20-f%20-q%20$0%20$mask($0,4);%20reguser.setproperty%20$0%20highlight%201;
-[dccchat]
-_Prologue0=#%20we%20use%20the%20extended%20scope%20variables:%20they%20are%20visible%20in%20the%20entire%20defpopup%20scope%0a#%20%25:visible%20is%20the%20string%20that%20we%20will%20"show%20to%20the%20user"%20in%20the%20popup%20widget%0a#%20for%20multiple%20users%20the%20string%20might%20become%20long%20so%20we%20are%20going%20to%20change%20it%20in%20"multiple%20users"%0a%25:visible%20=%20$0%0a#%20%25:multiple%20is%20an%20internal%20flag:%20set%20to%201%20if%20the%20parameter%20passed%20to%20the%20popup%20contains%20a%20list%0a#%20of%20multiple%20nicknames%20rather%20than%20a%20single%20nick%0a%25:multiple%20=%200%0a#%20finally%20,%20set%20these%20variables%0aif($str.findfirst(%25:visible,",")%20!=%20-1)%0a{%0a%09#%20found%20a%20comma%20in%20the%20$0%20parameter...we%20have%20multiple%20nicknames%0a%09%25:visible%20=%20"("$tr("Multiple%20Users","defscript")")"%0a%09%25:multiple%20=%201%0a}
-_6_Text=$tr("Clear%20Buffer","defscript")
-_PrologueId0=prologue_0_for_dccchat
-_0_Id=dummySeparator
-_1_Icon=162
-_Count=7
-_1_Id=dccchat.
-_2_Icon=325
-_2_Id=dccchat.
-_3_Id=dummySeparator
-_4_Icon=57
-_4_Id=dccchat.item4
-_5_Id=dummySeparator
-_6_Icon=120
-_1_ExtName=ctcp
-_4_Code=avatar.notify%20$0
-_6_Id=dccchat.item6
-_0_Type=0
-_2_ExtName=dcc
-_1_Type=4
-_6_Code=clear
-_EpilogueCount=0
-_2_Type=4
-_3_Type=0
-_PrologueCount=1
-_1_Text=C&TCP
-_4_Type=1
-_2_Text=&DCC
-_5_Type=0
-_6_Type=1
-_4_Text=$tr("Notify%20Avatar","defscript")
-[querytextview]
-_Prologue0=#%20we%20use%20the%20extended%20scope%20variables:%20they%20are%20visible%20in%20the%20entire%20defpopup%20scope%0a#%20%25:visible%20is%20the%20string%20that%20we%20will%20"show%20to%20the%20user"%20in%20the%20popup%20widget%0a#%20for%20multiple%20users%20the%20string%20might%20become%20long%20so%20we%20are%20going%20to%20change%20it%20in%20"multiple%20users"%0a%25:visible%20=%20$0%0a#%20%25:multiple%20is%20an%20internal%20flag:%20set%20to%201%20if%20the%20parameter%20passed%20to%20the%20popup%20contains%20a%20list%0a#%20of%20multiple%20nicknames%20rather%20than%20a%20single%20nick%0a%25:multiple%20=%200%0a#%20finally%20,%20set%20these%20variables%0aif($str.findfirst(%25:visible,",")%20!=%20-1)%0a{%0a%09#%20found%20a%20comma%20in%20the%20$0%20parameter...we%20have%20multiple%20nicknames%0a%09%25:visible%20=%20"("$tr("Multiple%20Users","defscript")")"%0a%09%25:multiple%20=%201%0a}
-_0_Icon=6
-_4_5_Id=querytextview.subpopup4.item5
-_6_Text=C&TCP
-_9_Type=4
-_11_Id=querytextview.item11
-_PrologueId0=prologue_0_for_querytextview
-_0_Id=querytextview.item0
-_4_4_Code=foreach(%25i,$str.split(",",$0))dns%20%25i
-_7_Text=&DCC
-_12_Id=dummySeparator
-_13_Icon=120
-_Count=14
-_1_Id=dummySeparator
-_2_Icon=88
-_4_0_Type=1
-_4_5_Code=echo%20$mask($0,11)
-_11_Code=avatar.notify%20$0
-_13_Id=querytextview.item13
-_0_Code=window.dock
-_2_Id=querytextview.item2
-_4_1_Type=1
-_9_Text=$tr("&Ignore","defscript")
-_10_Expr=!%25:multiple
-_3_Id=dummySeparator
-_4_Icon=317
-_4_EpilogueCount=0
-_4_2_Type=1
-_4_5_Expr=!%25:multiple
-_10_ExtName=registration
-_13_Code=clear
-_0_Expr=!$window.isDocked()
-_2_Code=whois%20$0%20$0
-_4_Id=querytextview.subpopup4
-_4_0_Text=$str.printf($tr("/WHOIS%20?s","defscript"),$0)
-_4_3_Type=0
-_1_Expr=!$window.isDocked()
-_4_PrologueCount=0
-_4_1_Text=$str.printf($tr("/WHOWAS%20?s","defscript"),$0)
-_4_4_Type=1
-_5_Id=dummySeparator
-_6_Icon=162
-_10_Type=4
-_2_Expr=!%25:multiple
-_4_2_Text=$str.printf($tr("/WHO%20?s","defscript"),$0)
-_4_5_Type=1
-_6_Id=querytextview.
-_7_Icon=325
-_11_Type=1
-_0_Type=1
-_7_Id=querytextview.
-_12_Type=0
-_1_Type=0
-_4_4_Text=$tr("DNS%20for","defscript")%20$0
-_8_Id=dummySeparator
-_9_Icon=203
-_10_Text=$tr("&Registration","defscript")
-_13_Type=1
-_EpilogueCount=0
-_2_Type=1
-_4_5_Text=$tr("Mask%20for","defscript")%20$0
-_9_Id=querytextview.
-_11_Text=$tr("Notify%20Avatar","defscript")
-_0_Text=$tr("Dock","defscript")
-_3_Type=0
-_4_0_Icon=88
-_PrologueCount=1
-_4_Type=2
-_4_0_Id=querytextview.subpopup4.item0
-_4_1_Icon=92
-_6_ExtName=ctcp
-_13_Text=$tr("Clear%20Buffer","defscript")
-_2_Text=$str.printf($tr("/WHOIS%20?s%20(idle%20time)","defscript"),$0)
-_4_Count=6
-_4_1_Id=querytextview.subpopup4.item1
-_4_2_Icon=75
-_5_Type=0
-_7_ExtName=dcc
-_4_0_Code=whois%20$0
-_4_2_Id=querytextview.subpopup4.item2
-_6_Type=4
-_9_Expr=!%25:multiple
-_4_Text=$tr("&Information","defscript")
-_4_1_Code=whowas%20$0
-_4_3_Id=dummySeparator
-_4_4_Icon=91
-_7_Type=4
-_9_ExtName=ignore
-_10_Icon=113
-_4_2_Code=who%20$0
-_4_4_Id=querytextview.subpopup4.item4
-_4_5_Icon=15
-_8_Type=0
-_10_Id=querytextview.
-_11_Icon=57
-[channelpopup]
-_0_Icon=289
-_0_Id=channelpopup.item0
-_1_Icon=40
-_7_Text=$tr("Copy%20Channel%20Address","defscript")
-_Count=8
-_1_Id=channelpopup.item1
-_2_Icon=39
-_0_Code=hop%20$0;
-_2_Id=channelpopup.item2
-_1_Code=if($channel($0))%20eval%20"part%20$escape($0)%20$option(stringPartMessage)";
-_3_Id=dummySeparator
-_4_Icon=75
-_2_Code=join%20$0;
-_4_Id=channelpopup.item4
-_5_Icon=75
-_1_Expr=$channel($0)
-_5_Id=channelpopup.item5
-_2_Expr=!$channel($0)
-_4_Code=names%20$0;
-_6_Id=dummySeparator
-_7_Icon=18
-_0_Type=1
-_5_Code=who%20$0;
-_7_Id=channelpopup.item7
-_1_Type=1
-_EpilogueCount=0
-_2_Type=1
-_7_Code=str.toClipboard%20$chan.getUrl($0)
-_0_Text=$tr("&Hop","defscript")%20$0
-_3_Type=0
-_PrologueCount=0
-_1_Text=$tr("&Part","defscript")%20$0
-_4_Type=1
-_2_Text=$tr("&Join","defscript")%20$0
-_5_Type=1
-_6_Type=0
-_4_Text=/NAMES%20$0
-_7_Type=1
-_5_Text=/WHO%20$0
-[ctcp]
-_0_Icon=36
-_6_Text=TIME
-_0_Id=ctcp.item0
-_1_Icon=268
-_7_Text=PAGE...
-_Count=9
-_1_Id=ctcp.item1
-_2_Icon=16
-_8_Text=AVATAR
-_0_Code=ctcp%20$0%20PING
-_2_Id=ctcp.item2
-_3_Icon=178
-_1_Code=ctcp%20$0%20FINGER
-_3_Id=ctcp.item3
-_4_Icon=29
-_2_Code=ctcp%20$0%20VERSION
-_4_Id=ctcp.item4
-_5_Icon=55
-_3_Code=ctcp%20$0%20USERINFO
-_5_Id=ctcp.item5
-_6_Icon=93
-_4_Code=ctcp%20$0%20CLIENTINFO
-_6_Id=ctcp.item6
-_7_Icon=180
-_0_Type=1
-_5_Code=ctcp%20$0%20SOURCE
-_7_Id=ctcp.item7
-_8_Icon=57
-_1_Type=1
-_6_Code=ctcp%20$0%20TIME
-_8_Id=ctcp.item8
-_EpilogueCount=0
-_2_Type=1
-_7_Code=#dialog.textinput%20-d=$tr("Wakeup!","defscript")%20($tr("CTCP%20Page%20to","defscript")%20$0,$tr("Enter%20the%20message%20text","defscript"),$tr("Ok","defscript"),$tr("Cancel","defscript"))%0adialog.textinput(CTCP%20Page%20$0,$tr("Enter%20the%20message%20text","defscript"),$tr("&Page","defscript"),$tr("Cancel","defscript"),"",$0)%0a{%0a%09if($0%20==%200)ctcp%20$2%20PAGE%20$1%0a}
-_0_Text=PING
-_3_Type=1
-_8_Code=ctcp%20$0%20AVATAR
-_PrologueCount=0
-_1_Text=FINGER
-_4_Type=1
-_2_Text=VERSION
-_5_Type=1
-_3_Text=USERINFO
-_6_Type=1
-_4_Text=CLIENTINFO
-_7_Type=1
-_5_Text=SOURCE
-_8_Type=1
-[urlpopup]
-_0_Icon=18
-_0_Id=urlpopup.item0
-_Count=1
-_0_Code=str.toClipboard%20$0
-_0_Type=1
-_EpilogueCount=0
-_0_Text=$tr("Copy%20to%20Clipboard","defscript")
-_PrologueCount=0
-[consoletextview]
-_0_Icon=6
-_5_2_Code=lusers
-_5_3_PrologueCount=0
-_5_3_1_Text=$tr("l%20(Connections)","defscript")
-_5_3_4_Type=1
-_5_4_Id=consoletextview.subpopup5.item4
-_5_5_Icon=261
-_0_Id=consoletextview.item0
-_5_3_2_Text=$tr("m%20(Command%20Usage)","defscript")
-_5_3_5_Type=1
-_5_5_Id=consoletextview.subpopup5.item5
-_5_6_Icon=16
-_7_Text=$tr("You're%20not%20connected%20to%20a%20server","defscript")
-_Count=9
-_1_Id=dummySeparator
-_2_Icon=31
-_5_3_3_Text=$tr("o%20(Operators)","defscript")
-_5_3_6_Type=1
-_5_4_Code=time
-_5_6_Id=consoletextview.subpopup5.item6
-_5_7_Icon=49
-_8_Text=$tr("Clear%20Buffer","defscript")
-_0_Code=window.dock
-_2_Id=consoletextview.
-_5_0_Type=1
-_5_3_4_Text=$tr("t%20(Connection%20Stats?)","defscript")
-_5_3_7_Type=1
-_5_5_Code=admin
-_5_7_Id=consoletextview.subpopup5.item7
-_3_Id=dummySeparator
-_4_Icon=39
-_5_1_Type=1
-_5_3_5_Text=$tr("u%20(Uptime)","defscript")
-_5_6_Code=version
-_0_Expr=!$window.isDocked()
-_4_Id=consoletextview.item4
-_5_Icon=317
-_5_EpilogueCount=0
-_5_2_Type=1
-_5_3_6_Text=$tr("y%20(Y-Lines)","defscript")
-_5_7_Code=raw%20help
-_1_Expr=!$window.isDocked()
-_5_Id=consoletextview.subpopup5
-_5_0_Text=/MOTD
-_5_3_Type=2
-_5_3_0_Id=consoletextview.subpopup5.subpopup3.item0
-_5_3_7_Text=$tr("z%20(Debug%20Stats?)","defscript")
-_2_Expr=$server
-_4_Code=if($option(boolShowChannelsJoinDialogAsToplevel))channelsjoin.open%20-t;else%20channelsjoin.open
-_5_PrologueCount=0
-_5_1_Text=/INFO
-_5_3_Count=8
-_5_3_1_Id=consoletextview.subpopup5.subpopup3.item1
-_5_4_Type=1
-_6_Id=dummySeparator
-_0_Type=1
-_2_ExtName=channels
-_5_2_Text=/LUSERS
-_5_3_0_Code=stats%20d
-_5_3_2_Id=consoletextview.subpopup5.subpopup3.item2
-_5_5_Type=1
-_7_Id=consoletextview.label7
-_8_Icon=120
-_1_Type=0
-_4_Expr=$server
-_5_3_Text=/STATS
-_5_3_1_Code=stats%20l
-_5_3_3_Id=consoletextview.subpopup5.subpopup3.item3
-_5_6_Type=1
-_8_Id=consoletextview.item8
-_EpilogueCount=0
-_2_Type=4
-_5_Expr=$server
-_5_3_2_Code=stats%20m
-_5_3_4_Id=consoletextview.subpopup5.subpopup3.item4
-_5_4_Text=/TIME
-_5_7_Type=1
-_0_Text=$tr("Dock","defscript")
-_3_Type=0
-_5_3_3_Code=stats%20o
-_5_3_5_Id=consoletextview.subpopup5.subpopup3.item5
-_5_5_Text=/ADMIN
-_8_Code=clear;
-_PrologueCount=0
-_4_Type=1
-_5_0_Icon=30
-_5_3_4_Code=stats%20t
-_5_3_6_Id=consoletextview.subpopup5.subpopup3.item6
-_5_6_Text=/VERSION
-_7_Expr=!$server
-_2_Text=$tr("Channels","defscript")
-_5_Type=2
-_5_0_Id=consoletextview.subpopup5.item0
-_5_1_Icon=317
-_5_3_0_Type=1
-_5_3_5_Code=stats%20u
-_5_3_7_Id=consoletextview.subpopup5.subpopup3.item7
-_5_7_Text=/HELP
-_5_Count=8
-_5_1_Id=consoletextview.subpopup5.item1
-_5_2_Icon=178
-_5_3_1_Type=1
-_5_3_6_Code=stats%20y
-_6_Type=0
-_4_Text=$tr("&Join%20Channels...","defscript")
-_5_0_Code=motd
-_5_2_Id=consoletextview.subpopup5.item2
-_5_3_Icon=205
-_5_3_EpilogueCount=0
-_5_3_2_Type=1
-_5_3_7_Code=stats%20z
-_7_Type=3
-_5_Text=$tr("&Information","defscript")
-_5_1_Code=info
-_5_3_Id=consoletextview.subpopup5.subpopup3
-_5_3_0_Text=$tr("d%20(Debug/DNS?)","defscript")
-_5_3_3_Type=1
-_5_4_Icon=93
-_8_Type=1
-[windowpopup]
-_Prologue0=%25:bIsConnectedConsole%20=%20$(($window.type%20==%20"console")%20&&%20($context.state%20==%20"connected"));%0a%0aif($window.type%20==%20"channel")%0a{%0a%09%25:bIsChannel%20=%20$true;%0a%09%25:szNetwork%20=%20$context.serverdbNetworkName()%0a%09%25:szServer%20=%20$context.serverdbServerHostName()%0a%09%25:bIsAutoJoinedOnNetwork%20=%20$false;%0a%09%25:bIsAutoJoinedOnServer%20=%20$false;%0a%0a%09if($serverdb.networkExists(%25:szNetwork))%0a%09{%0a%09%09foreach(%25szChanAndPass,$serverdb.networkJoinChannels(%25:szNetwork))%0a%09%09{%0a%09%09%09%25aChanAndPass%20=%20$str.split(":",%25szChanAndPass)%0a%0a%09%09%09if(%25aChanAndPass[0]%20==%20$chan.name)%0a%09%09%09{%0a%09%09%09%09%25:bIsAutoJoinedOnNetwork%20=%20$true;%0a%09%09%09%09break;%0a%09%09%09}%0a%09%09}%0a%09%09if($serverdb.serverExists(%25:szServer,%25:szNetwork))%0a%09%09{%0a%09%09%09foreach(%25szChanAndPass,$serverdb.serverJoinChannels(%25:szNetwork,%25:szServer))%0a%09%09%09{%0a%09%09%09%09%25aChanAndPass%20=%20$str.split(":",%25szChanAndPass)%0a%0a%09%09%09%09if(%25aChanAndPass[0]%20==%20$chan.name)%0a%09%09%09%09{%0a%09%09%09%09%09%25:bIsAutoJoinedOnServer%20=%20$true;%0a%09%09%09%09%09break;%0a%09%09%09%09}%0a%09%09%09}%0a%09%09}%20else%20{%0a%09%09%09%25:szServer%20=%20""%0a%09%09}%0a%09}%20else%20{%0a%09%09%25:szNetwork%20=%20""%0a%09}%0a%09%25:bIsAutoJoined%20=%20$(%25:bIsAutoJoinedOnNetwork%20||%20%25:bIsAutoJoinedOnServer)%0a}%20else%20{%0a%09%25:bIsChannel%20=%20$false;%0a}
-_0_Icon=6
-_9_Type=0
-_10_PrologueCount=0
-_10_1_Text=$str.printf($tr("When%20Connecting%20to%20Network%20'?s'","defscript"),%25:szNetwork)
-_11_Id=windowpopup.item11
-_12_Icon=44
-_18_Text=$tr("Close%20All%20Dead%20Queries"%20,"defscript")
-_20_Id=windowpopup.item20
-_PrologueId0=prologue_0_for_windowpopup
-_0_Id=windowpopup.item0
-_1_Icon=7
-_7_Text=$tr("Logging","defscript")
-_12_Id=windowpopup.item12
-_21_Id=windowpopup.item21
-_Count=23
-_1_Id=windowpopup.item1
-_8_Text=$tr("Set%20Window%20Properties%20As%20Default","defscript")
-_11_Code=%25aChans%20=%20$array()%0aforeach(%25szChanAndPass,$serverdb.serverJoinChannels(%25:szNetwork,%25:szServer))%0a{%0a%09%25aChanAndPass%20=%20$str.split(":",%25szChanAndPass)%0a%0a%09if(%25aChanAndPass[0]%20!=%20$chan.name)%0a%09%09%25aChans%20<+%20%25szChanAndPass;%0a}%0aserverdb.setServerJoinChannels%20%25:szNetwork%20%25:szServer%20%25aChans
-_13_Id=dummySeparator
-_14_Icon=40
-_20_Code=foreach(%25x,$window.list(all))%0a%09window.highlight%200%20%25x
-_22_Id=windowpopup.item22
-_0_Code=window.dock
-_2_Id=dummySeparator
-_3_Icon=1
-_10_Expr=%25:bIsChannel%20&&%20(!%25:bIsAutoJoined)%20&&%20((%25:szServer%20!=%20"")%20||%20(%25:szNetwork%20!=%20""))
-_12_Code=%25aChans%20=%20$array()%0aforeach(%25szChanAndPass,$serverdb.networkJoinChannels(%25:szNetwork))%0a{%0a%09%25aChanAndPass%20=%20$str.split(":",%25szChanAndPass)%0a%0a%09if(%25aChanAndPass[0]%20!=%20$chan.name)%0a%09%09%25aChans%20<+%20%25szChanAndPass;%0a}%0aserverdb.setNetworkJoinChannels%20%25:szNetwork%20%25aChans
-_14_Id=windowpopup.item14
-_15_Icon=47
-_21_Code=foreach(%25x,$window.list(channel))%0a%09window.highlight%200%20%25x
-_1_Code=window.undock
-_3_Id=windowpopup.item3
-_4_Icon=289
-_11_Expr=%25:bIsChannel%20&&%20%25:bIsAutoJoinedOnServer
-_15_Id=windowpopup.item15
-_16_Icon=232
-_20_Expr=%25:bIsConnectedConsole
-_22_Code=foreach(%25x,$window.list(query))%0a%09window.highlight%200%20%25x
-_0_Expr=!$window.isDocked()
-_4_Id=windowpopup.item4
-_5_Icon=40
-_10_0_Icon=$icon("server")
-_12_Expr=%25:bIsChannel%20&&%20%25:bIsAutoJoinedOnNetwork
-_14_Code=foreach(%25x,$window.list(channel))%0a%09%25channels%20<+%20$target(%25x);%0apart%20$str.join(",",%25channels);
-_16_Id=windowpopup.item16
-_17_Icon=232
-_21_Expr=%25:bIsConnectedConsole%20&&%20($window.list(channel))
-_1_Expr=$window.isDocked()
-_3_Code=window.close
-_5_Id=windowpopup.item5
-_10_Type=2
-_10_0_Id=windowpopup.subpopup10.item0
-_10_1_Icon=$icon("world")
-_13_Expr=%25:bIsConnectedConsole
-_15_Code=foreach(%25x,$window.list(query))%0a%09window.close%20%25x
-_17_Id=windowpopup.item17
-_18_Icon=233
-_22_Expr=%25:bIsConnectedConsole%20&&%20($window.list(query))
-_4_Code=hop%20$0;
-_6_Id=dummySeparator
-_7_Icon=119
-_10_Count=2
-_10_1_Id=windowpopup.subpopup10.item1
-_11_Type=1
-_14_Expr=%25:bIsConnectedConsole%20&&%20($window.list(channel))
-_16_Code=foreach(%25x,$window.list(deadchannel))%0a%09%25channels%20<+%20$target(%25x);%0ajoin%20$str.join(",",%25channels);
-_18_Id=windowpopup.item18
-_20_Type=1
-_0_Type=1
-_5_Code=if($channel())%20eval%20"part%20$escape($0)%20$option(stringPartMessage)";
-_7_Id=windowpopup.
-_8_Icon=10
-_10_0_Code=%25aChans%20=%20$serverdb.serverJoinChannels(%25:szNetwork,%25:szServer)%0a%25aChans%20<+%20$chan.name%0aserverdb.setServerJoinChannels%20%25:szNetwork%20%25:szServer%20%25aChans
-_12_Type=1
-_15_Expr=%25:bIsConnectedConsole%20&&%20($window.list(query))
-_17_Code=foreach(%25x,$window.list(deadchannel))%0a%09window.close%20%25x
-_19_Id=dummySeparator
-_21_Type=1
-_1_Type=1
-_4_Expr=$channel
-_8_Id=windowpopup.item8
-_10_Text=$tr("Automatically%20Join%20Channel","defscript")
-_10_1_Code=%25aChans%20=%20$serverdb.networkJoinChannels(%25:szNetwork)%0a%25aChans%20<+%20$chan.name%0aserverdb.setNetworkJoinChannels%20%25:szNetwork%20%25aChans
-_13_Type=0
-_16_Expr=%25:bIsConnectedConsole%20&&%20($window.list(deadchannel))
-_18_Code=foreach(%25x,$window.list(deadquery))%0a%09window.close%20%25x
-_22_Type=1
-_EpilogueCount=0
-_2_Type=0
-_5_Expr=$channel
-_9_Id=dummySeparator
-_10_0_Expr=%25:szServer%20!=%20""
-_11_Text=$str.printf($tr("Stop%20Auto-joining%20Channel%20on%20Server%20'?s'","defscript"),%25:szServer)
-_14_Type=1
-_17_Expr=%25:bIsConnectedConsole%20&&%20($window.list(deadchannel))
-_20_Text=$tr("Unhighlight%20All%20Windows"%20,"defscript")
-_0_Text=$tr("Dock","defscript")
-_3_Type=1
-_8_Code=window.savePropertiesAsDefault
-_10_1_Expr=%25:szNetwork%20!=%20""
-_12_Text=$str.printf($tr("Stop%20Auto-joining%20Channel%20on%20Network%20'?s'","defscript"),%25:szNetwork)
-_15_Type=1
-_18_Expr=%25:bIsConnectedConsole%20&&%20($window.list(deadquery))
-_21_Text=$tr("Unhighlight%20All%20Channels"%20,"defscript")
-_PrologueCount=1
-_1_Text=$tr("Undock","defscript")
-_4_Type=1
-_16_Type=1
-_19_Expr=%25:bIsConnectedConsole
-_22_Text=$tr("Unhighlight%20All%20Queries"%20,"defscript")
-_5_Type=1
-_7_ExtName=logging
-_10_0_Type=1
-_14_Text=$tr("Part%20All%20Channels","defscript")
-_17_Type=1
-_3_Text=$tr("Close","defscript")
-_6_Type=0
-_9_Expr=%25:bIsChannel
-_10_1_Type=1
-_15_Text=$tr("Close%20All%20Queries","defscript")
-_18_Type=1
-_4_Text=$tr("&Hop","defscript")%20$0
-_7_Type=4
-_10_Icon=$icon("join")
-_10_EpilogueCount=0
-_16_Text=$tr("Rejoin%20All%20Dead%20Channels"%20,"defscript")
-_19_Type=0
-_5_Text=$tr("&Part","defscript")%20$0
-_8_Type=1
-_10_Id=windowpopup.subpopup10
-_10_0_Text=$str.printf($tr("When%20Connecting%20to%20Server%20'?s'","defscript"),%25:szServer)
-_11_Icon=44
-_17_Text=$tr("Close%20All%20Dead%20Channels"%20,"defscript")
-[defaulttextview]
-_Prologue0=#%20we%20use%20the%20extended%20scope%20variables:%20they%20are%20visible%20in%20the%20entire%20defpopup%20scope%0a#%20%25:visible%20is%20the%20string%20that%20we%20will%20"show%20to%20the%20user"%20in%20the%20popup%20widget%0a#%20for%20multiple%20users%20the%20string%20might%20become%20long%20so%20we%20are%20going%20to%20change%20it%20in%20"multiple%20users"%0a%25:visible%20=%20$0%0a#%20%25:multiple%20is%20an%20internal%20flag:%20set%20to%201%20if%20the%20parameter%20passed%20to%20the%20popup%20contains%20a%20list%0a#%20of%20multiple%20nicknames%20rather%20than%20a%20single%20nick%0a%25:multiple%20=%200%0a#%20finally%20,%20set%20these%20variables%0aif($str.findfirst(%25:visible,",")%20!=%20-1)%0a{%0a%09#%20found%20a%20comma%20in%20the%20$0%20parameter...we%20have%20multiple%20nicknames%0a%09%25:visible%20=%20"("$tr("Multiple%20Users","defscript")")"%0a%09%25:multiple%20=%201%0a}
-_0_Icon=90
-_2_0_Type=1
-_6_Text=C&TCP
-_9_Type=4
-_11_Id=defaulttextview.
-_12_Icon=57
-_PrologueId0=prologue_0_for_defaulttextview
-_0_Id=defaulttextview.item0
-_2_1_Type=1
-_7_Text=&DCC
-_12_Id=defaulttextview.item12
-_Count=15
-_1_Id=dummySeparator
-_2_Icon=317
-_2_EpilogueCount=0
-_2_2_Type=1
-_13_Id=dummySeparator
-_14_Icon=120
-_0_Code=whois%20$0%20$0
-_2_Id=defaulttextview.subpopup2
-_2_0_Text=$str.printf($tr("/WHOIS%20?s","defscript"),$0)
-_2_3_Type=0
-_9_Text=$tr("&Registration","defscript")
-_10_Expr=!%25:multiple
-_12_Code=avatar.notify%20$0
-_14_Id=defaulttextview.item14
-_2_PrologueCount=0
-_2_1_Text=$str.printf($tr("/WHOWAS%20?s","defscript"),$0)
-_2_4_Type=1
-_3_Id=dummySeparator
-_4_Icon=47
-_10_ExtName=highlight
-_11_Expr=!%25:multiple
-_0_Expr=!%25:multiple
-_2_2_Text=$str.printf($tr("/WHO%20?s","defscript"),$0)
-_4_Id=defaulttextview.item4
-_11_ExtName=ignore
-_14_Code=clear
-_5_Id=dummySeparator
-_6_Icon=162
-_10_Type=4
-_2_4_Text=DNS%20$0
-_4_Code=query%20$0
-_6_Id=defaulttextview.
-_7_Icon=325
-_11_Type=4
-_0_Type=1
-_7_Id=defaulttextview.
-_12_Type=1
-_1_Type=0
-_2_0_Icon=88
-_8_Id=dummySeparator
-_9_Icon=113
-_10_Text=$tr("&Highlight","defscript")
-_13_Type=0
-_EpilogueCount=0
-_2_Type=2
-_2_0_Id=defaulttextview.subpopup2.item0
-_2_1_Icon=92
-_9_Id=defaulttextview.
-_11_Text=$tr("Ig&nore","defscript")
-_14_Type=1
-_0_Text=$str.printf($tr("/WHOIS%20?s%20(idle%20time)","defscript"),$0)
-_2_Count=5
-_2_1_Id=defaulttextview.subpopup2.item1
-_2_2_Icon=75
-_3_Type=0
-_12_Text=$tr("Notify%20avatar","defscript")
-_PrologueCount=1
-_2_0_Code=whois%20$0
-_2_2_Id=defaulttextview.subpopup2.item2
-_4_Type=1
-_6_ExtName=ctcp
-_2_Text=$tr("&Information","defscript")
-_2_1_Code=whowas%20$0
-_2_3_Id=dummySeparator
-_2_4_Icon=91
-_5_Type=0
-_7_ExtName=dcc
-_14_Text=$tr("Clear%20Buffer","defscript")
-_2_2_Code=who%20$0
-_2_4_Id=defaulttextview.subpopup2.item4
-_6_Type=4
-_9_Expr=!%25:multiple
-_4_Text=$tr("&Query","defscript")%20%25:visible
-_7_Type=4
-_9_ExtName=registration
-_10_Icon=269
-_2_4_Code=foreach(%25i,$str.split(",",$0))dns%20%25i
-_8_Type=0
-_10_Id=defaulttextview.
-_11_Icon=203
-[hostpopup]
-_0_Icon=13
-_6_Text=$tr("Traceroute6%20to%20","defscript")$0
-_0_Id=hostpopup.item0
-_7_Text="Ping%20"$0
-_Count=9
-_1_Id=dummySeparator
-_2_Icon=185
-_8_Text="Ping6%20"$0
-_0_Code=host%20-a%20$0
-_2_Id=hostpopup.item2
-_3_Icon=9
-_3_Id=hostpopup.item3
-_2_Code=openurl%20"ftp://$0/"
-_4_Id=dummySeparator
-_5_Icon=36
-_3_Code=system.runcmd%20telnet%20$0
-_5_Id=hostpopup.item5
-_6_Icon=36
-_2_Expr="$system.ostype"%20==%20"unix"
-_6_Id=hostpopup.item6
-_7_Icon=36
-_0_Type=1
-_5_Code=if("$system.ostype"%20==%20"unix")%20system.runcmd%20traceroute%20$0%0aelse%20system.runcmd%20tracert%20$0
-_7_Id=hostpopup.item7
-_8_Icon=36
-_1_Type=0
-_6_Code=if("$system.ostype"%20==%20"unix")%20system.runcmd%20traceroute6%20$0%0aelse%20system.runcmd%20tracert6%20$0
-_8_Id=hostpopup.item8
-_EpilogueCount=0
-_2_Type=1
-_7_Code=system.runcmd%20ping%20$0
-_0_Text=$tr("Look%20Up%20","defscript")$0
-_3_Type=1
-_8_Code=system.runcmd%20ping6%20$0
-_PrologueCount=0
-_4_Type=0
-_2_Text=$tr("Open%20","defscript")"ftp://"$0"/"
-_5_Type=1
-_3_Text=$tr("Telnet%20to%20","defscript")$0
-_6_Type=1
-_7_Type=1
-_5_Text=$tr("Traceroute%20to%20","defscript")$0
-_8_Type=1
-[dcc]
-_Prologue0=if($features("SSL"))%25:bHaveSSL=1%0aelse%20%25:bHaveSSL=0
-_0_Icon=78
-_6_Text=$tr("Reverse%20Send%20to","defscript")%20$0
-_9_Type=1
-_11_Id=dummySeparator
-_12_Icon=166
-_12_EpilogueCount=0
-_12_2_Type=1
-_12_7_Code=dcc.voice%20-g=gsm%20-h=16000%20$0
-_12_9_Id=dcc.subpopup12.item9
-_12_11_Text="NULL%2011.025%20KHz%20(176.4%20kbps)"
-_PrologueId0=prologue_0_for_dcc
-_0_Id=dcc.item0
-_1_Icon=78
-_7_Text=$tr("Secure%20Reverse%20Send%20to","defscript")%20$0
-_10_Code=dcc.rsend%20-t%20$0
-_12_Id=dcc.subpopup12
-_12_0_Text=$tr("Default","defscript")":%20ADPCM%208%20KHz%20(32%20kbps)"
-_12_3_Type=1
-_12_8_Code=dcc.voice%20-g=gsm%20-h=22050%20$0
-_Count=13
-_1_Id=dcc.item1
-_2_Icon=78
-_12_PrologueCount=0
-_12_4_Type=1
-_12_9_Code=dcc.voice%20-g=gsm%20-h=44100%20$0
-_0_Code=dcc.chat%20$0
-_2_Id=dcc.item2
-_9_Text=$tr("TDCC%20Send%20to","defscript")%20$0
-_12_2_Text="ADPCM%2011.025%20KHz%20(44.1%20kbps)"
-_12_5_Type=1
-_1_Code=dcc.chat%20-z%20$0
-_3_Id=dummySeparator
-_4_Icon=78
-_12_3_Text="ADPCM%2016%20KHz%20(64%20kbps)"
-_12_6_Type=1
-_2_Code=dcc.chat%20-s%20$0
-_4_Id=dcc.item4
-_5_Icon=78
-_12_4_Text="ADPCM%2022.05%20KHz%20(88.2%20kbps)"
-_12_7_Type=1
-_5_Id=dcc.item5
-_6_Icon=78
-_10_Type=1
-_12_5_Text="GSM%208%20KHz%20(13.2%20kbps)"
-_12_8_Type=1
-_12_10_Id=dcc.subpopup12.item10
-_2_Expr=%25:bHaveSSL
-_4_Code=dcc.send%20$0
-_6_Id=dcc.item6
-_7_Icon=78
-_11_Type=0
-_12_6_Text="GSM%2011.025%20KHz%20(18.1%20kbps)"
-_12_9_Type=1
-_12_11_Id=dcc.subpopup12.item11
-_0_Type=1
-_5_Code=dcc.send%20-s%20$0
-_7_Id=dcc.item7
-_12_Type=2
-_12_0_Id=dcc.subpopup12.item0
-_12_7_Text="GSM%2016%20KHz%20(26.4%20kbps)"
-_12_10_Code=dcc.voice%20-g=null%20$0
-_1_Type=1
-_6_Code=dcc.rsend%20-z%20$0
-_8_Id=dummySeparator
-_9_Icon=77
-_10_Text=$tr("TDCC%20Reverse%20Send%20to","defscript")%20$0
-_12_Count=12
-_12_1_Id=dummySeparator
-_12_8_Text="GSM%2022.05%20KHz%20(36.2%20kbps)"
-_12_11_Code=dcc.voice%20-g=null%20-h=11025%20$0
-_EpilogueCount=0
-_2_Type=1
-_7_Code=dcc.rsend%20-z%20-s%20$0
-_9_Id=dcc.item9
-_12_0_Code=dcc.voice%20$0
-_12_2_Id=dcc.subpopup12.item2
-_12_9_Text="GSM%2044.1%20KHz%20(72.4%20kbps)"
-_0_Text=$tr("Chat%20with","defscript")%20$0
-_3_Type=0
-_12_Text=$tr("Voice%20Chat","defscript")
-_12_3_Id=dcc.subpopup12.item3
-_PrologueCount=1
-_1_Text=$tr("Reverse%20Chat%20with","defscript")%20$0
-_4_Type=1
-_9_Code=dcc.send%20-t%20$0
-_12_2_Code=dcc.voice%20-h=11025%20$0
-_12_4_Id=dcc.subpopup12.item4
-_2_Text=$tr("Secure%20Chat%20with","defscript")%20$0
-_5_Type=1
-_12_3_Code=dcc.voice%20-h=16000%20$0
-_12_5_Id=dcc.subpopup12.item5
-_12_10_Type=1
-_6_Type=1
-_12_4_Code=dcc.voice%20-h=22050%20$0
-_12_6_Id=dcc.subpopup12.item6
-_12_11_Type=1
-_4_Text=$tr("Send%20to","defscript")%20$0
-_7_Type=1
-_10_Icon=77
-_12_0_Type=1
-_12_5_Code=dcc.voice%20-g=gsm%20$0
-_12_7_Id=dcc.subpopup12.item7
-_5_Text=$tr("Secure%20Send%20to","defscript")%20$0
-_8_Type=0
-_10_Id=dcc.item10
-_12_1_Type=0
-_12_6_Code=dcc.voice%20-g=gsm%20-h=11025%20$0
-_12_8_Id=dcc.subpopup12.item8
-_12_10_Text="NULL%208%20KHz%20(128%20kbps)"
-[channeltextview]
-_0_Icon=6
-_6_Text=$tr("&Part","defscript")%20$0
-_9_Type=4
-_11_Id=channeltextview.item11
-_12_Icon=75
-_0_Id=channeltextview.item0
-_7_Text=$tr("&Join","defscript")%20$0
-_12_Id=channeltextview.item12
-_13_Icon=57
-_Count=18
-_1_Id=dummySeparator
-_2_Icon=31
-_11_Code=names%20$0;
-_13_Id=channeltextview.item13
-_0_Code=window.dock
-_2_Id=channeltextview.
-_3_Icon=31
-_9_Text=C&TCP
-_12_Code=who%20$0;
-_14_Id=dummySeparator
-_15_Icon=269
-_3_Id=channeltextview.item3
-_13_Code=avatar.notify%20$0
-_15_Id=channeltextview.
-_16_Icon=18
-_0_Expr=!$window.isDocked()
-_4_Id=dummySeparator
-_5_Icon=289
-_16_Id=channeltextview.item16
-_17_Icon=120
-_1_Expr=!$window.isDocked()
-_3_Code=if($option(boolShowChannelsJoinDialogAsToplevel))channelsjoin.open%20-t;else%20channelsjoin.open
-_5_Id=channeltextview.item5
-_6_Icon=40
-_10_Type=0
-_17_Id=channeltextview.item17
-_6_Id=channeltextview.item6
-_7_Icon=39
-_11_Type=1
-_16_Code=str.toClipboard%20$chan.getUrl
-_0_Type=1
-_2_ExtName=channels
-_3_Expr=$server
-_5_Code=hop%20$0;
-_7_Id=channeltextview.item7
-_12_Type=1
-_17_Code=clear;
-_1_Type=0
-_6_Code=if($channel($0))%20eval%20"part%20$escape($0)%20$option(stringPartMessage)";
-_8_Id=dummySeparator
-_9_Icon=162
-_13_Type=1
-_15_ExtName=channelhighlight
-_EpilogueCount=0
-_2_Type=4
-_5_Expr=$channel
-_7_Code=join%20$0;
-_9_Id=channeltextview.
-_11_Text=/NAMES%20$0
-_14_Type=0
-_0_Text=$tr("Dock","defscript")
-_3_Type=1
-_6_Expr=$channel
-_12_Text=/WHO%20$0
-_15_Type=4
-_PrologueCount=0
-_4_Type=0
-_7_Expr=!$channel
-_13_Text=$tr("Notify%20Avatar","defscript")
-_16_Type=1
-_2_Text=$tr("Channels","defscript")
-_5_Type=1
-_17_Type=1
-_3_Text=$tr("&Join%20Channels...","defscript")
-_6_Type=1
-_15_Text=$tr("&Highlight","defscript")
-_7_Type=1
-_9_ExtName=ctcp
-_16_Text=$tr("Copy%20Channel%20URL%20to%20Clipboard","defscript")
-_5_Text=$tr("&Hop","defscript")%20$0
-_8_Type=0
-_10_Id=dummySeparator
-_11_Icon=75
-_17_Text=$tr("Clear%20Buffer","defscript")
-[channels]
-_0_Icon=31
-_0_Id=channels.item0
-_1_Icon=31
-_Count=2
-_1_Id=channels.item1
-_0_Code=j%20#KVIrc;
-_1_Code=j%20#kde;
-_0_Type=1
-_1_Type=1
-_EpilogueCount=0
-_0_Text=#KVIrc
-_PrologueCount=0
-_1_Text=#kde
-[logging]
-_Prologue0=#%20If%20this%20window%20is%20being%20logged%20actually%20,%20$log.file%20will%20be%20non%20empty%0a#%20and%20pointing%20to%20the%20log%20file%20actually%20open.%0aif($isSet($log.file))%0a%09%25:logfile%20=%20$file.extractfilename($log.file)
-_6_Text=$tr("Log%20to%20Default%20File","defscript")%20"("$tr("Include%20Existing%20Buffer","defscript")")"
-_PrologueId0=prologue_0_for_logging
-_0_Id=logging.label0
-_1_Icon=120
-_7_Text=$tr("Log%20to...","defscript")
-_Count=9
-_1_Id=logging.item1
-_8_Text=$tr("Log%20to...","defscript")%20"("$tr("Include%20Existing%20Buffer","defscript")")"
-_2_Id=dummySeparator
-_3_Icon=44
-_1_Code=log.flush
-_3_Id=logging.item3
-_0_Expr="%25:logfile"%20!=%20""
-_4_Id=logging.label4
-_5_Icon=119
-_1_Expr=%25:logfile
-_3_Code=log.stop
-_5_Id=logging.item5
-_6_Icon=119
-_6_Id=logging.item6
-_7_Icon=119
-_0_Type=3
-_3_Expr=%25:logfile
-_5_Code=log.start
-_7_Id=logging.item7
-_8_Icon=119
-_1_Type=1
-_4_Expr=!%25:logfile
-_6_Code=log.start%20-p
-_8_Id=logging.item8
-_EpilogueCount=0
-_2_Type=0
-_5_Expr=!%25:logfile
-_7_Code=dialog.file(save,$tr("Choose%20Log%20Filename","defscript"))%0a{%0a%09if($0)log.start%20%20$0%0a}
-_0_Text=$tr("Logging%20to","defscript"):<br><b>%25:logfile</b>
-_3_Type=1
-_6_Expr=!%25:logfile
-_8_Code=dialog.file(save,$tr("Choose%20Log%20Filename","defscript"))%0a{%0a%09if($0)log.start%20-p%20$0%0a}
-_PrologueCount=1
-_1_Text=$tr("Flush%20Log%20File","defscript")
-_4_Type=3
-_7_Expr=!%25:logfile
-_5_Type=1
-_8_Expr=!%25:logfile
-_3_Text=$tr("Stop%20Logging","defscript")
-_6_Type=1
-_4_Text=$tr("Not%20Logging","defscript")
-_7_Type=1
-_5_Text=$tr("Log%20to%20Default%20File","defscript")
-_8_Type=1
-[channelhighlight]
-_Prologue0=if($window!=""%20&&%20!$chan.isDead())%0a{%0a%09%25:beingHlTmp%20=%20$tmphighlight.isChannelHighLighted($window)%0a}
-_PrologueId0=prologue_0_for_channelhighlight
-_0_Id=channelhighlight.item0
-_Count=2
-_1_Id=channelhighlight.item1
-_0_Code=tmphighlight.removeChannel%20$window
-_1_Code=tmphighlight.addChannel%20$window
-_0_Expr=%25:beingHlTmp
-_1_Expr=!%25:beingHlTmp
-_0_Type=1
-_1_Type=1
-_EpilogueCount=0
-_0_Text=$tr("Stop%20Highlighting%20(Local)","defscript")
-_PrologueCount=1
-_1_Text=$tr("Start%20Highlighting%20(Local)","defscript")
-[ignore]
-_Prologue0=%25:inIgnoreList%20=%200%0a%25:regName%20=%20$reguser.match($mask($0))%0a%25:ignLabelText%20=%20"<p><b>$0</b>%20"%0aif(%25:regName)%0a{%0a%09%25:inIgnoreList%20=%20$reguser.isIgnoreEnabled(%25:regName);%0a%09if(%25:inIgnoreList)%20%25:ignLabelText%20<<%20$tr("is%20being%20ignored","defscript")%0a%09else%20%25:ignLabelText%20<<%20$tr("is%20not%20being%20ignored","defscript")%0a%0a%09%25:ignLabelText%20<<%20"</p>"%0a}%20else%20{%0a%09%25:ignLabelText%20<<%20$tr("is%20not%20being%20ignored","defscript")"</p>"%0a}
-_2_0_Type=1
-_2_3_Expr="$reguser.exactMatch($mask($0,3))"%20==%20""
-_2_5_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,5);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_7_Id=ignore.subpopup2.item7
-_2_12_Type=1
-_2_15_Expr="$reguser.exactMatch($mask($0,15))"%20==%20""
-_2_17_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,17);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_19_Id=ignore.subpopup2.item19
-_2_21_Type=1
-_2_24_Expr="$reguser.exactMatch($mask($0,24))"%20==%20""
-_2_26_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,26);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_PrologueId0=prologue_0_for_ignore
-_0_Id=ignore.label0
-_1_Icon=203
-_2_1_Type=1
-_2_4_Expr="$reguser.exactMatch($mask($0,4))"%20==%20""
-_2_6_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,6);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_8_Id=ignore.subpopup2.item8
-_2_10_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,10)")"
-_2_13_Type=1
-_2_16_Expr="$reguser.exactMatch($mask($0,16))"%20==%20""
-_2_18_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,18);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_22_Type=1
-_2_25_Expr="$reguser.exactMatch($mask($0,25))"%20==%20""
-_Count=4
-_1_Id=ignore.item1
-_2_Icon=69
-_2_EpilogueCount=0
-_2_2_Type=1
-_2_5_Expr="$reguser.exactMatch($mask($0,5))"%20==%20""
-_2_7_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,7);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_9_Id=ignore.subpopup2.item9
-_2_11_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,11)")"
-_2_14_Type=1
-_2_17_Expr="$reguser.exactMatch($mask($0,17))"%20==%20""
-_2_19_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,19);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_20_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,20)")"
-_2_23_Type=1
-_2_26_Expr="$reguser.exactMatch($mask($0,26))"%20==%20""
-_2_Id=ignore.subpopup2
-_2_0_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,0)")"
-_2_3_Type=1
-_2_6_Expr="$reguser.exactMatch($mask($0,6))"%20==%20""
-_2_8_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,8);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_12_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,12)")"
-_2_15_Type=1
-_2_18_Expr="$reguser.exactMatch($mask($0,18))"%20==%20""
-_2_21_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,21)")"
-_2_24_Type=1
-_3_Icon=68
-_1_Code=reguser.setIgnoreEnabled%20%25:regName%201;
-_2_PrologueCount=0
-_2_1_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,1)")"
-_2_4_Type=1
-_2_7_Expr="$reguser.exactMatch($mask($0,7))"%20==%20""
-_2_9_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,9);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_13_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,13)")"
-_2_16_Type=1
-_2_19_Expr="$reguser.exactMatch($mask($0,19))"%20==%20""
-_2_22_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,22)")"
-_2_25_Type=1
-_3_Id=ignore.item3
-_2_2_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,2)")"
-_2_5_Type=1
-_2_8_Expr="$reguser.exactMatch($mask($0,8))"%20==%20""
-_2_14_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,14)")"
-_2_17_Type=1
-_2_23_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,23)")"
-_2_26_Type=1
-_1_Expr=!%25:inIgnoreList%20&&%20%25:regName
-_2_3_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,3)")"
-_2_6_Type=1
-_2_9_Expr="$reguser.exactMatch($mask($0,9))"%20==%20""
-_2_15_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,15)")"
-_2_18_Type=1
-_2_24_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,24)")"
-_3_Code=reguser.setIgnoreEnabled%20%25:regName%200;
-_2_Expr=!%25:inIgnoreList
-_2_4_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,4)")"
-_2_7_Type=1
-_2_16_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,16)")"
-_2_19_Type=1
-_2_25_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,25)")"
-_0_Type=3
-_2_5_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,5)")"
-_2_8_Type=1
-_2_10_Id=ignore.subpopup2.item10
-_2_17_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,17)")"
-_2_26_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,26)")"
-_3_Expr=%25:inIgnoreList
-_1_Type=1
-_2_6_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,6)")"
-_2_9_Type=1
-_2_11_Id=ignore.subpopup2.item11
-_2_18_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,18)")"
-_2_20_Id=ignore.subpopup2.item20
-_EpilogueCount=0
-_2_Type=2
-_2_0_Id=ignore.subpopup2.item0
-_2_7_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,7)")"
-_2_10_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,10);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_12_Id=ignore.subpopup2.item12
-_2_19_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,19)")"
-_2_21_Id=ignore.subpopup2.item21
-_0_Text=%25:ignLabelText
-_2_Count=27
-_2_1_Id=ignore.subpopup2.item1
-_2_8_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,8)")"
-_2_11_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,11);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_13_Id=ignore.subpopup2.item13
-_2_20_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,20);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_22_Id=ignore.subpopup2.item22
-_3_Type=1
-_PrologueCount=1
-_1_Text=$tr("Enable%20Ignore","defscript")
-_2_0_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,0);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_2_Id=ignore.subpopup2.item2
-_2_9_Text=$tr("Ignore%20As","defscript")%20$0%20"("$mask($0,9)")"
-_2_10_Expr="$reguser.exactMatch($mask($0,10))"%20==%20""
-_2_12_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,12);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_14_Id=ignore.subpopup2.item14
-_2_21_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,21);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_23_Id=ignore.subpopup2.item23
-_2_Text=$tr("Ignore%20As...","defscript")
-_2_1_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,1);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_3_Id=ignore.subpopup2.item3
-_2_11_Expr="$reguser.exactMatch($mask($0,11))"%20==%20""
-_2_13_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,13);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_15_Id=ignore.subpopup2.item15
-_2_20_Expr="$reguser.exactMatch($mask($0,20))"%20==%20""
-_2_22_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,22);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_24_Id=ignore.subpopup2.item24
-_2_0_Expr="$reguser.exactMatch($mask($0,0))"%20==%20""
-_2_2_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,2);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_4_Id=ignore.subpopup2.item4
-_2_12_Expr="$reguser.exactMatch($mask($0,12))"%20==%20""
-_2_14_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,14);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_16_Id=ignore.subpopup2.item16
-_2_21_Expr="$reguser.exactMatch($mask($0,21))"%20==%20""
-_2_23_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,23);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_25_Id=ignore.subpopup2.item25
-_3_Text=$tr("Unignore","defscript")
-_2_1_Expr="$reguser.exactMatch($mask($0,1))"%20==%20""
-_2_3_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,3);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_5_Id=ignore.subpopup2.item5
-_2_10_Type=1
-_2_13_Expr="$reguser.exactMatch($mask($0,13))"%20==%20""
-_2_15_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,15);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_17_Id=ignore.subpopup2.item17
-_2_22_Expr="$reguser.exactMatch($mask($0,22))"%20==%20""
-_2_24_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,24);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_26_Id=ignore.subpopup2.item26
-_2_2_Expr="$reguser.exactMatch($mask($0,2))"%20==%20""
-_2_4_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,4);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_6_Id=ignore.subpopup2.item6
-_2_11_Type=1
-_2_14_Expr="$reguser.exactMatch($mask($0,14))"%20==%20""
-_2_16_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,16);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-_2_18_Id=ignore.subpopup2.item18
-_2_20_Type=1
-_2_23_Expr="$reguser.exactMatch($mask($0,23))"%20==%20""
-_2_25_Code=if(!%25:regName)%20reguser.add%20-f%20-q%20$0%20$mask($0,25);%0areguser.setIgnoreEnabled%20$0%201;%0areguser.setIgnoreFlags%20-p%20-c%20-n%20-t%20-i%20-d%20-h%20$0;
-[registration]
-_Prologue0=#%20This%20is%20really%20smart...we%20are%20loading%0a#%20the%20reguser%20module%20only%20if%20this%20popup%20is%20being%20requested%20(the%20user%20effectively%0a#%20puts%20the%20mouse%20on%20the%20"Registration"%20item%20and%20the%20sub-popup%20is%20being%20shown)%0a%25:regName%20=%20$reguser.match($mask($0))%0a%25:labelText%20=%20"<p><b>$0</b>";%0aif(%25:regName)%0a{%0a%09%25:labelText%20<<%20$tr("is%20registered%20as","defscript")%20":%20<b>"%25:regName"</b>"%0a%09#%20We%20want%20to%20display%20masks%20here!!!%0a%09%25:inNotifyList%20=%20$reguser.property(%25:regName,notify);%0a%09if(%25:inNotifyList)%25:labelText%20<<%20"<br><b>$0</b>"%20$tr("is%20in%20the%20notify%20list","defscript")%0a%09%25:curAvatar%20=%20$avatar.name($0);%0a%09%25:defAvatar%20=%20$reguser.property(%25:regName,avatar);%0a%09if(%25:defAvatar)%25:labelText%20<<%20"<br><b>$0</b>"%20$tr("has%20a%20default%20avatar","defscript")%0a%09%25:labelText%20<<%20"</p>"%0a}%20else%20{%0a%09%25:labelText%20<<%20$tr("is%20not%20registered","defscript")"</p>"%0a}
-_2_0_Type=1
-_2_3_Expr="$reguser.exactMatch($mask($0,3))"%20==%20""
-_2_5_Code=reguser.add%20-f%20-q%20$0%20$mask($0,5)
-_6_Text=$tr("Add%20to%20Notify","defscript")
-_8_Count=3
-_8_1_Id=registration.subpopup8.item1
-_PrologueId0=prologue_0_for_registration
-_0_Id=registration.label0
-_1_Icon=113
-_2_1_Type=1
-_2_4_Expr="$reguser.exactMatch($mask($0,4))"%20==%20""
-_7_Text=$tr("Remove%20from%20Notify","defscript")
-_8_0_Code=dialog.image(f,$tr("Choose%20Avatar%20Image%20File","defscript"),"","",$0,"%25:regName")%0a{%0a%09if($0)%0a%09{%0a%09%09reguser.setproperty%20-a%20$2%20avatar%20$0;%0a%09}%0a}
-_8_2_Id=registration.subpopup8.item2
-_Count=9
-_1_Id=registration.item1
-_2_Icon=254
-_2_EpilogueCount=0
-_2_2_Type=1
-_2_5_Expr="$reguser.exactMatch($mask($0,5))"%20==%20""
-_8_Text=$tr("Avatar","defscript")
-_8_1_Code=reguser.setproperty%20"%25:regName"%20avatar%20%25:curAvatar
-_2_Id=registration.subpopup2
-_2_0_Text=$tr("Register%20As","defscript")%20$0%20"("$mask($0,11)")"
-_2_3_Type=1
-_8_0_Expr=%25:regName
-_8_2_Code=reguser.setproperty%20%25:regName%20avatar%0a#%20Force%20the%20avatar%20to%20update%0a#%20if("%25:curAvatar"%20==%20"")who%20$0
-_1_Code=reguser.wizard%20$mask($0)
-_2_PrologueCount=0
-_2_1_Text=$tr("Register%20As","defscript")%20$0%20"("$mask($0,12)")"
-_2_4_Type=1
-_3_Id=registration.item3
-_8_1_Expr=%25:curAvatar%20&&%20("%25:curAvatar"%20!=%20"%25:defAvatar")
-_2_2_Text=$tr("Register%20As","defscript")%20$0%20"("$mask($0,13)")"
-_2_5_Type=1
-_4_Id=registration.item4
-_8_2_Expr=%25:defAvatar
-_1_Expr=!%25:regName
-_2_3_Text=$tr("Register%20As","defscript")%20$0%20"("$mask($0,3)")"
-_3_Code=reguser.edit%20"%25:regName"
-_5_Id=dummySeparator
-_6_Icon=94
-_8_0_Type=1
-_2_Expr=!%25:regName
-_2_4_Text=$tr("Register%20As","defscript")%20$0%20"("$mask($0,4)")"
-_4_Code=reguser.remove%20"%25:regName"
-_6_Id=registration.item6
-_7_Icon=95
-_8_1_Type=1
-_0_Type=3
-_2_5_Text=$tr("Register%20As","defscript")%20$0%20"("$mask($0,5)")"
-_3_Expr=%25:regName
-_7_Id=registration.item7
-_8_Icon=57
-_8_EpilogueCount=0
-_8_2_Type=1
-_1_Type=1
-_4_Expr=%25:regName
-_6_Code=reguser.setproperty%20-n%20"%25:regName"%20notify%20$0
-_8_Id=registration.subpopup8
-_8_0_Text=$tr("Choose...","defscript")
-_EpilogueCount=0
-_2_Type=2
-_2_0_Id=registration.subpopup2.item0
-_7_Code=reguser.setproperty%20-n%20"%25:regName"%20notify
-_8_PrologueCount=0
-_8_1_Text=$tr("Set%20As%20Default","defscript")
-_0_Text=%25:labelText
-_2_Count=6
-_2_1_Id=registration.subpopup2.item1
-_3_Type=1
-_6_Expr=%25:regName%20&&%20!%25:inNotifyList
-_8_2_Text=$tr("Clear%20Default","defscript")
-_PrologueCount=1
-_1_Text=$tr("Register...","defscript")
-_2_0_Code=reguser.add%20-f%20-q%20$0%20$mask($0,11)
-_2_2_Id=registration.subpopup2.item2
-_4_Type=1
-_7_Expr=%25:regName%20&&%20%25:inNotifyList
-_2_Text=$tr("Quick%20Registration","defscript")
-_2_1_Code=reguser.add%20-f%20-q%20$0%20$mask($0,12)
-_2_3_Id=registration.subpopup2.item3
-_5_Type=0
-_8_Expr=%25:regName
-_2_0_Expr="$reguser.exactMatch($mask($0,11))"%20==%20""
-_2_2_Code=reguser.add%20-f%20-q%20$0%20$mask($0,13)
-_2_4_Id=registration.subpopup2.item4
-_3_Text=$tr("Edit%20Registration...","defscript")
-_6_Type=1
-_2_1_Expr="$reguser.exactMatch($mask($0,12))"%20==%20""
-_2_3_Code=reguser.add%20-f%20-q%20$0%20$mask($0,3)
-_2_5_Id=registration.subpopup2.item5
-_4_Text=$tr("Unregister","defscript")%20%25:regName
-_7_Type=1
-_2_2_Expr="$reguser.exactMatch($mask($0,13))"%20==%20""
-_2_4_Code=reguser.add%20-f%20-q%20$0%20$mask($0,4)
-_8_Type=2
-_8_0_Id=registration.subpopup8.item0
-[channel]
-_Prologue0=#%20we%20use%20the%20extended%20scope%20variables:%20they%20are%20visible%20in%20the%20entire%20defpopup%20scope%0a#%20%25:visible%20is%20the%20string%20that%20we%20will%20"show%20to%20the%20user"%20in%20the%20popup%20widget%0a#%20for%20multiple%20users%20the%20string%20might%20become%20long%20so%20we%20are%20going%20to%20change%20it%20in%20"multiple%20users"%0a%25:visible%20=%20$0%0a#%20%25:multiple%20is%20an%20internal%20flag:%20set%20to%201%20if%20the%20parameter%20passed%20to%20the%20popup%20contains%20a%20list%0a#%20of%20multiple%20nicknames%20rather%20than%20a%20single%20nick%0a%25:multiple%20=%200%0a#%20finally%20,%20set%20these%20variables%0a%25:itemBanName%20=%20$tr("Ban")%0aif($str.findfirst(%25:visible,",")%20!=%20-1)%0a{%0a%09#%20found%20a%20comma%20in%20the%20$0%20parameter...we%20have%20multiple%20nicknames%0a%09%25:visible%20=%20"("$tr("Multiple%20Users","defscript")")"%0a%09%25:multiple%20=%201%0a%09%25:itemBanMask%20=%20"*!user@*.host.tld"%0a%09%25:itemBanNick%20=%20"nick"%0a}%20else%20{%0a%09%25:itemBanMask%20=%20$mask(%25:visible,$option(uintDefaultBanType))%0a%09if("%25:itemBanMask"%20==%20"*!*@*")%25:itemBanName%20=%20$tr("&Ban")%0a%09%25:itemBanNick%20=%20%25:visible%0a}%0a#%20speed%20it%20up%0a%0a%25:isMeHalfOp%20=%20$chan.isMeHalfOp()%0a%25:isMeOp%20=%20$chan.isMeOp()%0a%25:isMeOwner%20=%20$chan.isMeOwner()%0a%25:isMeAdmin%20=%20$chan.isMeAdmin()%0a%25:bCanKB%20=%200;%0a%0aif(%25:isMeHalfOp)%0a{%0a%09foreach(%25nick,$str.split(",",$0))%0a%09{%0a%09%09if($chan.usermodelevel(%25nick)%20<=%20$chan.usermodelevel($me))%0a%09%09{%0a%09%09%09%25:bCanKB%20=%201;%0a%09%09%09break;%0a%09%09}%0a%09}%0a}
-_0_Icon=88
-_2_0_Type=1
-_2_5_Code=echo%20$mask($0,11)
-_3_2_Expr=%25:isMeOwner
-_3_4_Code=dechanadmin%20$0
-_3_6_Id=channel.subpopup3.item6
-_3_7_Icon=174
-_3_11_Type=0
-_3_14_Expr=("%25:itemBanMask"%20!=%20"*!*@*")%20&&%20%25:bCanKB
-_3_16_Code=kb%20$0
-_3_18_Id=dummySeparator
-_3_19_Icon=20
-_9_Type=0
-_11_Id=channel.
-_12_Icon=203
-_PrologueId0=prologue_0_for_channel
-_0_Id=channel.item0
-_2_1_Type=1
-_3_0_Type=3
-_3_3_Expr=%25:isMeAdmin
-_3_5_Code=op%20$0
-_3_7_Id=channel.subpopup3.item7
-_3_8_Icon=175
-_3_12_Type=1
-_3_15_Expr=%25:bCanKB
-_3_17_Code=dialog.textinput%20-d="$me"%20-i=110%20($tr("Kick/Ban%20Reason","defscript"),$tr("Enter%20a%20kick/ban%20reason","defscript"),$tr("&Kick/Ban","defscript"),$tr("Cancel","defscript"),,$0)%0a{%0a%09if($0%20==%200)%0a%09{%0a%09%09kb%20$2%20$1%0a%09}%0a}
-_3_19_Id=channel.subpopup3.item19
-_7_Text=C&TCP
-_12_Id=channel.
-_13_Icon=57
-_Count=14
-_1_Id=dummySeparator
-_2_Icon=317
-_2_EpilogueCount=0
-_2_2_Type=1
-_2_5_Expr=!%25:multiple
-_3_1_Type=1
-_3_4_Expr=%25:isMeAdmin
-_3_6_Code=deop%20$0
-_3_8_Id=channel.subpopup3.item8
-_3_9_Icon=35
-_3_10_Text=$tr("D&evoice","defscript")%20%25:visible
-_3_13_Type=1
-_3_16_Expr=%25:bCanKB
-_8_Text=&DCC
-_13_Id=channel.item13
-_0_Code=foreach(%25i,$str.split(",",$0))%0a%09whois%20%25i%20%25i
-_2_Id=channel.subpopup2
-_2_0_Text=$str.printf($tr("/WHOIS%20?s","defscript"),%25:visible)
-_2_3_Type=0
-_3_Icon=20
-_3_EpilogueCount=0
-_3_2_Type=1
-_3_5_Expr=%25:isMeOp
-_3_7_Code=halfop%20$0
-_3_9_Id=channel.subpopup3.item9
-_3_14_Type=1
-_3_17_Expr=%25:bCanKB
-_3_19_Code=options.edit%20OptionsWidget_channelAdvanced
-_10_Expr=!%25:multiple
-_2_PrologueCount=0
-_2_1_Text=$str.printf($tr("/WHOWAS%20?s","defscript"),%25:visible)
-_2_4_Type=1
-_3_Id=channel.subpopup3
-_3_0_Text=$usermodename($me())
-_3_3_Type=1
-_3_6_Expr=%25:isMeOp
-_3_8_Code=dehalfop%20$0
-_3_12_Text=$tr("&Kick","defscript")%20%25:visible
-_3_15_Type=1
-_10_ExtName=registration
-_11_Expr=!%25:multiple
-_13_Code=avatar.notify%20$0
-_2_2_Text=$str.printf($tr("/WHO%20?s","defscript"),%25:visible)
-_2_5_Type=1
-_3_PrologueCount=0
-_3_1_Text=$tr("O&wner","defscript")%20%25:visible
-_3_4_Type=1
-_3_7_Expr=%25:isMeOp
-_3_9_Code=voice%20$0
-_3_13_Text=$tr("K&ick","defscript")%20%25:visible%20$tr("With...","defscript")
-_3_16_Type=1
-_4_Id=dummySeparator
-_5_Icon=47
-_11_ExtName=highlight
-_12_Expr=!%25:multiple
-_3_2_Text=$tr("&Deowner","defscript")%20%25:visible
-_3_5_Type=1
-_3_8_Expr=%25:isMeOp
-_3_14_Text=$tr("&Ban","defscript")%20%25:visible%20"("%25:itemBanMask")"
-_3_17_Type=1
-_5_Id=channel.item5
-_10_Type=4
-_12_ExtName=ignore
-_2_4_Text=$tr("DNS%20for","defscript")%20%25:visible
-_3_3_Text=$tr("&Administrator","defscript")%20%25:visible
-_3_6_Type=1
-_3_9_Expr=%25:isMeHalfOp
-_3_15_Text=%25:itemBanName%20%25:visible%20"("%25:itemBanNick!*@*")"
-_3_18_Type=0
-_6_Id=dummySeparator
-_7_Icon=162
-_11_Type=4
-_0_Type=1
-_2_5_Text=$tr("Mask%20for","defscript")%20%25:visible
-_3_Expr=%25:isMeHalfOp
-_3_4_Text=$tr("&Deadministrator","defscript")%20%25:visible
-_3_7_Type=1
-_3_10_Icon=63
-_3_16_Text=$tr("Kick/Ban","defscript")%20%25:visible
-_3_19_Type=1
-_5_Code=query%20$0
-_7_Id=channel.
-_8_Icon=325
-_12_Type=4
-_1_Type=0
-_2_0_Icon=88
-_3_5_Text=$tr("&Op","defscript")%20%25:visible
-_3_8_Type=1
-_3_10_Id=channel.subpopup3.item10
-_3_17_Text=$tr("Kick/Ban","defscript")%20%25:visible%20$tr("with...","defscript")
-_8_Id=channel.
-_10_Text=$tr("&Registration","defscript")
-_13_Type=1
-_EpilogueCount=0
-_2_Type=2
-_2_0_Id=channel.subpopup2.item0
-_2_1_Icon=92
-_3_6_Text=$tr("&Deop","defscript")%20%25:visible
-_3_9_Type=1
-_3_11_Id=dummySeparator
-_3_12_Icon=110
-_9_Id=dummySeparator
-_11_Text=$tr("&Highlight","defscript")
-_0_Text=$str.printf($tr("/WHOIS%20?s%20(idle%20time)","defscript"),%25:visible)
-_2_Count=6
-_2_1_Id=channel.subpopup2.item1
-_2_2_Icon=75
-_3_Type=2
-_3_0_Id=channel.subpopup3.label0
-_3_1_Icon=260
-_3_7_Text=$tr("&Halfop","defscript")%20%25:visible
-_3_10_Code=devoice%20$0
-_3_12_Id=channel.subpopup3.item12
-_3_13_Icon=110
-_3_19_Text=$tr("Configure%20Ban%20Mask...","defscript")
-_12_Text=$tr("Ig&nore","defscript")
-_PrologueCount=1
-_2_0_Code=whois%20$0
-_2_2_Id=channel.subpopup2.item2
-_3_Count=20
-_3_1_Id=channel.subpopup3.item1
-_3_2_Icon=261
-_3_8_Text=$tr("&Dehalfop","defscript")%20%25:visible
-_3_13_Id=channel.subpopup3.item13
-_3_14_Icon=110
-_4_Type=0
-_13_Text=$tr("Notify%20Avatar","defscript")
-_2_Text=$tr("&Information","defscript")
-_2_1_Code=whowas%20$0
-_2_3_Id=dummySeparator
-_2_4_Icon=91
-_3_2_Id=channel.subpopup3.item2
-_3_3_Icon=242
-_3_9_Text=$tr("&Voice","defscript")%20%25:visible
-_3_10_Expr=%25:isMeHalfOp
-_3_12_Code=foreach(%25i,$str.split(",",$0))kick%20%25i
-_3_14_Id=channel.subpopup3.item14
-_3_15_Icon=110
-_5_Type=1
-_7_ExtName=ctcp
-_8_Expr=!%25:multiple
-_2_2_Code=who%20$0
-_2_4_Id=channel.subpopup2.item4
-_2_5_Icon=15
-_3_Text=$tr("&Control","defscript")
-_3_1_Code=chanowner%20$0
-_3_3_Id=channel.subpopup3.item3
-_3_4_Icon=243
-_3_13_Code=dialog.textinput%20-d="$me"%20-i=110%20($tr("Kick%20Reason","defscript"),$tr("Enter%20a%20kick%20reason","defscript"),$tr("&Kick","defscript"),$tr("Cancel","defscript"),,$0)%0a{%0a%09if($0%20==%200)%0a%09{%0a%09%09foreach(%25i,$str.split(",",$2))kick%20%25i%20$1%0a%09}%0a}
-_3_15_Id=channel.subpopup3.item15
-_3_16_Icon=110
-_6_Type=0
-_8_ExtName=dcc
-_2_5_Id=channel.subpopup2.item5
-_3_2_Code=dechanowner%20$0
-_3_4_Id=channel.subpopup3.item4
-_3_5_Icon=34
-_3_12_Expr=%25:bCanKB
-_3_14_Code=ban%20$mask($0,$option(uintDefaultBanType))
-_3_16_Id=channel.subpopup3.item16
-_3_17_Icon=110
-_7_Type=4
-_10_Icon=113
-_2_4_Code=foreach(%25i,$str.split(",",$0))dns%20%25i
-_3_1_Expr=%25:isMeOwner
-_3_3_Code=chanadmin%20$0
-_3_5_Id=channel.subpopup3.item5
-_3_6_Icon=62
-_3_10_Type=1
-_3_13_Expr=%25:bCanKB
-_3_15_Code=ban%20$0
-_3_17_Id=channel.subpopup3.item17
-_5_Text=$tr("&Query","defscript")%20%25:visible
-_8_Type=4
-_10_Id=channel.
-_11_Icon=269
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
deleted file mode 100644
index ff178b939..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
+++ /dev/null
@@ -1,1474 +0,0 @@
-# Calculate format=kde
-
-#?os_locale_language==fr#
-#-ini(tmp.channel,calculate-fr)-#
-#os_locale_language#
-#?os_locale_language==ru#
-#-ini(tmp.channel,calculate-ru)-#
-#os_locale_language#
-#?in(os_locale_language,fr,ru)==#
-#-ini(tmp.channel,calculate)-#
-#in#
-[Forestnet]
-0_Hostname=irc.forestnet.org
-NServers=1
-0_Description=Forestnet:%20Random%20server
-0_Id=myserver39390472814
-[GRnet]
-0_Hostname=gr.irc.gr
-NServers=3
-1_Hostname=srv.irc.gr
-0_Description=Grnet:%20Random%20EU%20server
-2_Hostname=us.irc.gr
-1_Description=Grnet:%20Random%20server
-2_Description=Grnet:%20Random%20US%20server
-0_Id=myserver393937181603
-1_Id=myserver393925197606
-2_Id=myserver393948793288
-[IRCHighWay]
-0_Port=6660
-1_Port=9999
-0_Hostname=irc.irchighway.net
-NServers=2
-1_Hostname=irc.irchighway.net
-0_Description=Random%20Server%20-%20Port%206660
-1_Description=Random%20Server%20-%20SSL%20Port%209999
-1_SSL=true
-0_Id=myserver393967201148
-1_Id=myserver3939807850
-Description=Your%20IRC%20Superhighway
-[IRCLink]
-0_Hostname=alesund.no.eu.irclink.net
-NServers=3
-1_Hostname=frogn.no.eu.irclink.net
-0_Description=IRCLink:%20EU,%20NO,%20Alesund
-2_Hostname=rockhill.sc.us.irclink.net
-1_Description=IRCLink:%20EU,%20NO,%20Oslo
-2_Description=IRCLink:%20US,%20SC,%20Rock%20Hill
-0_Id=myserver393998473362
-1_Id=myserver394010874529
-2_Id=myserver394021853418
-[SexNet]
-0_Hostname=irc.sexnet.org
-NServers=1
-0_Description=SexNet:%20Random%20server
-0_Id=myserver394038154231
-[Abjects]
-1_Port=9999
-0_Hostname=irc.abjects.net
-NServers=6
-1_Hostname=irc.abjects.net
-3_Port=9999
-0_Description=Abjects:%20Random%20server
-2_Hostname=irc.eu.abjects.net
-1_Description=Abjects:%20Random%20server%20SSL
-1_SSL=true
-3_Hostname=irc.eu.abjects.net
-5_Port=9999
-2_Description=Abjects:%20Random%20EU%20server
-4_Hostname=irc.us.abjects.net
-0_Id=myserver394055872756
-3_Description=Abjects:%20Random%20EU%20server%20SSL
-3_SSL=true
-5_Hostname=irc.us.abjects.net
-1_Id=myserver394090376536
-4_Description=Abjects:%20Random%20US%20server
-2_Id=myserver394067834622
-5_Description=Abjects:%20Random%20US%20server%20SSL
-5_SSL=true
-3_Id=myserver394102703208
-4_Id=myserver394079494752
-5_Id=myserver394114574958
-[Azzurra]
-9_Id=myserver394280300397
-10_Hostname=tin.azzurra.org
-11_Hostname=unina.azzurra.org
-0_Hostname=caltanet.azzurra.org
-10_Description=Tin%20Leaf%20Server
-12_Hostname=vogon.azzurra.org
-NServers=13
-1_Hostname=gamma.azzurra.org
-11_Description=Unina%20Leaf%20Server
-0_Description=Caltanet%20Leaf%20Server
-2_Hostname=irc.azzurra.org
-12_Description=HUB%20Routing%20Server
-1_Description=Gamma%20Fastweb%20Server
-3_Hostname=libero.azzurra.org
-10_Id=myserver394230432469
-2_Description=Main%20Random%20Server
-4_Hostname=nexlab.azzurra.org
-11_Id=myserver394242225928
-0_Id=myserver394157411450
-3_Description=Libero%20Leaf%20Server
-5_Hostname=oltrelinux.azzurra.org
-12_Id=myserver394145386771
-1_Id=myserver394255902656
-4_Description=Nexlab%20Leaf%20Server
-6_Hostname=orion.azzurra.org
-2_Id=myserver394132917431
-5_Description=Oltrelinux%20Leaf%20Server
-7_Hostname=penguin.azzurra.org
-3_Id=myserver394169598179
-6_Description=Orion%20Fastweb%20Server
-8_Hostname=radiomarte.azzurra.org
-4_Id=myserver394193975383
-7_Description=Penguin%20Leaf%20Server
-9_Hostname=stealth.azzurra.org
-5_Id=myserver394181531613
-8_Description=RadioMarte%20Leaf%20Server
-6_Id=myserver394268408412
-9_Description=Stealth%20Fastweb%20Server
-Description=Italian%20Main%20Network
-7_Id=myserver3942062644
-8_Id=myserver394218774201
-[Infatech]
-0_Hostname=irc.infatech.net
-NServers=1
-0_Description=Infatech:%20Random%20server
-0_Id=myserver394298957784
-[Infomatrix]
-0_Hostname=irc.infomatrix.net
-NServers=1
-0_Description=Infomatrix:%20Random%20server
-0_Id=myserver394317953
-[Rizon]
-1_Port=9999
-0_Hostname=irc.rizon.net
-NServers=2
-1_Hostname=irc.rizon.net
-0_Description=Rizon:%20Random%20server
-1_Description=Rizon:%20Random%20server%20SSL
-1_SSL=true
-0_Id=myserver394368814172
-1_Id=myserver39437970366
-[UnderZ]
-0_Hostname=irc.underz.org
-NServers=1
-0_Description=UnderZ:%20Random%20server
-0_Id=myserver394334786531
-[Warpednet]
-0_Hostname=irc.warped.net
-NServers=1
-0_Description=Warpednet:%20Random%20server
-0_Id=myserver39435165412
-[Blitzed]
-0_Hostname=irc.blitzed.org
-NServers=1
-0_Description=Blitzed:%20Random%20server
-0_Id=myserver394396679412
-[DogmNet]
-0_Hostname=irc.chat.uz
-NServers=2
-1_Hostname=irc.dogm.net
-0_Description=Main%20UZ%20server
-Encoding=CP-1251
-1_Description=Main%20network%20server
-0_Id=myserver3944245906
-1_Id=myserver394412147586
-Description=Russian%20Network
-[Telstra]
-0_Hostname=irc.telstra.com
-NServers=1
-0_Description=Telstra:%20Random%20server
-0_Id=myserver394441207411
-[UnderNet]
-9_Id=myserver394577538143
-10_Hostname=london.uk.eu.undernet.org
-11_Hostname=london2.uk.eu.undernet.org
-0_Hostname=bucharest.ro.eu.undernet.org
-10_Description=UK%20Server
-12_Hostname=losangeles.ca.us.undernet.org
-NServers=18
-1_Hostname=Carouge.ch.eu.undernet.org
-11_Description=UK%20Server
-13_Hostname=mesa.az.us.undernet.org
-0_Description=Romania%20Server
-2_Hostname=diemen.nl.eu.undernet.org
-12_Description=USA%20Server
-14_Hostname=newyork.ny.us.undernet.org
-1_Description=Switzerland%20Server
-3_Hostname=ede.nl.eu.undernet.org
-10_Id=myserver394590561818
-13_Description=USA%20Server
-15_Hostname=oslo2.no.eu.undernet.org
-2_Description=Netherlands%20Server
-4_Hostname=elsene.be.eu.undernet.org
-11_Id=myserver394603582241
-14_Description=USA%20Server
-16_Hostname=us.undernet.org
-0_Id=myserver394489648457
-3_Description=Netherlands%20Server
-5_Hostname=eu.undernet.org
-12_Id=myserver394654838157
-15_Description=Norway%20Server
-17_Hostname=zagreb.hr.eu.undernet.org
-1_Id=myserver394502221899
-4_Description=Belgium%20Server
-6_Hostname=graz.at.eu.undernet.org
-13_Id=myserver394667149724
-16_Description=USA%20Random%20Server
-2_Id=myserver394514648409
-5_Description=Europe%20Random%20Server
-7_Hostname=helsinki.fi.eu.undernet.org
-14_Id=myserver394679534835
-17_Description=Croatia%20Server
-3_Id=myserver394527545521
-6_Description=Austria%20Server
-8_Hostname=irc.undernet.org
-15_Id=myserver394616827240
-4_Id=myserver394539876605
-7_Description=Finland%20Server
-9_Hostname=lelystad.nl.eu.undernet.org
-16_Id=myserver394641492769
-5_Id=myserver394476645992
-8_Description=Main%20Random%20Server
-17_Id=myserver394629598729
-6_Id=myserver394552488640
-9_Description=Netherlands%20Server
-7_Id=myserver394565414
-8_Id=myserver394460232716
-[Xevion]
-0_Hostname=irc.xevion.net
-NServers=1
-0_Description=Xevion:%20Random%20server
-0_Id=myserver394696734150
-[DALnet]
-9_Id=myserver394942673404
-10_Hostname=hotspeed.sg.as.dal.net
-11_Hostname=irc.dal.net
-20_Hostname=punch.va.us.dal.net
-0_Hostname=aeon.nj.us.dal.net
-10_Description=Singapore%20Server
-12_Hostname=jingo.ix.us.dal.net
-21_Hostname=rangers.ix.us.dal.net
-30_Hostname=waffle.ix.eu.dal.net
-NServers=31
-1_Hostname=arcor.de.eu.dal.net
-11_Description=Main%20Random%20Server
-13_Hostname=loyalty.ix.us.dal.net
-20_Description=USA%20Server
-22_Hostname=redemption.ix.us.dal.net
-0_Description=USA%20Server
-2_Hostname=as.dal.net
-12_Description=USA%20Server
-14_Hostname=maple.ix.ca.dal.net
-21_Description=USA%20Server
-23_Hostname=riga-r.ca.us.dal.net
-30_Description=Waffle%20Server
-1_Description=Germany%20Server
-3_Hostname=brain.hub.eu.dal.net
-10_Id=myserver394739692104
-13_Description=USA%20Server
-15_Hostname=masters.ix.us.dal.net
-22_Description=USA%20Server
-24_Hostname=rumble.fl.us.dal.net
-2_Description=Asia%20Random%20Server
-4_Hostname=broadway.ny.us.dal.net
-11_Id=myserver394714559755
-14_Description=Maple%20Server
-16_Hostname=matrix.de.eu.dal.net
-20_Id=myserver394991336159
-23_Description=USA%20Server
-25_Hostname=serenity.ix.us.dal.net
-0_Id=myserver39491895571
-3_Description=HUB%20Server
-5_Hostname=ca.dal.net
-12_Id=myserver39495485897
-15_Description=USA%20Server
-17_Hostname=mesra.kl.my.dal.net
-21_Id=myserver395003991119
-24_Description=USA%20Server
-26_Hostname=soho.ix.us.dal.net
-30_Id=myserver394894794360
-1_Id=myserver394810829854
-4_Description=USA%20Server
-6_Hostname=eu.dal.net
-13_Id=myserver394967507349
-16_Description=Germany%20Server
-18_Hostname=mozilla.se.eu.dal.net
-22_Id=myserver395015898272
-25_Description=USA%20Server
-27_Hostname=swiftco.wa.us.dal.net
-2_Id=myserver394727277735
-5_Description=Canada%20Random%20Server
-7_Hostname=gaston.se.eu.dal.net
-14_Id=myserver394774676101
-17_Description=Malaysia%20Server
-19_Hostname=powertech.no.eu.dal.net
-23_Id=myserver395027701944
-26_Description=USA%20Server
-28_Hostname=toronto.on.ca.dal.net
-3_Id=myserver394821584831
-6_Description=Europe%20Random%20Server
-8_Hostname=genesis-r.uk.eu.dal.net
-15_Id=myserver394979938130
-18_Description=Sweden%20Server
-24_Id=myserver395039735186
-27_Description=USA%20Server
-29_Hostname=us.dal.net
-4_Id=myserver394930577140
-7_Description=Sweden%20Server
-9_Hostname=hollywood.ix.us.dal.net
-16_Id=myserver394858153791
-19_Description=Norway%20Server
-25_Id=myserver395051624206
-28_Description=Toronto%20Server
-5_Id=myserver394762520181
-8_Description=UK%20Server
-17_Id=myserver39475197153
-26_Id=myserver395063245361
-29_Description=USA%20Random%20Server
-6_Id=myserver394797652237
-9_Description=USA%20Server
-18_Id=myserver394870626438
-27_Id=myserver39507573564
-7_Id=myserver394833601779
-19_Id=myserver394882588687
-28_Id=myserver39478627258
-8_Id=myserver394846936428
-29_Id=myserver394906447499
-[Deepspace]
-0_Hostname=irc.deepspace.org
-NServers=1
-0_Description=Deepspace:%20Disability%20network
-0_Id=myserver39509341539
-[EFnet]
-9_Id=myserver395362368219
-39_Id=myserver395498382502
-10_Hostname=irc.arcti.ca
-11_Hostname=irc.blackened.com
-20_Hostname=irc.efnet.fr
-0_Hostname=chat.efnet.org
-10_Description=Calgary%20Server
-12_Hostname=irc.blessed.net
-21_Hostname=irc.efnet.nl
-30_Hostname=irc.igs.ca
-NServers=46
-1_Hostname=efnet.cs.hut.fi
-11_Description=Phoenix%20Server
-13_Hostname=irc.choopa.net
-20_Description=Paris%20Server
-22_Hostname=irc.efnet.no
-31_Hostname=irc.inet.tele.dk
-40_Hostname=irc.SHOUTcast.com
-0_Description=Chicago%20Server
-2_Hostname=efnet.ipv6.xs4all.nl
-12_Description=Maitland%20Server
-14_Hostname=irc.colosolutions.net
-21_Description=Ede%20Server
-23_Hostname=irc.efnet.org
-30_Description=Toronto%20Server
-32_Hostname=irc.inter.net.il
-41_Hostname=irc.umich.edu
-1_Description=Helsinki%20Server
-3_Hostname=efnet.port80.se
-10_Id=myserver395137127392
-13_Description=New%20York%20IPv6%20Server
-15_Hostname=irc.dataphone.se
-22_Description=Oslo%20Server
-24_Hostname=irc.efnet.pl
-31_Description=Aarhus%20Server
-33_Hostname=irc.ipv6.inter.net.il
-40_Description=Dulles%20Server
-42_Hostname=irc.umn.edu
-2_Description=Amsterdam%20IPv6%20Server
-4_Hostname=efnet.xs4all.nl
-11_Id=myserver395596181556
-14_Description=Orlando%20Server
-16_Hostname=irc.dks.ca
-20_Id=myserver395324179498
-23_Description=Main%20Random%20Server
-25_Hostname=irc.efnet.ru
-32_Description=Tel%20Aviv%20Server
-34_Hostname=irc.mindspring.com
-41_Description=Ann%20Arbor%20Server
-43_Hostname=irc.vel.net
-0_Id=myserver395477556545
-3_Description=Stockholm%20IPv6%20Server
-5_Hostname=hub.dk
-12_Id=myserver395645789740
-15_Description=Stockholm%20Server
-17_Hostname=irc.du.se
-21_Id=myserver395400727988
-24_Description=Warsaw%20Server
-26_Hostname=irc.efnet.us
-30_Id=myserver39516235985
-33_Description=Tel%20Aviv%20IPv6%20Server
-35_Hostname=irc.mzima.net
-42_Description=Minneapolis%20Server
-44_Hostname=irc2.choopa.net
-1_Id=myserver395224443694
-4_Description=Amsterdam%20Server
-6_Hostname=hub.efnet.nl
-13_Id=myserver395609985165
-16_Description=Toronto%20Server
-18_Hostname=irc.efnet.ca
-22_Id=myserver395312560787
-25_Description=Moscow%20Server
-27_Hostname=irc.eversible.com
-31_Id=myserver395249335178
-34_Description=Atlanta%20Server
-36_Hostname=irc.nac.net
-40_Id=myserver395547488724
-43_Description=Los%20Angeles%20Server
-45_Hostname=ircd.choopa.net
-2_Id=myserver395198444804
-5_Description=EFnet%20Denmark%20HUB%20Server
-7_Hostname=hub.efnet.us
-14_Id=myserver395449772246
-17_Description=Borlange%20Server
-19_Hostname=irc.efnet.eu
-23_Id=myserver395112463521
-26_Description=USA%20Random%20Server
-28_Hostname=irc.he.net
-32_Id=myserver395237880129
-35_Description=Los%20Angeles%20Server
-37_Hostname=irc.prison.net
-41_Id=myserver395462178591
-44_Description=New%20York%20Server
-3_Id=myserver395374544844
-6_Description=EFnet%20Netherlands%20HUB%20Server
-8_Hostname=hub.se
-15_Id=myserver395388648876
-18_Description=Canada%20Random%20Server
-24_Id=myserver395186508973
-27_Description=Miami%20Server
-29_Hostname=irc.homelien.no
-33_Id=myserver395262539857
-36_Description=New%20York%20Server
-38_Hostname=irc.pte.hu
-42_Id=myserver39551128941
-45_Description=New%20York%20HUB%20Server
-4_Id=myserver395287972964
-7_Description=USA%20HUB%20Server
-9_Hostname=irc.ac.za
-16_Id=myserver395150841334
-19_Description=Europe%20Random%20Server
-25_Id=myserver395299485837
-28_Description=Fremont%20Server
-34_Id=myserver395669152320
-37_Description=San%20Francisco%20Server
-39_Hostname=irc.servercentral.net
-43_Id=myserver395559296711
-5_Id=myserver3954123477
-8_Description=EFnet%20Sweden%20HUB%20Server
-17_Id=myserver39521276499
-26_Id=myserver395437700915
-29_Description=Oslo%20IPv6%20Server
-35_Id=myserver395523892294
-38_Description=Pecs%20Server
-44_Id=myserver395584437840
-6_Id=myserver3953492520
-9_Description=South%20Africa%20IPv6%25Server
-18_Id=myserver395125661723
-27_Id=myserver395535334468
-36_Id=myserver395621687215
-39_Description=Chicago%20Server
-45_Id=myserver395633130543
-7_Id=myserver395572555209
-19_Id=myserver395174467348
-28_Id=myserver395681822239
-37_Id=myserver395657331254
-8_Id=myserver39533683239
-29_Id=myserver395275421932
-38_Id=myserver395425558170
-[Eleethal]
-0_Hostname=irc.eleethal.com
-NServers=1
-0_Description=Eleethal:%20Random%20server
-0_Id=myserver395698633534
-[FEFnet]
-0_Hostname=irc.fef.net
-NServers=1
-0_Description=FEFnet:%20Random%20server
-0_Id=myserver395716181112
-[IRCworld]
-0_Hostname=irc.ircworld.org
-NServers=1
-0_Description=IRCworld:%20Random%20server
-0_Id=myserver395734580525
-[Librenet]
-0_Hostname=irc.librenet.net
-NServers=1
-0_Description=Librenet:%20Random%20server
-0_Id=myserver395752601515
-[MagicStar]
-0_Hostname=irc.magicstar.net
-NServers=1
-0_Description=MagicStar:%20Random%20server
-0_Id=myserver395770578421
-[MindForge]
-0_Port=6697
-0_Hostname=irc.mindforge.info
-NServers=2
-1_Hostname=irc.mindforge.org
-0_Description=MindForge:%20Random%20Server
-0_SSL=true
-1_Description=MindForge:%20Random%20Server
-0_Id=myserver395803738485
-1_Id=myserver395789630897
-[OFTC]
-0_Hostname=irc.debian.org
-NServers=2
-1_Hostname=irc.oftc.net
-0_Description=Debian%20IRC%20Server
-1_Description=main%20OFTC.net%20server
-0_Id=myserver395833936919
-1_Id=myserver39582141419
-[SpotChat]
-0_Hostname=irc.spotchat.org
-NServers=1
-0_Description=SpotChat:%20Random%20server
-0_Id=myserver395853134378
-[ST-City]
-0_Hostname=aurora.st-city.net
-NServers=4
-1_Hostname=bajor.st-city.net
-0_Description=ST-City:%20Aurora
-0_SSL=true
-2_Hostname=irc.st-city.net
-1_Description=ST-City:%20Bajor
-1_SSL=true
-3_Hostname=romulus.st-city.net
-2_Description=ST-City:%20Random%20server
-2_SSL=true
-0_Id=myserver39591073547
-3_Description=ST-City:%20Romulus
-3_SSL=true
-1_Id=myserver395897223415
-2_Id=myserver395871274624
-3_Id=myserver395884716617
-[WeNet]
-0_Hostname=irc.wenet.ru
-NServers=1
-0_Description=Primary%20WeNet%20server
-Encoding=CP-1251
-0_Id=myserver395928639375
-Description=Russian%20Network
-[WorldIRC]
-0_Hostname=irc.worldirc.org
-NServers=1
-0_Description=WorldIRC:%20Random%20server
-0_Id=myserver395948262558
-[Blabbernet]
-0_Hostname=irc.blabber.net
-NServers=1
-0_Description=Blabbernet:%20Random%20server
-0_Id=myserver39596622272
-[GalaxyNet]
-0_Hostname=irc.galaxynet.org
-NServers=2
-1_Hostname=online.be.galaxynet.org
-0_Description=Galaxynet:%20Random%20server
-1_Description=Galaxynet:%20EU,%20BE,%20Online
-0_Id=myserver395983797795
-1_Id=myserver395998310602
-[Globalchat]
-0_Hostname=irc.globalchat.org
-NServers=1
-0_Description=Globalchat:%20Random%20server
-0_Id=myserver396016375398
-[IrcNet.ru]
-0_Hostname=irc.ircnet.ru
-NServers=1
-0_Description=IrcNet.ru:%20Random%20server
-0_Id=myserver396033648240
-[Relicnet]
-0_Hostname=irc.relic.net
-NServers=1
-0_Description=Relicnet:%20Random%20server
-0_Id=myserver396050725357
-[IRC.by]
-0_Hostname=irc.by
-NServers=1
-0_Description=Random%20server
-Encoding=CP-1251
-0_Id=myserver396066777386
-Description=The%20Biggest%20Belarus%20Network
-[Kreynet]
-0_Hostname=irc.krey.net
-NServers=1
-0_Description=KreyNet:%20Random%20server
-0_Id=myserver396082657119
-[Pirc]
-0_Hostname=irc.pirc.pl
-NServers=1
-0_Description=Pirc%20Random%20Server
-0_SSL=true
-0_Id=myserver396097497713
-Description=Polish%20Network,%20IPv6%20enabled
-[SolarNet]
-0_Hostname=irc.solarnet.ru
-NServers=1
-0_Description=Main%20network%20server
-Encoding=CP-1251
-0_Id=myserver396114689143
-Description=Russian%20Network
-[Chatpinoy]
-0_Hostname=irc.chatpinoy.com
-NServers=1
-0_Description=Chatpinoy:%20Random%20server
-0_Id=myserver396131112771
-[GlobalGamers]
-0_Hostname=eu.globalgamers.net
-2_Port=6660
-NServers=4
-1_Hostname=irc.globalgamers.net
-0_Description=Global%20Gamers:%20Europe%20Random%20Server
-2_Hostname=irc.globalgamers.net
-1_Description=Global%20Gamers%20Network
-3_Hostname=us.globalgamers.net
-2_Description=SSL%20ready%20server
-2_SSL=true
-0_Id=myserver396189832796
-3_Description=Global%25Gamers:%20US/North%20America%20Random%20Server
-1_Id=myserver396149187405
-2_Id=myserver396162805336
-3_Id=myserver39617663274
-[iZ-smart.net]
-0_Hostname=irc.iZ-smart.net
-NServers=1
-0_Description=iZ-smart:%20Random%20server
-0_Id=myserver396224472854
-[Othernet]
-0_Hostname=irc.othernet.org
-NServers=1
-0_Description=Othernet:%20Random%20server
-0_Id=myserver39620568677
-[Afternet]
-0_Hostname=irc.afternet.org
-NServers=1
-0_Description=Afternet:%20Random%20server
-0_Id=myserver396241809217
-[Austnet]
-0_Hostname=au.austnet.org
-NServers=2
-1_Hostname=us.austnet.org
-0_Description=Austnet:%20Random%20AU%20server
-1_Description=Austnet:%20Random%20US%20server
-0_Id=myserver396257967134
-1_Id=myserver396268374536
-[Beyondirc]
-0_Hostname=irc.beyondirc.net
-NServers=1
-0_Description=BeyondIRC:%20Random%20server
-0_Id=myserver396284894615
-[Darkfire]
-0_Hostname=irc.darkfire.net
-NServers=1
-0_Description=Darkfire:%20Random%20server
-0_Id=myserver396301353100
-[freenode]
-9_Id=myserver39642247838
-10_Hostname=orwell.freenode.net
-11_Hostname=pratchett.freenode.net
-0_Hostname=adams.freenode.net
-7_Current=true
-10_Description=Helsinki,%20Finland
-12_Hostname=zelazny.freenode.net
-NServers=13
-1_Hostname=anthony.freenode.net
-11_Description=London,%20United%20Kingdom
-0_Description=Oslo,%20Norway
-2_Hostname=asimov.freenode.net
-12_Description=Corvallis,%20OR,%20USA
-Current=true
-1_Description=Irvine,%20CA,%20USA
-3_Hostname=chat.au.freenode.net
-10_Id=myserver396384954379
-2_Description=Brisbane,%20Australia
-4_Hostname=chat.eu.freenode.net
-11_Id=myserver39643544908
-0_Id=myserver396397653692
-3_Description=Main%20Australia%20router
-5_Hostname=chat.us.freenode.net
-12_Id=myserver396460654853
-1_Id=myserver396476390445
-4_Description=Main%20Europe%20router
-6_Hostname=gibson.freenode.net
-2_Id=myserver39634615468
-5_Description=Main%20USA%20router
-7_Hostname=irc.freenode.org
-3_Id=myserver3963338810
-6_Description=Oslo,%20Norway
-7_AutoConnect=true
-8_Hostname=kornbluth.freenode.net
-4_Id=myserver396358840778
-7_Description=Main%20freenode%20router
-9_Hostname=leguin.freenode.net
-5_Id=myserver396447125520
-8_Description=Frankfurt,%20Germany
-6_Id=myserver396409840370
-7_AutoJoinChannels=##-ini(tmp.channel)-#:
-#-ini(tmp.channel,)-#
-9_Description=Umea,%20Sweden
-Description=The%20FOSS%20Network
-7_Id=myserver39632021923
-8_Id=myserver396371535266
-[LibraIRC]
-1_Port=6697
-0_Hostname=irc.librairc.net
-NServers=2
-1_Hostname=irc.librairc.net
-0_Description=LibraIRC:%20Random%20server
-1_Description=LibraIRC:%20Random%20Server%20SSL
-1_SSL=true
-0_Id=myserver39649560381
-1_Id=myserver396508833636
-[Realirc]
-0_Hostname=irc.realirc.org
-NServers=1
-0_Description=Realirc:%20Random%20server
-0_Id=myserver396526659414
-[SolidIRC]
-1_Port=6601
-0_Hostname=irc.solidirc.com
-NServers=2
-1_Hostname=irc.solidirc.com
-0_Description=SolidIRC:%20Random%20server
-1_Description=SolidIRC:%20Random%20server%20SSL
-1_SSL=true
-0_Id=myserver396545424404
-1_Id=myserver396559472747
-[GameSurge]
-0_Hostname=irc.eu.gamesurge.net
-NServers=3
-1_Hostname=irc.gamesurge.net
-0_Description=GameSurge:%20Random%20EU%20server
-2_Hostname=irc.us.gamesurge.net
-1_Description=GameSurge:%20Random%20server
-2_Description=GameSurge:%20Random%20USA%20server
-0_Id=myserver396588549664
-1_Id=myserver39660043765
-2_Id=myserver396576877930
-[Planetarion]
-0_Hostname=irc.planetarion.com
-NServers=1
-0_Description=Planetarion:%20Random%20server
-0_Id=myserver396618809855
-[Rullz]
-0_Hostname=irc.rullz.lv
-NServers=1
-0_Description=Rullz:%20Main%20server
-0_Id=myserver39663422549
-[ShadowWorld]
-0_Hostname=irc.shadowworld.net
-NServers=1
-0_Description=ShadowWorld:%20Random%20server
-0_Id=myserver396652887650
-[StarChat]
-0_Hostname=boomer.qld.au.starchat.net
-NServers=4
-1_Hostname=irc.starchat.net
-0_Description=StarChat:%20AU,%20QLD,%20SouthernCross
-2_Hostname=reality.no.eu.starchat.net
-1_Description=StarChat:%20Random%20server
-3_Hostname=sand.ca.us.starchat.net
-2_Description=StarChat:%20EU,%20NO,%20Asker
-0_Id=myserver396682497931
-3_Description=StarChat:%20US,%20CA,%20San%20Jose
-1_Id=myserver396669910625
-2_Id=myserver396694137388
-3_Id=myserver396705833503
-[euIRC]
-0_Hostname=irc.euirc.net
-NServers=1
-0_Description=euIRC:%20Random%20server
-0_Id=myserver396721884879
-[PenguinFriends]
-1_Port=6670
-0_Hostname=irc.penguinfriends.org
-NServers=4
-1_Hostname=irc.penguinfriends.org
-0_Description=PenguinFriends:%20Random%20server
-2_Hostname=onlyfreaks.penguinfriends.org
-1_Description=PenguinFriends:%20Random%20server%20SSL
-1_SSL=true
-3_Hostname=pf-gaming.penguinfriends.org
-2_Description=onlyfreaks.penguinfriends.org
-0_Id=myserver396774473526
-3_Description=pf-gaming.penguinfriends.org
-1_Id=myserver396815610855
-2_Id=myserver396802366946
-3_Id=myserver39678862584
-[Snoonet]
-0_Hostname=irc.snoonet.org
-NServers=1
-0_Description=Snoonet:%20Random%20server
-0_Id=myserver396736515893
-[StarWars-IRC]
-0_Hostname=irc.starwars-irc.net
-NServers=1
-0_Description=StarWars-IRC:%20Random%20server
-0_Id=myserver396754659717
-[Irctoo]
-0_Hostname=irc.irctoo.net
-NServers=1
-0_Description=Irctoo:%20Random%20server
-0_Id=myserver396832972267
-[Rezosup]
-0_Hostname=irc.rezosup.org
-NServers=1
-0_Description=Rezosup:%20Random%20server
-0_Id=myserver3968484756
-[Rusnet]
-4_Encoding=CP-1251
-9_Id=myserver397011755668
-11_Port=7770
-20_Port=6660
-25_Encoding=CP-1251
-0_Port=7770
-10_Hostname=irc.lucky.net
-12_Port=6660
-21_Port=7770
-30_Port=6666
-1_Port=7770
-11_Hostname=irc.meganet.ru
-13_Port=7777
-20_Hostname=irc.run.net
-22_Port=6669
-31_Port=6666
-0_Hostname=irc.211.ru
-2_Port=6669
-10_Description=Ukraine,%20Kyiv
-12_Hostname=irc.mv.ru
-14_Port=6660
-21_Hostname=irc.seb.org.ua
-23_Port=6666
-28_Encoding=CP-1251
-30_Hostname=irc.tomsk.net
-32_Port=6660
-NServers=37
-1_Hostname=irc.anarxi.st
-3_Port=7774
-11_Description=Russia,%20Moscow
-13_Hostname=irc.newit-lan.ru
-15_Port=7777
-20_Description=Russia,%20Saint-Petersburg
-22_Hostname=irc.siberianet.ru
-24_Port=6660
-31_Hostname=irc.tpu.ru
-33_Port=7770
-0_Description=Russia,%20Novosibirsk
-2_Hostname=irc.baikal.net
-4_Port=6669
-12_Description=Russia,%20Ulyanovsk
-14_Hostname=irc.nikolaev.ua
-16_Port=7770
-21_Description=Germany
-23_Hostname=irc.spbu.ru
-25_Port=6669
-30_Description=Russia,%20Tomsk
-32_Hostname=irc.tsua.net
-34_Port=7770
-Encoding=UTF-8
-1_Description=Netherlands,%20Doetinchem
-3_Hostname=irc.chelyabinsk.ru
-5_Port=6666
-10_Id=myserver397025523974
-13_Description=Udmurtia,%20Glazov
-15_Hostname=irc.nnov.net
-17_Port=6666
-22_Description=Russia,%20Krasnoyarsk
-24_Hostname=irc.stv.su
-26_Port=7770
-31_Description=Russia,%20Tomsk
-33_Hostname=irc.tsure.ru
-35_Port=7770
-2_Description=Buryatia,%20Ulan-Ude
-4_Hostname=irc.gcn.ua
-6_Port=6666
-11_Id=myserver397038242366
-14_Description=Ukraine,%20Nikolaev
-16_Hostname=irc.nsib.ru
-18_Port=7770
-20_Id=myserver397158270422
-23_Description=Russia,%20Saint-Petersburg
-25_Hostname=irc.tagan.name
-27_Port=6666
-32_Description=Ukraine,%20Kiev
-34_Hostname=irc6.meganet.ru
-36_Port=7776
-0_Id=myserver396868407781
-3_Description=Russia,%20Chelyabinsk
-5_Hostname=irc.intersvyaz.net
-12_Id=myserver397052724495
-15_Description=Russia,%20Nizhny%20Novgorod
-17_Hostname=irc.nsu.ru
-19_Port=6660
-21_Id=myserver397171587671
-24_Description=Russia,%20Moscow
-26_Hostname=irc.tambov.ru
-28_Port=6669
-30_Id=myserver397291412210
-33_Description=Russia,%20Taganrog
-35_Hostname=irc6.tambov.ru
-1_Id=myserver396908577694
-4_Description=Ukraine,%20Ilyichevsk
-6_Hostname=irc.intertax.ru
-8_Port=7777
-13_Id=myserver397065628717
-16_Description=Russia,%20Novosibirsk
-18_Hostname=irc.perm.ru
-22_Id=myserver397185843606
-25_Description=Russia,%20Taganrog
-27_Hostname=irc.telesweet.net
-29_Port=7770
-31_Id=myserver3973049225
-34_Description=Russia,%20Moscow,%20IPv6
-34_IPv6=true
-36_Hostname=rusnet.tomsk.ru
-2_Id=myserver39692182174
-5_Description=Russia,%20Chelyabinsk
-7_Hostname=irc.ixx.ru
-9_Port=7770
-14_Id=myserver397078769483
-17_Description=Russia,%20Novosibirsk
-19_Hostname=irc.primorye.ru
-23_Id=myserver39719863629
-26_Description=Russia,%20Tambov
-28_Hostname=irc.tom.ru
-32_Id=myserver397318635222
-35_Description=Russia,%20Tambov,%20IPv6
-35_IPv6=true
-3_Id=myserver39693467866
-6_Description=Russia,%20Krasnoyarsk
-8_Hostname=irc.kgts.ru
-15_Id=myserver397091129764
-18_Description=Russia,%20Perm
-24_Id=myserver39721129799
-27_Description=Ukraine,%20Sumy
-29_Hostname=irc.tomck.net
-33_Id=myserver397332466335
-36_Description=Russia,%20Tomsk
-4_Id=myserver396947297267
-7_Description=Russia,%20Sosnovoborsk
-9_Hostname=irc.krasnet.ru
-16_Id=myserver397104458799
-19_Description=Russia,%20Vladivostok
-25_Id=myserver397225426819
-28_Description=Russia,%20Tomsk
-34_Id=myserver396881783700
-5_Id=myserver396959160914
-8_Description=Russia,%20Kazan
-17_Id=myserver39711732558
-26_Id=myserver397238537172
-29_Description=Russia,%20Tomsk
-35_Id=myserver396895677646
-6_Id=myserver396973984812
-9_Description=Russia,%20Krasnoyarsk
-18_Id=myserver397131125892
-22_Encoding=CP-1251
-27_Id=myserver3972511920
-36_Id=myserver397345690760
-Description=Russian%20Network
-2_Encoding=CP-1251
-7_Id=myserver396985690820
-19_Id=myserver397144159355
-28_Id=myserver39727896648
-8_Id=myserver396998256457
-10_Port=7777
-29_Id=myserver39726489613
-[Sorcery]
-0_Hostname=irc.sorcery.net
-NServers=3
-1_Hostname=kechara.sorcery.net
-0_Description=Sorcerynet:%20Random%20server
-2_Hostname=nexus.sorcery.net
-1_Description=Sorcerynet:%20US,%20CA,%20Palo%20Alto
-2_Description=Sorcerynet:%20EU,%20SE,%20Karlskrona
-0_Id=myserver397363535977
-1_Id=myserver397375648312
-2_Id=myserver397388918474
-[Escaped]
-0_Hostname=irc.escaped.net
-NServers=1
-0_Description=Escaped:%20Random%20server
-0_Id=myserver397404455492
-[IRCItalia]
-0_Hostname=irc.ircitalia.net
-NServers=1
-0_Description=IRCItalia%20network
-0_Id=myserver397420943334
-[Newnet]
-0_Hostname=irc.chelmsford.com
-NServers=3
-1_Hostname=irc.newnet.net
-0_Description=Newnet:%20US,%20MA,%20Chelmsford
-2_Hostname=irc.uplink.net.nz
-1_Description=Newnet:%20Random%20server
-2_Description=Newnet:%20NZ,%20Auckland
-0_Id=myserver397436153753
-1_Id=myserver397447277369
-2_Id=myserver39745838942
-[NightStar]
-0_Hostname=irc.nightstar.net
-NServers=1
-0_Description=Nightstar:%20Random%20server
-0_Id=myserver3974787297
-[PTnet]
-0_Hostname=telepac2.ptnet.org
-NServers=2
-1_Hostname=ualg.ptnet.org
-0_Description=PTnet:%20EU,%20PT,%20Lisboa
-1_Description=PTnet:%20EU,%20PT,%20Faro
-0_Id=myserver397494945830
-1_Id=myserver39750641103
-Description=Portuguese%20Network
-[StarLink-irc]
-0_Hostname=irc.starlink-irc.org
-NServers=1
-0_Description=StarLink-irc:%20Random%20server
-0_Id=myserver397524680709
-[Chatnet]
-0_Hostname=Chicago.IL.US.ChatNet.Org
-NServers=1
-0_Description=Chatnet:%20Random%20AU%20server
-0_Id=myserver39754028350
-[Chatster]
-0_Hostname=irc.chatster.org
-NServers=1
-0_Description=Chatster:%20Random%20server
-0_Id=myserver397556385315
-[DarkMyst]
-0_Hostname=irc.darkmyst.org
-NServers=1
-0_Description=DarkMyst:%20Random%20server
-0_Id=myserver397573428101
-[IRC-Hispano]
-0_Hostname=irc.irc-hispano.org
-NServers=1
-0_Description=IRC-Hispano:%20Random%20server
-0_Id=myserver39759178428
-Description=Spanish%20Network
-[KottNet]
-0_Hostname=irc.kottnet.net
-NServers=1
-0_Description=KottNet.net:%20Random%20server
-0_Id=myserver397608740315
-[QuakeNet]
-9_Id=myserver397654345244
-10_Hostname=mediatraffic.fi.quakenet.org
-11_Hostname=multiplay.uk.quakenet.org
-0_Hostname=b0rk.uk.quakenet.org
-10_Description=Finland%20Server
-12_Hostname=netfire.tx.us.quakenet.org
-NServers=19
-1_Hostname=blueyonder.uk.quakenet.org
-11_Description=UK%20Server
-13_Hostname=netfire.va.us.quakenet.org
-0_Description=UK%20Server
-2_Hostname=demon.uk.quakenet.org
-12_Description=USA%20Server
-14_Hostname=ngi.it.quakenet.org
-1_Description=UK%20Server
-3_Hostname=euroserv.fr.quakenet.org
-10_Id=myserver397667349866
-13_Description=USA%20Server
-15_Hostname=port80.se.quakenet.org
-2_Description=UK%20Server
-4_Hostname=freddyshouse.uk.quakenet.org
-11_Id=myserver397801768833
-14_Description=Italy%20Server
-16_Hostname=servercentral.il.us.quakenet.org
-0_Id=myserver397747282200
-3_Description=France%20Server
-5_Hostname=gameservers.il.us.quakenet.org
-12_Id=myserver397840872289
-15_Description=Sweden%20Server
-17_Hostname=splatterworld.de.quakenet.org
-1_Id=myserver397761603738
-4_Description=UK%20Server
-6_Hostname=gameservers.nj.us.quakenet.org
-13_Id=myserver39785388697
-16_Description=USA%20Server
-18_Hostname=underworld.no.quakenet.org
-2_Id=myserver39777453565
-5_Description=USA%20Server
-7_Hostname=irc.eu.quakenet.org
-14_Id=myserver397706924329
-17_Description=Germany%20Server
-3_Id=myserver397680587850
-6_Description=USA%20Server
-8_Hostname=irc.quakenet.org
-15_Id=myserver397732706221
-18_Description=Norway%20Server
-4_Id=myserver397787666988
-7_Description=Europe%20Random%20Server
-9_Hostname=jubiigames.dk.quakenet.org
-16_Id=myserver397866963569
-5_Id=myserver39781414896
-8_Description=Main%20Random%20Server
-17_Id=myserver397693244627
-6_Id=myserver397827174861
-9_Description=Denmark%20Server
-18_Id=myserver397719159251
-7_Id=myserver39764192211
-8_Id=myserver39762778978
-[SyrolNet]
-0_Hostname=irc.syrolnet.org
-NServers=3
-1_Hostname=moon.syrolnet.org
-0_Description=SyrolNet%20round%20robin
-2_Hostname=phobos.syrolnet.org
-1_Description=Moon%20irc%20server
-2_Description=IPv6/IPv4%20server
-0_Id=myserver397885419235
-1_Id=myserver397899214902
-2_Id=myserver397912231663
-Description=Italian%20Network
-[Virtualife]
-0_Hostname=irc.virtualife.com.br
-NServers=1
-0_Description=Virtualife:%20Random%20server
-0_Id=myserver397932266490
-Description=Brazilian%20Network
-[ExodusIRC]
-0_Hostname=irc.exodusirc.net
-NServers=1
-0_Description=ExodusIRC:%20Random%20server
-0_Id=myserver397949711743
-[PortalX]
-0_Hostname=irc.portalx.org
-NServers=1
-0_Description=PortalX:%20Random%20server
-0_Id=myserver397965295972
-[Novernet]
-0_Hostname=chat.novernet.com
-NServers=2
-1_Hostname=irc.novernet.com
-0_Description=Novernet:%20US,%20MN,%20Minneapolis
-1_Description=Novernet:%20Random%20server
-0_Id=myserver397993910898
-1_Id=myserver397981710345
-[ShadowFire]
-0_Hostname=irc.shadowfire.org
-NServers=1
-0_Description=ShadowFire:%20Random%20server
-0_Id=myserver398010239115
-[Stormdancing]
-0_Hostname=irc.stormdancing.net
-NServers=1
-0_Description=Stormdancing:%20Random%20server
-0_Id=myserver398028949928
-[Digitalirc]
-0_Hostname=irc.digitalirc.net
-NServers=1
-0_Description=Digitalirc:%20Random%20server
-0_Id=myserver398046247
-[EnterTheGame]
-0_Hostname=irc.enterthegame.com
-NServers=1
-0_Description=EntertheGame:%20Random%20server
-0_Id=myserver398064868449
-[EuropNet]
-0_Hostname=irc.europnet.org
-NServers=3
-1_Hostname=irc.free.fr
-0_Description=EuropNet%20round%20robin
-2_Hostname=irc.librenet.net
-1_Description=Free%20irc%20server
-2_Description=Librenet%20network%20server
-0_Id=myserver398081739199
-1_Id=myserver39809364892
-2_Id=myserver398105661977
-Description=French%20Network
-[ICQnet]
-0_Hostname=irc.icq.com
-NServers=1
-0_Description=ICQnet:%20Random%20server
-0_Id=myserver398121212963
-[KewlOrg]
-0_Hostname=irc.kewl.org
-NServers=1
-0_Description=Kewl.org:%20Random%20server
-0_Id=myserver398137865432
-[Outsiderz]
-0_Hostname=irc.outsiderz.com
-NServers=1
-0_Description=Outsiderz:%20Random%20server
-0_Id=myserver398154447779
-[Terra]
-0_Hostname=irc.terra.com
-NServers=2
-1_Hostname=irc.terra.es
-0_Description=Terra%20USA
-1_Description=Terra%20Spain
-0_Id=myserver398170269449
-1_Id=myserver398182544713
-[Univers]
-0_Hostname=irc.univers.org
-NServers=1
-0_Description=Univers:%20Random%20server
-0_Id=myserver39819837333
-[AlphaChat]
-0_Hostname=irc.alphachat.net
-NServers=1
-0_Description=AlphaChat:%20Random%20Server
-0_Id=myserver398215678839
-[Axenet]
-0_Hostname=irc.axenet.org
-NServers=1
-0_Description=Axenet:%20Random%20server
-0_Id=myserver39823073899
-[Chatcafe]
-0_Hostname=irc.chatcafe.net
-NServers=1
-0_Description=Chatcafe:%20Random%20server
-0_Id=myserver398246215941
-[Criten]
-0_Hostname=irc.criten.net
-NServers=1
-0_Description=Criten:%20Random%20server
-0_Id=myserver398262221977
-[GeekShed]
-0_Hostname=irc.geekshed.net
-NServers=1
-0_Description=GeekShed:%20Random%20server
-0_Id=myserver399430814750
-[IRCnet]
-9_Id=myserver399195634559
-39_Id=myserver398971412133
-48_Id=myserver398406608350
-57_Id=myserver399349518286
-66_Id=myserver399307227136
-69_Description=Tiscali%20Server
-75_Id=myserver39923797689
-10_Hostname=irc.belwue.de
-49_Id=myserver398393426543
-58_Id=myserver398763756534
-67_Id=myserver398312797205
-76_Id=myserver39833933797
-11_Hostname=irc.cc.tut.fi
-20_Hostname=irc.felk.cvut.cz
-59_Id=myserver398889540411
-68_Id=myserver398790671529
-77_Id=myserver399097866804
-0_Hostname=atw.irc.hu
-10_Description=BelWue%20Server
-12_Hostname=irc.cs.hut.fi
-21_Hostname=irc.fu-berlin.de
-30_Hostname=irc.lut.fi
-69_Id=myserver39880461389
-NServers=78
-1_Hostname=au.ircnet.org
-11_Description=Tampere%20Server
-13_Hostname=irc.datanet.ee
-20_Description=Prague%20Server
-22_Hostname=irc.hi.is
-31_Hostname=irc.media.kyoto-u.ac.jp
-40_Hostname=irc.seed.net.tw
-0_Description=ATW%20Server
-2_Hostname=elte.irc.hu
-12_Description=University%20Of%20Helsinki%20Server
-14_Hostname=irc.datanet.ee
-21_Description=University%20Of%20Berlin%20Server
-23_Hostname=irc.hitos.no
-30_Description=University%20Of%20Ranta%20Server
-32_Hostname=irc.oamk.fi
-41_Hostname=irc.simnet.is
-50_Hostname=irc.utu.fi
-1_Description=Australia%20Random%20Server
-3_Hostname=eu.irc6.net
-10_Id=myserver398379729625
-13_Description=Linxtelecom%20Server
-15_Hostname=irc.dotsrc.org
-22_Description=University%20Of%20Iceland%20Server
-24_Hostname=irc.huie.hokudai.ac.jp
-31_Description=Kyoto%20Server
-33_Hostname=irc.okit.se
-40_Description=Seednet%20Server
-42_Hostname=irc.snt.utwente.nl
-51_Hostname=irc.xs4all.nl
-60_Hostname=ircnet.choopa.net
-2_Description=University%20Of%20Budapest
-4_Hostname=eu.ircnet.org
-11_Id=myserver398610158178
-14_Description=Linxtelecom%20IPv6%20Server
-16_Hostname=irc.elisa.fi
-20_Id=myserver39836695598
-23_Description=Tromsoe%20Server
-25_Hostname=irc.ifi.uio.no
-32_Description=OuluNet%20Server
-34_Hostname=irc.opoy.fi
-41_Description=Iceland%20Telecom%20Server
-43_Hostname=irc.song.fi
-50_Description=University%20Of%20Turku%20Server
-52_Hostname=irc1.inet.fi
-61_Hostname=ircnet.club-internet.fr
-70_Hostname=krakow.irc.pl
-0_Id=myserver39867871421
-3_Description=Europe%20Random%20IPv6%20Server
-5_Hostname=extra.irc.hu
-12_Id=myserver398489877312
-15_Description=DotSrc%20Server
-17_Hostname=irc.eutelia.it
-21_Id=myserver398420683970
-24_Description=University%20Of%20Hokkaido
-26_Hostname=irc.ipv6.cesnet.cz
-30_Id=myserver398596890180
-33_Description=OK%20IT%20AB%20Server
-35_Hostname=irc.oulu.fi
-42_Description=University%20Of%20Twente%20Server
-44_Hostname=irc.starman.ee
-51_Description=XS4ALL%20Server
-53_Hostname=irc1.tin.it
-60_Description=Choopa,%20Inc%20Server
-62_Hostname=ircnet.demon.co.uk
-71_Hostname=linz.irc.at
-1_Id=myserver399265828750
-4_Description=Europe%20Random%20Server
-6_Hostname=hub.irc.hu
-13_Id=myserver398434810646
-16_Description=Elisa%20Oyj%20Server
-18_Hostname=irc.eutelia.it
-22_Id=myserver398749472133
-25_Description=University%20Of%20Oslo%20Server
-27_Hostname=irc.ircnet.org
-31_Id=myserver398916711213
-34_Description=Oulu%20Telephone%20Server
-36_Hostname=irc.powertech.no
-40_Id=myserver399223991774
-43_Description=TDC%20Song%20Server
-45_Hostname=irc.starman.ee
-52_Description=iNET%20Server
-54_Hostname=irc1.tiscali.it
-61_Description=T-Online%20France%20Server
-63_Hostname=ircnet.nerim.fr
-70_Description=AGH%20Server
-72_Hostname=lublin.irc.pl
-2_Id=myserver398665325
-5_Description=Extra%20Server
-7_Hostname=irc-new.media.kyoto-u.ac.jp
-14_Id=myserver399321428865
-17_Description=Eutelia%20Server
-19_Hostname=irc.excite.it
-23_Id=myserver399027800202
-26_Description=CESNET2%20IPv6%20Server
-28_Hostname=irc.jyu.fi
-32_Id=myserver39862373619
-35_Description=University%20Of%20Olutensin%20Server
-37_Hostname=irc.powertech.no
-41_Id=myserver398735763974
-44_Description=Starman%20Server
-46_Hostname=irc.swipnet.se
-50_Id=myserver398526474213
-53_Description=Telecom%20Italia%20Server
-55_Hostname=irc2.tin.it
-62_Description=THUS%20Server
-64_Hostname=ircnet.netvision.net.il
-71_Description=Linz%20Server
-73_Hostname=poznan.irc.pl
-3_Id=myserver399279383544
-6_Description=Godollo%20HUB%20Server
-8_Hostname=irc.apollo.lv
-15_Id=myserver399083400103
-18_Description=Eutelia%20IPv6%20Server
-24_Id=myserver398902540633
-27_Description=Main%20Random%20Server
-29_Hostname=irc.ludd.luth.se
-33_Id=myserver399167147754
-36_Description=PowerTech%20Server
-38_Hostname=irc.pvv.ntnu.no
-42_Id=myserver398958151526
-45_Description=Starman%20IPv6%20Server
-47_Hostname=irc.triera.si
-51_Id=myserver398985864259
-54_Description=Tiscali%20Server
-56_Hostname=irc3.tin.it
-60_Id=myserver399251468144
-63_Description=Nerim%20Server
-65_Hostname=ircnet.realroot.be
-72_Description=UMCS%20Server
-74_Hostname=uk.ircnet.org
-4_Id=myserver398298965246
-7_Description=Kyoto%20Server
-9_Hostname=irc.arnes.si
-16_Id=myserver398503180228
-19_Description=Excite%20Italia%20Server
-25_Id=myserver398999788718
-28_Description=University%20Of%20Jyvaskyla%20Server
-34_Id=myserver398462655900
-37_Description=PowerTech%20IPv6%20Server
-39_Hostname=irc.sci.kun.nl
-43_Id=myserver398540770498
-46_Description=Tele2%20Sweden%20Server
-48_Hostname=irc.tu-ilmenau.de
-52_Id=myserver398553906623
-55_Description=Telecom%20Italia%20Server
-57_Hostname=irc6.ngnet.it
-61_Id=myserver398637321936
-64_Description=NetVision%20Server
-66_Hostname=ircs.ircnet.ee
-70_Id=myserver399125505406
-73_Description=UAM%20Server
-75_Hostname=us.ircnet.org
-5_Id=myserver398693321129
-8_Description=Apollo%20Server
-17_Id=myserver398818919913
-26_Id=myserver399293999422
-29_Description=Lulea%20Server
-35_Id=myserver398567420420
-38_Description=IRCNO%20Server
-44_Id=myserver39844897714
-47_Description=Triera%20Server
-49_Hostname=irc.uni-erlangen.de
-53_Id=myserver398846508345
-56_Description=Telecom%20Italia%20Server
-58_Hostname=ircd.simnet.is
-62_Id=myserver399069242281
-65_Description=RealROOT%20Server
-67_Hostname=ix.irc.at
-71_Id=myserver39832564956
-74_Description=UK%20Random%20Server
-76_Hostname=vienna.irc.at
-6_Id=myserver39870744278
-9_Description=ARNES%20Server
-18_Id=myserver399363554717
-27_Id=myserver398283984516
-36_Id=myserver399041773379
-39_Description=University%20Of%20Nijmegen%20Server
-45_Id=myserver39933562417
-48_Description=University%20Of%20Ilmenau%20Server
-54_Id=myserver398776306379
-57_Description=Telecom%20Italia%20IPv6%20Server
-59_Hostname=ircd.tin.it
-63_Id=myserver39865125934
-66_Description=IPv6%20Server
-68_Hostname=javairc.tiscali.it
-72_Id=myserver39913993501
-75_Description=USA%20Random%20Server
-77_Hostname=warszawa.irc.pl
-7_Id=myserver398930763334
-19_Id=myserver398832884571
-28_Id=myserver39858183940
-37_Id=myserver399377471742
-46_Id=myserver399153871268
-49_Description=University%20Of%20Nurnberg%20Server
-55_Id=myserver398860379205
-58_Description=Iceland%20Telecom%20HUB%20Server
-64_Id=myserver398721306550
-67_Description=IX%20Server
-69_Hostname=javairc2.tiscali.it
-73_Id=myserver399111438292
-76_Description=Vienna%20Server
-8_Id=myserver39894430918
-29_Id=myserver39918188722
-38_Id=myserver399013459887
-47_Id=myserver399209630104
-56_Id=myserver398875562119
-59_Description=Telecom%20Italia%20HUB%20Server
-65_Id=myserver398352760663
-68_Description=Tiscali%20Server
-74_Id=myserver399055724684
-77_Description=ICM%20Server
-[Slashnet]
-0_Hostname=irc.slashnet.org
-NServers=1
-0_Description=Slashnet:%20Random%20server
-0_Id=myserver39939576453
-[Zurna]
-0_Hostname=irc.zurna.net
-NServers=1
-0_Description=Zurna:%20Random%20server
-0_Id=myserver399412965710
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc
deleted file mode 100644
index ac4d7059a..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
deleted file mode 100644
index 917740405..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-kvirc = 4.99
-
-[update]
-kvirc = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
deleted file mode 100644
index ffab9d024..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate name=.kvirc4.rc format=kde
-
-[Main]
-LocalKvircDirectory=/home/#-ur_login-#/.config/KVIrc
-SourcesDate=538312962
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
deleted file mode 100644
index 2616ba508..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.polari)!=off&&ini(ver.polari)==&&pkg()>=3.18&&pkg(sys-apps/calculate-utils:3)>=3.4.5.27
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
deleted file mode 100644
index 9099ea930..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-# Calculate format=kde path=~/.local/share/telepathy/mission-control name=accounts.cfg
-
-#?hr_virtual==virtualbox#
-#-ini(tmp.vm,VB)-#
-#hr_virtual#
-#?hr_virtual==vmware#
-#-ini(tmp.vm,VM)-#
-#hr_virtual#
-#?hr_virtual==qemu#
-#-ini(tmp.vm,QE)-#
-#hr_virtual#
-
-[idle/irc/#-ur_login-#0]
-manager=idle
-protocol=irc
-DisplayName=irc.freenode.net
-AutomaticPresence=0;;;
-param-server=irc.freenode.net
-param-fullname=#-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-#
-Enabled=true
-HasBeenOnline=true
-Nickname=#-case(capitalize,ur_login)-##-ini(tmp.vm)-##-rnd(num,2)-#-#-os_locale_language-#
-param-account=#-ur_login-#0
-#NormalizedName=guest0
-#Nickname=guest0
-
-
-
-#[idle/irc/Guest73_2dru0]
-#manager=idle
-#protocol=irc
-#DisplayName=irc.freenode.net
-#AutomaticPresence=0;;;
-#param-server=irc.freenode.net
-#param-fullname=Calculate Linux Desktop 15.17 Cinnamon
-#param-account=Guest73-ru
-#Enabled=true
-#HasBeenOnline=true
-#NormalizedName=guest73-ru
-#Nickname=Guest73-ru
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
deleted file mode 100644
index 58d9b7bb5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=dconf dconf=/org/gnome
-
-#?os_locale_language==fr#
-#-ini(tmp.channel,calculate-fr)-#
-#os_locale_language#
-#?os_locale_language==ru#
-#-ini(tmp.channel,calculate-ru)-#
-#os_locale_language#
-#?in(os_locale_language,fr,ru)==#
-#-ini(tmp.channel,calculate)-#
-#in#
-
-[polari]
-saved-channel-list=[{'account': <'/org/freedesktop/Telepathy/Account/idle/irc/#-ur_login-#0'>, 'channel': <'##-ini(tmp.channel)-#'>}]
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
deleted file mode 100644
index 048813074..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-polari = 3.18
-
-[update]
-polari = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
deleted file mode 100644
index 4d7276182..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.openssh)!=off&&ini(ver.openssh)==&&pkg()>=6.7&&os_root_type!=livecd&&exists(~/.ssh)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
deleted file mode 100644
index ea06957d1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=700
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
deleted file mode 100644
index afec7e616..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
deleted file mode 100644
index 5fb73cbb6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=#
-Host *
-  ControlMaster auto
-  ControlPersist 1h
-  ControlPath ~/.ssh/cm_socket/%r@%h:%p
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
deleted file mode 100644
index 8f4553ba3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-openssh = 6.7
-
-[update]
-openssh = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
deleted file mode 100644
index e91427958..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-liferea = 1.7
-
-[update]
-liferea = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
deleted file mode 100644
index b3eb07205..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.liferea_1.7)==&&ini(update.liferea)!=off&&ini(ver.liferea)==&&pkg()>=1.7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
deleted file mode 100644
index c67c48321..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(net-news/liferea)>=1.7&&pkg(net-news/liferea)<1.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
deleted file mode 100644
index 2d92faf15..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate name=feedlist.opml os_locale_language!=ru
-<?xml version='1.0'?>
-<opml version="1.0">
-    <head>
-        <title>Liferea Feed List Export</title>
-    </head>
-    <body>
-        <outline title="Calculate Linux" expanded="true" description="Calculate Linux" viewMode="0" sortColumn="time" type="folder" id="skdcerh" text="Calculate Linux">
-            <outline title="Planet Calculate" description="Planet Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/blogs/en" type="atom" xmlUrl="http://www.calculate-linux.org/blogs/en?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="xlpgexr" text="Planet Calculate" updateInterval="-1"/>
-            <outline title="Forums Calculate" description="Forums Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/en/projects/en/activity?show_messages=1" type="atom" xmlUrl="http://www.calculate-linux.org/en/projects/en/activity.atom?key=#-os_linux_shortname-##-os_linux_ver-#&amp;amp;show_messages=1" id="nusuife" text="Forums Calculate" updateInterval="-1"/>
-            <outline title="Gentoo Linux Security Advisories" description="Gentoo Linux Security Advisories" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/glsa" type="atom" xmlUrl="http://www.calculate-linux.org/glsa?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="xrcetus" text="Gentoo Linux Security Advisories" updateInterval="-1"/>
-            <outline title="New Packages Calculate" description="New Packages Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/packages/newset" type="atom" xmlUrl="http://www.calculate-linux.org/packages/newset?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="sctdowf" text="New Packages Calculate" updateInterval="-1"/>
-            <outline title="News Calculate" description="News Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/news" type="atom" xmlUrl="http://www.calculate-linux.org/news.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="xkramll" text="News Calculate" updateInterval="-1"/>
-            <outline title="Issues Calculate" description="Issues Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/projects/calculatelinux/issues" type="atom" xmlUrl="http://www.calculate-linux.org/projects/calculatelinux/issues.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="qtdynyw" text="Issues Calculate" updateInterval="-1"/>
-        </outline>
-        <outline title="Open Source" expanded="true" description="Open Source" viewMode="0" sortColumn="time" type="folder" id="qningnv" text="Open Source">
-            <outline title="LinuxTracker" description="LinuxTracker" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://linuxtracker.org" type="rss" xmlUrl="http://feeds.feedburner.com/Linuxtracker" id="pitxlwr" text="LinuxTracker" updateInterval="-1"/>
-            <outline title="DistroWatch.com: News" description="DistroWatch.com: News" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://distrowatch.com/" type="rss" xmlUrl="http://distrowatch.com/news/dw.xml" id="jjtbntf" text="DistroWatch.com: News" updateInterval="-1"/>
-        </outline>
-        <outline title="Unread" description="Unread" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="dfcbess" matchType="any" text="Unread">
-            <outline additive="true" type="rule" value="" rule="unread" text="Стату� прочтени�"/>
-        </outline>
-        <outline title="Important" description="Important" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="bocjqld" matchType="any" text="Important">
-            <outline additive="true" type="rule" value="" rule="flagged" text="Важно�ть"/>
-        </outline>
-    </body>
-</opml>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
deleted file mode 100644
index dddaf593c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate name=feedlist.opml os_locale_language==ru
-<?xml version='1.0'?>
-<opml version="1.0">
-    <head>
-        <title>Liferea Feed List Export</title>
-    </head>
-    <body>
-        <outline title="Calculate Linux" expanded="true" description="Calculate Linux" viewMode="0" sortColumn="time" type="folder" id="yytpavw" text="Calculate Linux">
-            <outline title="Планета Calculate" description="Планета Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/blogs/ru" type="atom" xmlUrl="http://www.calculate-linux.ru/blogs/ru?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="qfaepdt" text="Планета Calculate" updateInterval="-1"/>
-            <outline title="Форумы Calculate" description="Форумы Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/ru/projects/ru/activity?show_messages=1" type="atom" xmlUrl="http://www.calculate-linux.ru/ru/projects/ru/activity.atom?key=#-os_linux_shortname-##-os_linux_ver-#&amp;amp;show_messages=1" id="alawxja" text="Форумы Calculate" updateInterval="-1"/>
-            <outline title="Уведомлени� о безопа�но�ти GLSA" description="Уведомлени� о безопа�но�ти GLSA" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/glsa" type="atom" xmlUrl="http://www.calculate-linux.ru/glsa?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="ajoknip" text="Уведомлени� о безопа�но�ти GLSA" updateInterval="-1"/>
-            <outline title="�овые пакеты Calculate" description="�овые пакеты Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/packages/newset" type="atom" xmlUrl="http://www.calculate-linux.ru/packages/newset?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="utfyjqq" text="�овые пакеты Calculate" updateInterval="-1"/>
-            <outline title="�ово�ти Calculate" description="�ово�ти Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/news" type="atom" xmlUrl="http://www.calculate-linux.ru/news.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="wypvblr" text="�ово�ти Calculate" updateInterval="-1"/>
-            <outline title="Задачи Calculate" description="Задачи Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/projects/calculatelinux/issues" type="atom" xmlUrl="http://www.calculate-linux.ru/projects/calculatelinux/issues.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="lvjfgrg" text="Задачи Calculate" updateInterval="-1"/>
-        </outline>
-        <outline title="Свободное программное обе�печение" expanded="true" description="Свободное программное обе�печение" viewMode="0" sortColumn="time" type="folder" id="wfprebg" text="Свободное программное обе�печение">
-            <outline title="Linuxoid - в�е что знаю о Тук�е" description="Linuxoid - в�е что знаю о Тук�е" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.tux.in.ua" type="rss" xmlUrl="http://feeds.feedburner.com/in/JEEz" id="pmuqwdn" text="Linuxoid - в�е что знаю о Тук�е" updateInterval="-1"/>
-        </outline>
-        <outline title="�епрочитанные" description="�епрочитанные" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="nnuxkke" matchType="any" text="�епрочитанные">
-            <outline additive="true" type="rule" value="" rule="unread" text="Стату� прочтени�"/>
-        </outline>
-        <outline title="Важные" description="Важные" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="tfpllyd" matchType="any" text="Важные">
-            <outline additive="true" type="rule" value="" rule="flagged" text="Важно�ть"/>
-        </outline>
-    </body>
-</opml>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
deleted file mode 100644
index e4cf131a7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(net-news/liferea)>=1.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
deleted file mode 100644
index 2d92faf15..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate name=feedlist.opml os_locale_language!=ru
-<?xml version='1.0'?>
-<opml version="1.0">
-    <head>
-        <title>Liferea Feed List Export</title>
-    </head>
-    <body>
-        <outline title="Calculate Linux" expanded="true" description="Calculate Linux" viewMode="0" sortColumn="time" type="folder" id="skdcerh" text="Calculate Linux">
-            <outline title="Planet Calculate" description="Planet Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/blogs/en" type="atom" xmlUrl="http://www.calculate-linux.org/blogs/en?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="xlpgexr" text="Planet Calculate" updateInterval="-1"/>
-            <outline title="Forums Calculate" description="Forums Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/en/projects/en/activity?show_messages=1" type="atom" xmlUrl="http://www.calculate-linux.org/en/projects/en/activity.atom?key=#-os_linux_shortname-##-os_linux_ver-#&amp;amp;show_messages=1" id="nusuife" text="Forums Calculate" updateInterval="-1"/>
-            <outline title="Gentoo Linux Security Advisories" description="Gentoo Linux Security Advisories" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/glsa" type="atom" xmlUrl="http://www.calculate-linux.org/glsa?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="xrcetus" text="Gentoo Linux Security Advisories" updateInterval="-1"/>
-            <outline title="New Packages Calculate" description="New Packages Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/packages/newset" type="atom" xmlUrl="http://www.calculate-linux.org/packages/newset?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="sctdowf" text="New Packages Calculate" updateInterval="-1"/>
-            <outline title="News Calculate" description="News Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/news" type="atom" xmlUrl="http://www.calculate-linux.org/news.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="xkramll" text="News Calculate" updateInterval="-1"/>
-            <outline title="Issues Calculate" description="Issues Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.org/projects/calculatelinux/issues" type="atom" xmlUrl="http://www.calculate-linux.org/projects/calculatelinux/issues.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="qtdynyw" text="Issues Calculate" updateInterval="-1"/>
-        </outline>
-        <outline title="Open Source" expanded="true" description="Open Source" viewMode="0" sortColumn="time" type="folder" id="qningnv" text="Open Source">
-            <outline title="LinuxTracker" description="LinuxTracker" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://linuxtracker.org" type="rss" xmlUrl="http://feeds.feedburner.com/Linuxtracker" id="pitxlwr" text="LinuxTracker" updateInterval="-1"/>
-            <outline title="DistroWatch.com: News" description="DistroWatch.com: News" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://distrowatch.com/" type="rss" xmlUrl="http://distrowatch.com/news/dw.xml" id="jjtbntf" text="DistroWatch.com: News" updateInterval="-1"/>
-        </outline>
-        <outline title="Unread" description="Unread" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="dfcbess" matchType="any" text="Unread">
-            <outline additive="true" type="rule" value="" rule="unread" text="Стату� прочтени�"/>
-        </outline>
-        <outline title="Important" description="Important" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="bocjqld" matchType="any" text="Important">
-            <outline additive="true" type="rule" value="" rule="flagged" text="Важно�ть"/>
-        </outline>
-    </body>
-</opml>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
deleted file mode 100644
index dddaf593c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate name=feedlist.opml os_locale_language==ru
-<?xml version='1.0'?>
-<opml version="1.0">
-    <head>
-        <title>Liferea Feed List Export</title>
-    </head>
-    <body>
-        <outline title="Calculate Linux" expanded="true" description="Calculate Linux" viewMode="0" sortColumn="time" type="folder" id="yytpavw" text="Calculate Linux">
-            <outline title="Планета Calculate" description="Планета Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/blogs/ru" type="atom" xmlUrl="http://www.calculate-linux.ru/blogs/ru?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="qfaepdt" text="Планета Calculate" updateInterval="-1"/>
-            <outline title="Форумы Calculate" description="Форумы Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/ru/projects/ru/activity?show_messages=1" type="atom" xmlUrl="http://www.calculate-linux.ru/ru/projects/ru/activity.atom?key=#-os_linux_shortname-##-os_linux_ver-#&amp;amp;show_messages=1" id="alawxja" text="Форумы Calculate" updateInterval="-1"/>
-            <outline title="Уведомлени� о безопа�но�ти GLSA" description="Уведомлени� о безопа�но�ти GLSA" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/glsa" type="atom" xmlUrl="http://www.calculate-linux.ru/glsa?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="ajoknip" text="Уведомлени� о безопа�но�ти GLSA" updateInterval="-1"/>
-            <outline title="�овые пакеты Calculate" description="�овые пакеты Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/packages/newset" type="atom" xmlUrl="http://www.calculate-linux.ru/packages/newset?format=atom&amp;amp;key=#-os_linux_shortname-##-os_linux_ver-#" id="utfyjqq" text="�овые пакеты Calculate" updateInterval="-1"/>
-            <outline title="�ово�ти Calculate" description="�ово�ти Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/news" type="atom" xmlUrl="http://www.calculate-linux.ru/news.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="wypvblr" text="�ово�ти Calculate" updateInterval="-1"/>
-            <outline title="Задачи Calculate" description="Задачи Calculate" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.calculate-linux.ru/projects/calculatelinux/issues" type="atom" xmlUrl="http://www.calculate-linux.ru/projects/calculatelinux/issues.atom?key=#-os_linux_shortname-##-os_linux_ver-#" id="lvjfgrg" text="Задачи Calculate" updateInterval="-1"/>
-        </outline>
-        <outline title="Свободное программное обе�печение" expanded="true" description="Свободное программное обе�печение" viewMode="0" sortColumn="time" type="folder" id="wfprebg" text="Свободное программное обе�печение">
-            <outline title="Linuxoid - в�е что знаю о Тук�е" description="Linuxoid - в�е что знаю о Тук�е" viewMode="0" sortColumn="time" collapsed="true" htmlUrl="http://www.tux.in.ua" type="rss" xmlUrl="http://feeds.feedburner.com/in/JEEz" id="pmuqwdn" text="Linuxoid - в�е что знаю о Тук�е" updateInterval="-1"/>
-        </outline>
-        <outline title="�епрочитанные" description="�епрочитанные" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="nnuxkke" matchType="any" text="�епрочитанные">
-            <outline additive="true" type="rule" value="" rule="unread" text="Стату� прочтени�"/>
-        </outline>
-        <outline title="Важные" description="Важные" viewMode="0" sortColumn="time" collapsed="true" type="vfolder" id="tfpllyd" matchType="any" text="Важные">
-            <outline additive="true" type="rule" value="" rule="flagged" text="Важно�ть"/>
-        </outline>
-    </body>
-</opml>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
deleted file mode 100644
index b8f5bf043..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.deluge)!=off&&ini(ver.deluge)==&&pkg()>=1.2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
deleted file mode 100644
index d053b544f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate path=~/.config/deluge
-{
-  "file": 1, 
-  "format": 1
-}{
-  "move_completed_path": "#-ini(resource.downloads,,unicode)-#",
-  "download_location": "#-ini(resource.downloads,,unicode)-#/deluge",
-  "torrentfiles_location": "#-ini(resource.downloads,,unicode)-#/deluge/torrents",
-  "move_completed": true,
-  "copy_torrent_file": true,
-  "new_release_check": false
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
deleted file mode 100644
index f54a65de2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate path=~/.config/deluge
-{
-  "file": 1, 
-  "format": 1
-}{
-  "close_to_tray": true,
-  "show_new_releases": false,
-  "show_rate_in_title": false
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
deleted file mode 100644
index dee6325a7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-deluge = 1.2
-
-[update]
-deluge = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
deleted file mode 100644
index e54ea5a7c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.eiskaltdcpp)!=off&&ini(ver.eiskaltdcpp)==&&pkg()>=2.1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
deleted file mode 100644
index f6f3102e0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate path=~/.config/eiskaltdc++
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<DCPlusPlus>
-        <Settings>
-                <DownloadDirectory type="string">#-ini(resource.downloads)-#/</DownloadDirectory>
-                <TempDownloadDirectory type="string">#-ini(resource.downloads)-#/eiskaltdc++/Incomplete/</TempDownloadDirectory>
-        </Settings>
-        <Share/>
-</DCPlusPlus>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
deleted file mode 100644
index d2834846f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde path=~/.config/eiskaltdc++
-[General]
-app-theme-icons=default
-mainwindow-use-multi-line-tabbar=1
-systemtray-enabled=1
-tools-panel-visible=1
-main-menu-visible=1
-translation-file=/usr/share/eiskaltdcpp/qt/ts/#-os_locale_language-#.qm
-app-aspell-lang=#-os_locale_lang-#
-
-[app]
-firstrun=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
deleted file mode 100644
index be2fe9be2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-eiskaltdcpp = 2.3
-
-[update]
-eiskaltdcpp = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
deleted file mode 100644
index 562f48662..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-transmission = 1.8
-
-[update]
-transmission = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
deleted file mode 100644
index f947de674..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.transmission)!=off&&ini(ver.transmission)==&&pkg()>=1.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
deleted file mode 100644
index cacee2912..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "show-notification-area-icon": true, 
-    "user-has-given-informed-consent": true, 
-    "watch-dir-enabled": false
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
deleted file mode 100644
index 78f5a8c42..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.config/chromium)==&&ini(update.chromium)!=off&&ini(ver.chromium)==&&pkg()>=41
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
deleted file mode 100644
index 28419f924..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.config/chromium
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
deleted file mode 100644
index 8ecd17bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
+++ /dev/null
@@ -1,63 +0,0 @@
-# Calculate os_locale_language!=ru name=Bookmarks
-{
-   "roots": {
-      "bookmark_bar": {
-         "children": [{
-            "name": "Home",
-            "type": "url",
-            "url": "http://www.calculate-linux.org"
-         },
-         {
-            "name": "Docs",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/main/en"
-         },
-         {
-            "name": "Forums",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/projects/en/boards"
-         },
-         {
-            "name": "Lists",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/main/en/maillist"
-         },
-         {
-            "name": "Bugs",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/projects/calculatelinux/issues"
-         },
-         {
-            "name": "Blogs",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/blogs/en"
-         }],
-         "type": "folder"
-      },
-      "other": {
-         "children": [
-         {
-            "name": "Calculate Linux | Facebook",
-            "type": "url",
-            "url": "https://www.facebook.com/CalculateLinux"
-         },
-         {
-            "name": "Calculate - LinuxQuestions.org",
-            "type": "url",
-            "url": "http://www.linuxquestions.org/questions/calculate-89/"
-         },
-         {
-            "name": "DistroWatch.com",
-            "type": "url",
-            "url": "http://distrowatch.com/calculate"
-         },
-         {
-            "name": "Gentoo Linux",
-            "type": "url",
-            "url": "http://www.gentoo.org/"
-         }],
-         "type": "folder"
-      }
-   },
-   "version": 1
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
deleted file mode 100644
index a8deeb81f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
+++ /dev/null
@@ -1,63 +0,0 @@
-# Calculate os_locale_language==ru name=Bookmarks
-{
-   "roots": {
-      "bookmark_bar": {
-         "children": [{
-            "name": "Домашн��",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru"
-         },
-         {
-            "name": "Документаци�",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/main/ru"
-         },
-         {
-            "name": "Форумы",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/projects/ru/boards"
-         },
-         {
-            "name": "Ра��ылка",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/main/ru/maillist"
-         },
-         {
-            "name": "Ошибки",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/projects/calculatelinux/issues"
-         },
-         {
-            "name": "Блоги",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/blogs/ru"
-         }],
-         "type": "folder"
-      },
-      "other": {
-         "children": [
-         {
-            "name": "DistroWatch.com",
-            "type": "url",
-            "url": "http://distrowatch.com/calculate"
-         },
-         {
-            "name": "Gentoo Linux",
-            "type": "url",
-            "url": "http://www.gentoo.ru/"
-         },
-         {
-            "name": "Lunuxoid",
-            "type": "url",
-            "url": "http://tux.in.ua"
-         },
-         {
-            "name": "ВКонтакте | Calculate Linux",
-            "type": "url",
-            "url": "https://vk.com/calculatelinux"
-         }],
-         "type": "folder"
-      }
-   },
-   "version": 1
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
deleted file mode 100644
index dc4c62b64..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
+++ /dev/null
@@ -1,115 +0,0 @@
-# Calculate
-{
-   "browser": {
-      "custom_chrome_frame": false,
-      "show_home_button": true
-   },
-   "bookmark_bar": {
-      "show_on_all_tabs": true
-   },
-   "local_discovery": {
-      "notifications_enabled": false
-   },
-#?os_locale_language!=ru#
-   "homepage": "http://start.calculate-linux.org",
-#os_locale_language#
-#?os_locale_language==ru#
-   "homepage": "http://start.calculate-linux.ru",
-#os_locale_language#
-   "homepage_is_newtabpage": false,
-
-   "extensions": {
-      "theme": {
-         "id": "",
-         "use_system": true
-      },
-      "settings": {
-#?pkg(www-plugins/chrome-ublock)!=#
-         "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
-            "active_permissions": {
-               "api": [ "contextMenus", "privacy", "storage", "tabs", "unlimitedStorage", "webNavigation", "webRequest", "webRequestBlocking" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "manifest_permissions": [  ],
-               "scriptable_host": [ "http://*/*", "https://*.adblockplus.me/*", "https://*.adblockplus.org/*", "https://*/*", "https://www.fanboy.co.nz/*" ]
-            },
-            "commands": {
-
-            },
-            "content_settings": [  ],
-            "creation_flags": 9,
-            "events": [  ],
-            "from_bookmark": false,
-            "from_webstore": true,
-            "granted_permissions": {
-               "api": [ "contextMenus", "privacy", "storage", "tabs", "unlimitedStorage", "webNavigation", "webRequest", "webRequestBlocking" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "manifest_permissions": [  ],
-               "scriptable_host": [ "http://*/*", "https://*.adblockplus.me/*", "https://*.adblockplus.org/*", "https://*/*", "https://www.fanboy.co.nz/*" ]
-            },
-            "incognito_content_settings": [  ],
-            "incognito_preferences": {
-
-            },
-            "initial_keybindings_set": true,
-            "install_time": "13071093075966601",
-            "location": 1,
-            "manifest": {
-               "author": "The uBlock Development Team",
-               "background": {
-                  "page": "background.html"
-               },
-               "browser_action": {
-                  "default_icon": {
-                     "19": "img/browsericons/icon19-off.png",
-                     "38": "img/browsericons/icon38-off.png"
-                  },
-                  "default_popup": "popup.html",
-                  "default_title": "uBlock"
-               },
-               "content_scripts": [ {
-                  "all_frames": true,
-                  "js": [ "js/vapi-client.js", "js/contentscript-start.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_start"
-               }, {
-                  "all_frames": true,
-                  "js": [ "js/contentscript-end.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_end"
-               }, {
-                  "js": [ "js/subscriber.js" ],
-                  "matches": [ "https://*.adblockplus.org/*", "https://*.adblockplus.me/*", "https://www.fanboy.co.nz/*" ],
-                  "run_at": "document_idle"
-               } ],
-               "default_locale": "en",
-               "icons": {
-                  "128": "img/icon_128.png",
-                  "16": "img/icon_16.png"
-               },
-               "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmJNzUNVjS6Q1qe0NRqpmfX/oSJdgauSZNdfeb5RV1Hji21vX0TivpP5gq0fadwmvmVCtUpOaNUopgejiUFm/iKHPs0o3x7hyKk/eX0t2QT3OZGdXkPiYpTEC0f0p86SQaLoA2eHaOG4uCGi7sxLJmAXc6IsxGKVklh7cCoLUgWEMnj8ZNG2Y8UKG3gBdrpES5hk7QyFDMraO79NmSlWRNgoJHX6XRoY66oYThFQad8KL8q3pf3Oe8uBLKywohU0ZrDPViWHIszXoE9HEvPTFAbHZ1umINni4W/YVs+fhqHtzRJcaKJtsTaYy+cholu5mAYeTZqtHf6bcwJ8t9i2afwIDAQAB",
-               "manifest_version": 2,
-               "minimum_chrome_version": "22.0",
-               "name": "uBlock",
-               "options_page": "dashboard.html",
-               "options_ui": {
-                  "page": "options_ui.html"
-               },
-               "permissions": [ "contextMenus", "storage", "tabs", "unlimitedStorage", "webNavigation", "webRequest", "webRequestBlocking", "http://*/*", "https://*/*" ],
-               "update_url": "https://clients2.google.com/service/update2/crx",
-               "version": "0.9.8.2"
-            },
-            "path": "cjpalhdlnbpafiamejdnhcphjbkeiagm/0.9.8.2_0",
-            "preferences": {
-
-            },
-            "regular_only_preferences": {
-
-            },
-            "state": 1,
-            "was_installed_by_default": false,
-            "was_installed_by_oem": false
-         }
-#pkg#
-      }
-   }
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
deleted file mode 100644
index e6b2aec13..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate pkg(www-plugins/chrome-ublock)!= exec=/bin/bash
-
-mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm
-cp -r /usr/share/chrome-ublock/* #-ur_home_path-#/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm
-chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
deleted file mode 100644
index 68295c177..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run	
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.config/chromium 
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
deleted file mode 100644
index 28861400e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-chromium = 41
-
-[update]
-chromium = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.calculate/ini.env
deleted file mode 100644
index 3a94e6139..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-chromium = 6.0
-
-[update]
-chromium = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.calculate_directory
deleted file mode 100644
index 233d89cfe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.config/chromium)==&&ini(update.chromium)!=off&&ini(ver.chromium)==&&pkg()>=6.0&&pkg()<41
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Bookmarks.en b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Bookmarks.en
deleted file mode 100644
index ea21e90ad..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Bookmarks.en
+++ /dev/null
@@ -1,68 +0,0 @@
-# Calculate os_locale_language!=ru name=Bookmarks
-{
-   "roots": {
-      "bookmark_bar": {
-         "children": [{
-            "name": "Home",
-            "type": "url",
-            "url": "http://www.calculate-linux.org"
-         },
-         {
-            "name": "Docs",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/main/en"
-         },
-         {
-            "name": "Forums",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/projects/en/boards"
-         },
-         {
-            "name": "Lists",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/main/en/maillist"
-         },
-         {
-            "name": "Bugs",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/projects/calculatelinux/issues"
-         },
-         {
-            "name": "Blogs",
-            "type": "url",
-            "url": "http://www.calculate-linux.org/blogs/en"
-         }],
-         "type": "folder"
-      },
-      "other": {
-         "children": [
-         {
-            "name": "Calculate Linux | Facebook",
-            "type": "url",
-            "url": "http://www.facebook.com/group.php?gid=97309000613"
-         },
-         {
-            "name": "Calculate - LinuxQuestions.org",
-            "type": "url",
-            "url": "http://www.linuxquestions.org/questions/calculate-89/"
-         },
-         {
-            "name": "DistroWatch.com",
-            "type": "url",
-            "url": "http://distrowatch.com/"
-         },
-         {
-            "name": "Gentoo Linux",
-            "type": "url",
-            "url": "http://www.gentoo.org/"
-         },
-         {
-            "name": "LinuxTracker",
-            "type": "url",
-            "url": "http://linuxtracker.org/"
-         }],
-         "type": "folder"
-      }
-   },
-   "version": 1
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Bookmarks.ru b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Bookmarks.ru
deleted file mode 100644
index 9b94ce281..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Bookmarks.ru
+++ /dev/null
@@ -1,63 +0,0 @@
-# Calculate os_locale_language==ru name=Bookmarks
-{
-   "roots": {
-      "bookmark_bar": {
-         "children": [{
-            "name": "Домашн��",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru"
-         },
-         {
-            "name": "Документаци�",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/main/ru"
-         },
-         {
-            "name": "Форумы",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/projects/ru/boards"
-         },
-         {
-            "name": "Ра��ылка",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/main/ru/maillist"
-         },
-         {
-            "name": "Ошибки",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/projects/calculatelinux/issues"
-         },
-         {
-            "name": "Блоги",
-            "type": "url",
-            "url": "http://www.calculate-linux.ru/blogs/ru"
-         }],
-         "type": "folder"
-      },
-      "other": {
-         "children": [
-         {
-            "name": "DistroWatch.com",
-            "type": "url",
-            "url": "http://distrowatch.com/"
-         },
-         {
-            "name": "Gentoo Linux",
-            "type": "url",
-            "url": "http://www.gentoo.ru/"
-         },
-         {
-            "name": "Lunuxoid",
-            "type": "url",
-            "url": "http://tux.in.ua"
-         },
-         {
-            "name": "В Контакте | Calculate Linux",
-            "type": "url",
-            "url": "http://vkontakte.ru/club10221243"
-         }],
-         "type": "folder"
-      }
-   },
-   "version": 1
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
deleted file mode 100644
index df4f5b633..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate pkg(www-apps/chromium-adblock)!= exec=/bin/bash
-
-cp -r /usr/share/chromium-adblock/gighmmpiobklfepjocnamgkkbiglidom #-ur_home_path-#/.config/chromium/Default/Extensions/
-chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/gighmmpiobklfepjocnamgkkbiglidom &>/dev/null
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak
deleted file mode 100644
index 8c5f9e85f..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA
deleted file mode 100644
index e58e2d2f5..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA
deleted file mode 100644
index c0e1abc48..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA
deleted file mode 100644
index 74e359aa8..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA
deleted file mode 100644
index 7b191b6b7..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json
deleted file mode 100644
index be9395451..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB",
-   "name": "Minimal",
-   "theme": {
-      "colors": {
-         "bookmark_text": [ 149, 149, 149 ],
-         "frame": [ 255, 255, 255 ],
-         "ntp_background": [ 255, 255, 255 ],
-         "ntp_link": [ 170, 170, 170 ],
-         "ntp_section": [ 235, 235, 235, 1 ],
-         "ntp_section_link": [ 149, 149, 149 ],
-         "ntp_section_text": [ 149, 149, 149 ],
-         "ntp_text": [ 149, 149, 149 ],
-         "tab_background_text": [ 149, 149, 149 ],
-         "tab_text": [ 149, 149, 149 ],
-         "toolbar": [ 255, 255, 255 ]
-      },
-      "images": {
-         "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA",
-         "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA",
-         "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA",
-         "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA"
-      },
-      "properties": {
-
-      },
-      "tints": {
-         "buttons": [ 0.001, 0, 0.706 ]
-      }
-   },
-   "version": "1.0"
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/ublock-install.sh b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/ublock-install.sh
deleted file mode 100644
index 2f8619d5b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Extensions/ublock-install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate pkg(www-apps/chromium-ublock)!= exec=/bin/bash
-
-cp -r /usr/share/chromium-ublock/cjpalhdlnbpafiamejdnhcphjbkeiagm #-ur_home_path-#/.config/chromium/Default/Extensions/
-chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm &>/dev/null
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/History b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/History
deleted file mode 100644
index b667cddf7..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/History and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage
deleted file mode 100644
index 944f58f7f..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Preferences b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Preferences
deleted file mode 100644
index eea008eac..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Preferences
+++ /dev/null
@@ -1,204 +0,0 @@
-# Calculate pkg(www-apps/chromium-ublock)==
-{
-   "bookmark_bar": {
-      "show_on_all_tabs": true
-   },
-   "local_discovery": {
-      "notifications_enabled": false
-   },
-   "browser": {
-      "custom_chrome_frame": false,
-      "check_default_browser": false,
-      "enable_spellchecking": true,
-      "show_home_button": true
-   },
-   "extensions": {
-      "chrome_url_overrides": {
-         "bookmarks": [ "chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html" ]
-      },
-      "settings": {
-         "hnfhcmjkebafbfikmbkhdpbmfpfjgiog": {
-            "location": 1,
-            "manifest": {
-               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB",
-               "name": "Minimal",
-               "theme": {
-                  "colors": {
-                     "bookmark_text": [ 149, 149, 149 ],
-                     "frame": [ 255, 255, 255 ],
-                     "ntp_background": [ 255, 255, 255 ],
-                     "ntp_link": [ 170, 170, 170 ],
-                     "ntp_section": [ 235, 235, 235, 1 ],
-                     "ntp_section_link": [ 149, 149, 149 ],
-                     "ntp_section_text": [ 149, 149, 149 ],
-                     "ntp_text": [ 149, 149, 149 ],
-                     "tab_background_text": [ 149, 149, 149 ],
-                     "tab_text": [ 149, 149, 149 ],
-                     "toolbar": [ 255, 255, 255 ]
-                  },
-                  "images": {
-                     "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA",
-                     "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA",
-                     "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA",
-                     "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA"
-                  },
-                  "tints": {
-                     "buttons": [ 0.001, 0, 0.706 ]
-                  }
-               },
-               "version": "1.0"
-            },
-            "path": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0",
-            "state": 1
-#?pkg(www-apps/chromium-adblock)!=&&pkg(www-apps/chromium-adblock)<2.5.61#
-         },
-         "gighmmpiobklfepjocnamgkkbiglidom": {
-            "active_permissions": {
-               "api": [ "contextMenus", "idle", "tabs", "webRequest", "webRequestBlocking" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "scriptable_host": [ "*://*.hk-pub.com/forum/thread-*", "*://*.mail.live.com/*", "*://*.youtube.com/*", "http://*/*", "https://*/*" ]
-            },
-            "delayNetworkRequests": true,
-            "from_bookmark": false,
-            "from_webstore": true,
-            "granted_permissions": {
-               "api": [ "contextMenus", "idle", "tabs", "webRequest", "webRequestBlocking" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "scriptable_host": [ "*://*.hk-pub.com/forum/thread-*", "*://*.mail.live.com/*", "*://*.youtube.com/*", "http://*/*", "https://*/*" ]
-            },
-            "install_time": "12975930521854205",
-            "location": 1,
-            "manifest": {
-               "background_page": "background.html",
-               "browser_action": {
-                  "default_icon": "img/icon19.png",
-                  "default_title": "AdBlock",
-                  "popup": "button/popup.html"
-               },
-               "content_scripts": [ {
-                  "all_frames": true,
-                  "js": [ "port.js", "functions.js", "filtering/filteroptions.js", "filtering/filtertypes.js", "filtering/filterset.js", "adblock_start_common.js", "adblock_start.js", "adblock_start_new_style.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_start"
-               }, {
-                  "all_frames": true,
-                  "js": [ "bandaids.js" ],
-                  "matches": [ "*://*.mail.live.com/*", "*://*.hk-pub.com/forum/thread-*", "*://*.youtube.com/*" ],
-                  "run_at": "document_start"
-               }, {
-                  "all_frames": true,
-                  "js": [ "adblock.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_end"
-               }, {
-                  "all_frames": false,
-                  "js": [ "uiscripts/blacklisting/rightclick_hook.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_end"
-               } ],
-               "current_locale": "ru",
-               "default_locale": "en",
-               "description": "\u041D\u0430\u0438\u0431\u043E\u043B\u0435\u0435 \u043F\u043E\u043F\u0443\u043B\u044F\u0440\u043D\u043E\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0435 Chrome \u0441 \u0431\u043E\u043B\u0435\u0435 \u0447\u0435\u043C 2 \u043C\u0438\u043B\u043B\u0438\u043E\u043D\u0430\u043C\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439! \u0411\u043B\u043E\u043A\u0438\u0440\u0443\u0435\u0442 \u0440\u0435\u043A\u043B\u0430\u043C\u0443 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442\u0443.",
-               "icons": {
-                  "128": "img/icon128.png",
-                  "16": "img/icon16.png",
-                  "48": "img/icon48.png"
-               },
-               "incognito": "spanning",
-               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZWWNkerYNFB0SIg87WwcrcniMYkCqxLz4OB3CLNoogUUsHN+Rk9vRB7o3Jjc4shlz2LBvAbtPbrGkU+NK9Hc3ubVydzpnoRDEl1RKz3GhqKFkECvTyAxrsKainXH+4Ni2+K7bg1U0tLoQMPJ9f3ieYLIwXeHh9+lYXQi6soq0pwIDAQAB",
-               "minimum_chrome_version": "6",
-               "name": "AdBlock",
-               "options_page": "options/index.html",
-               "permissions": [ "http://*/*", "https://*/*", "contextMenus", "tabs", "idle", "webRequest", "webRequestBlocking" ],
-               "update_url": "http://clients2.google.com/service/update2/crx",
-               "version": "#-pkg(www-apps/chromium-adblock)-#"
-            },
-            "path": "gighmmpiobklfepjocnamgkkbiglidom/#-pkg(www-apps/chromium-adblock)-#_0",
-            "state": 1
-#pkg#
-#?pkg(www-apps/chromium-adblock)>=2.5.61#
-         },
-         "gighmmpiobklfepjocnamgkkbiglidom": {
-            "active_permissions": {
-               "api": [ "contextMenus", "idle", "tabs", "webNavigation", "webRequest", "webRequestBlocking", "webRequestInternal" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "scriptable_host": [ "*://*.mail.live.com/*", "*://*.mastertoons.com/*", "http://*/*", "https://*/*" ]
-            },
-            "creation_flags": 9,
-            "from_bookmark": false,
-            "from_webstore": true,
-            "granted_permissions": {
-               "api": [ "contextMenus", "idle", "tabs", "webNavigation", "webRequest", "webRequestBlocking", "webRequestInternal" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "scriptable_host": [ "*://*.mail.live.com/*", "*://*.mastertoons.com/*", "http://*/*", "https://*/*" ]
-            },
-            "install_time": "13010568742462070",
-            "location": 1,
-            "manifest": {
-               "background": {
-                  "scripts": [ "jquery/jquery.min.js", "port.js", "functions.js", "stats.js", "filtering/domainset.js", "filtering/filteroptions.js", "filtering/fifocache.js", "filtering/filtertypes.js", "filtering/filterset.js", "filtering/myfilters.js", "filtering/filternormalizer.js", "idlehandler.js", "background.js" ]
-               },
-               "browser_action": {
-                  "default_icon": {
-                     "19": "img/icon19.png",
-                     "38": "img/icon38.png"
-                  },
-                  "default_popup": "button/popup.html",
-                  "default_title": "AdBlock"
-               },
-               "content_scripts": [ {
-                  "all_frames": true,
-                  "js": [ "port.js", "functions.js", "filtering/filteroptions.js", "adblock_start_common.js", "adblock_start_chrome.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_start"
-               }, {
-                  "all_frames": true,
-                  "js": [ "bandaids.js" ],
-                  "matches": [ "*://*.mail.live.com/*", "*://*.mastertoons.com/*" ],
-                  "run_at": "document_start"
-               }, {
-                  "all_frames": false,
-                  "js": [ "uiscripts/blacklisting/rightclick_hook.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_end"
-               } ],
-               "content_security_policy": "default-src 'self'; style-src 'self' 'unsafe-inline'; connect-src *; frame-src 'self' https://chromeadblock.com",
-               "current_locale": "ru",
-               "default_locale": "en",
-               "description": "\u041D\u0430\u0438\u0431\u043E\u043B\u0435\u0435 \u043F\u043E\u043F\u0443\u043B\u044F\u0440\u043D\u043E\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0435 Chrome \u0441 \u0431\u043E\u043B\u0435\u0435 \u0447\u0435\u043C 10 \u043C\u0438\u043B\u043B\u0438\u043E\u043D\u0430\u043C\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439! \u0411\u043B\u043E\u043A\u0438\u0440\u0443\u0435\u0442 \u0440\u0435\u043A\u043B\u0430\u043C\u0443 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442\u0443.",
-               "icons": {
-                  "128": "img/icon128.png",
-                  "16": "img/icon16.png",
-                  "48": "img/icon48.png"
-               },
-               "incognito": "spanning",
-               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZWWNkerYNFB0SIg87WwcrcniMYkCqxLz4OB3CLNoogUUsHN+Rk9vRB7o3Jjc4shlz2LBvAbtPbrGkU+NK9Hc3ubVydzpnoRDEl1RKz3GhqKFkECvTyAxrsKainXH+4Ni2+K7bg1U0tLoQMPJ9f3ieYLIwXeHh9+lYXQi6soq0pwIDAQAB",
-               "manifest_version": 2,
-               "minimum_chrome_version": "23",
-               "name": "AdBlock",
-               "options_page": "options/index.html",
-               "permissions": [ "http://*/*", "https://*/*", "contextMenus", "tabs", "idle", "webRequest", "webRequestBlocking", "webNavigation" ],
-               "update_url": "http://clients2.google.com/service/update2/crx",
-               "version": "2.5.61",
-               "web_accessible_resources": [ "img/icon24.png", "jquery/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png", "jquery/css/images/ui-icons_056b93_256x240.png", "jquery/css/images/ui-icons_d8e7f3_256x240.png", "jquery/css/jquery-ui.custom.css", "jquery/css/override-page.css" ]
-            },
-            "path": "gighmmpiobklfepjocnamgkkbiglidom/#-pkg(www-apps/chromium-adblock)-#_0",
-            "state": 1,
-            "was_installed_by_default": false
-#pkg#
-         }
-      },
-      "theme": {
-         "id": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog",
-         "pack": "/home/#-ur_login-#/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0_0/Cached Theme.pak",
-         "use_system": false
-      }
-   },
-#?os_locale_language==ru#
-   "homepage": "http://start.calculate-linux.ru/",
-#os_locale_language#
-#?os_locale_language!=ru#
-   "homepage": "http://start.calculate-linux.org/",
-#os_locale_language#
-   "homepage_is_newtabpage": false
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Preferences.ublock b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Preferences.ublock
deleted file mode 100644
index e4ac2611a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Preferences.ublock
+++ /dev/null
@@ -1,149 +0,0 @@
-# Calculate pkg(www-apps/chromium-ublock)!= name=Preferences
-{
-   "bookmark_bar": {
-      "show_on_all_tabs": true
-   },
-   "local_discovery": {
-      "notifications_enabled": false
-   },
-   "browser": {
-      "custom_chrome_frame": false,
-      "check_default_browser": false,
-      "custom_chrome_frame": false,
-      "enable_spellchecking": true,
-      "show_home_button": true
-   },
-   "extensions": {
-      "chrome_url_overrides": {
-         "bookmarks": [ "chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html" ]
-      },
-      "settings": {
-         "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
-            "active_permissions": {
-               "api": [ "contextMenus", "storage", "tabs", "unlimitedStorage", "webNavigation", "webRequest", "webRequestBlocking" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "manifest_permissions": [  ],
-               "scriptable_host": [ "http://*/*", "https://*/*" ]
-            },
-            "commands": {
-
-            },
-            "content_settings": [  ],
-            "creation_flags": 9,
-            "events": [  ],
-            "from_bookmark": false,
-            "from_webstore": true,
-            "granted_permissions": {
-               "api": [ "contextMenus", "storage", "tabs", "unlimitedStorage", "webNavigation", "webRequest", "webRequestBlocking" ],
-               "explicit_host": [ "http://*/*", "https://*/*" ],
-               "manifest_permissions": [  ],
-               "scriptable_host": [ "http://*/*", "https://*/*" ]
-            },
-            "incognito_content_settings": [  ],
-            "incognito_preferences": {
-
-            },
-            "initial_keybindings_set": true,
-            "install_time": "13066748498181957",
-            "location": 1,
-            "manifest": {
-               "author": "Raymond Hill",
-               "background": {
-                  "page": "background.html"
-               },
-               "browser_action": {
-                  "default_icon": {
-                     "19": "img/browsericons/icon19-off.png",
-                     "38": "img/browsericons/icon38-off.png"
-                  },
-                  "default_popup": "popup.html",
-                  "default_title": "µBlock"
-               },
-               "content_scripts": [ {
-                  "all_frames": true,
-                  "js": [ "js/vapi-client.js", "js/contentscript-start.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_start"
-               }, {
-                  "all_frames": true,
-                  "js": [ "js/contentscript-end.js" ],
-                  "matches": [ "http://*/*", "https://*/*" ],
-                  "run_at": "document_end"
-               } ],
-               "current_locale": "ru",
-               "default_locale": "en",
-               "description": "�аконец-то, �ффективный блокировщик дл� браузеров, не нагружающий ЦП и оперативную пам�ть.",
-               "icons": {
-                  "128": "img/icon_128.png",
-                  "16": "img/icon_16.png"
-               },
-               "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmJNzUNVjS6Q1qe0NRqpmfX/oSJdgauSZNdfeb5RV1Hji21vX0TivpP5gq0fadwmvmVCtUpOaNUopgejiUFm/iKHPs0o3x7hyKk/eX0t2QT3OZGdXkPiYpTEC0f0p86SQaLoA2eHaOG4uCGi7sxLJmAXc6IsxGKVklh7cCoLUgWEMnj8ZNG2Y8UKG3gBdrpES5hk7QyFDMraO79NmSlWRNgoJHX6XRoY66oYThFQad8KL8q3pf3Oe8uBLKywohU0ZrDPViWHIszXoE9HEvPTFAbHZ1umINni4W/YVs+fhqHtzRJcaKJtsTaYy+cholu5mAYeTZqtHf6bcwJ8t9i2afwIDAQAB",
-               "manifest_version": 2,
-               "minimum_chrome_version": "22.0",
-               "name": "µBlock",
-               "options_page": "dashboard.html",
-               "permissions": [ "contextMenus", "storage", "tabs", "unlimitedStorage", "webNavigation", "webRequest", "webRequestBlocking", "http://*/*", "https://*/*" ],
-               "update_url": "https://clients2.google.com/service/update2/crx",
-               "version": "0.8.5.7"
-            },
-            "path": "cjpalhdlnbpafiamejdnhcphjbkeiagm/0.8.5.7_0",
-            "preferences": {
-
-            },
-            "regular_only_preferences": {
-
-            },
-            "state": 1,
-            "was_installed_by_default": false,
-            "was_installed_by_oem": false
-         },
-         "hnfhcmjkebafbfikmbkhdpbmfpfjgiog": {
-            "location": 1,
-            "manifest": {
-               "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB",
-               "name": "Minimal",
-               "theme": {
-                  "colors": {
-                     "bookmark_text": [ 149, 149, 149 ],
-                     "frame": [ 255, 255, 255 ],
-                     "ntp_background": [ 255, 255, 255 ],
-                     "ntp_link": [ 170, 170, 170 ],
-                     "ntp_section": [ 235, 235, 235, 1 ],
-                     "ntp_section_link": [ 149, 149, 149 ],
-                     "ntp_section_text": [ 149, 149, 149 ],
-                     "ntp_text": [ 149, 149, 149 ],
-                     "tab_background_text": [ 149, 149, 149 ],
-                     "tab_text": [ 149, 149, 149 ],
-                     "toolbar": [ 255, 255, 255 ]
-                  },
-                  "images": {
-                     "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA",
-                     "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA",
-                     "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA",
-                     "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA"
-                  },
-                  "tints": {
-                     "buttons": [ 0.001, 0, 0.706 ]
-                  }
-               },
-               "version": "1.0"
-            },
-            "path": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0",
-            "state": 1
-         }
-      },
-      "theme": {
-         "id": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog",
-         "pack": "/home/#-ur_login-#/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0_0/Cached Theme.pak",
-         "use_system": false
-      },
-      "toolbar": [ "cjpalhdlnbpafiamejdnhcphjbkeiagm" ]
-   },
-#?os_locale_language==ru#
-   "homepage": "http://start.calculate-linux.ru/",
-#os_locale_language#
-#?os_locale_language!=ru#
-   "homepage": "http://start.calculate-linux.org/",
-#os_locale_language#
-   "homepage_is_newtabpage": false
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Thumbnails b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Thumbnails
deleted file mode 100644
index 2cb2b4a2e..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/Default/Thumbnails and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/First Run b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/First Run
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/chromium-6.0/.config/chromium/First Run	
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
deleted file mode 100644
index 086194ef0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.config/epiphany)==&&ini(update.epiphany)!=off&&ini(ver.epiphany)==&&pkg()>=3.18
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
deleted file mode 100644
index a4f25a3fe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=dconf dconf=/org/gnome
-[epiphany]
-enable-smooth-scrolling=true
-keyword-search-url='https://google.com/search?q=%s'
-restore-session-policy='crashed'
-
-[epiphany/web]
-default-encoding='UTF-8'
-monospace-font='Droid Sans Mono Slashed 11'
-sans-serif-font='Droid Sans 11'
-serif-font='Droid Serif 11'
-use-gnome-fonts=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
deleted file mode 100644
index c563c181f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=samba path=~/.calculate
-[ver]
-epiphany = 3.18
-
-[update]
-epiphany = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.calculate/ini.env
deleted file mode 100644
index 502cd5c6c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-firefox = 10.0
-
-[update]
-firefox = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.calculate_directory
deleted file mode 100644
index 93c4a0f15..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(www-client/firefox-bin)!=&&ini(update.firefox)!=off&&ini(ver.firefox)==&&pkg(www-client/firefox-bin)>=10.0&&exists(~/.mozilla)==||merge(www-client/firefox)!=&&ini(update.firefox)!=off&&ini(ver.firefox)==&&pkg(www-client/firefox)>=10.0&&exists(~/.mozilla)==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory
deleted file mode 100644
index c63848121..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate pkg(www-plugins/adblock-mozilla-plugin)!=
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini
deleted file mode 100644
index 385f25769..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini
+++ /dev/null
@@ -1,504 +0,0 @@
-# Calculate name=patterns.ini os_locale_lang!=ru_RU
-# Adblock Plus preferences
-version=3
-
-[Subscription]
-url=https://easylist-downloads.adblockplus.org/easylist.txt
-title=EasyList (USA)
-lastDownload=1265716392
-downloadStatus=synchronize_ok
-lastModified=Tue, 09 Feb 2010 09:00:15 GMT
-expires=1266148392
-requiredVersion=1.1
-alternativeLocations=http://adblockplus.mozdev.org/easylist/easylist.txt;q=0.5,https://ares2.org/easylist/easylist.txt;q=1.0
-
-[Subscription filters]
-!
-! Rick752's EasyList - Global English ad blocking subscription
-! https://easylist.adblockplus.org/
-! License: http://creativecommons.org/licenses/by-sa/3.0/
-! Last modified:  9 Feb 2010 09:00 UTC
-! Expires: 5 days (updates automatically every 5 days)
-!
-! Please report unblocked ads or mistakenly blocked content:
-! Forum: http://forums.lanik.us/
-! E-Mail: ares2mail -at- gmail.com
-!
-!------------------------------------General ad blocking rules-------------------------------------!
-! *** easylist_general_block.txt ***
-.aspx?zoneid=*&task=
-.au/_ads/
-.au/ads/
-.ca/ads/
-.com/ads/
-.html?ad=
-.net/_ads/
-.net/ads/
-.nz/ads/
-.org/ads/
-.org/gads/
-.php?bannerid=
-.php?zoneid=*&loc=
-.swf?clicktag=
-.tv/ads/
-.uk/ads/
-.us/ads/
-.za/ads/
-/*;cue=pre;$object_subrequest
-/.adserv/*
-/468xads.
-/_media/ads/*
-/a8-ads/*
-/aamsz=*/acc_random=
-/aamsz=*/pageid=
-/aamsz=*/position=
-/abm.asp?z=
-/abmw.asp?z=
-/abmw.aspx
-/acc_random=*/aamsz=
-/ad-1.5.
-/ad-amz.
-/ad-box-single.
-/ad-cdn.
-/ad-frame.
-/ad-iframe-wrapper.
-/ad-inject/*
-/ad-leaderboard.
-/ad-loader-frame.
-/ad-server/*
-/ad-top-fr.
-/ad-topbanner-single.
-/ad-vertical-single.
-/ad.asp?
-/ad.aspx
-/ad.cgi?
-/ad.html
-/ad.jsp?
-/ad.mason?
-/ad.php?
-/ad.pl?z
-/ad/?id=
-/ad/adtech
-/ad/banner
-/ad/code
-/ad/common
-/ad/frame
-/ad/google
-/ad/header
-/ad/inad
-/ad/init
-/ad/lrec
-/ad/mercury
-/ad/mrec
-/ad/serve
-/ad/skyscraper
-/ad/sponsor
-/ad/text
-/ad/view
-/ad/wr.php
-/ad160.php
-/ad1x1home.
-/ad2.aspx
-/ad2.html
-/ad350.html
-/ad728.php
-/ad728x15.
-/ad?count=
-/ad_banner_left/*
-/ad_banner_right/*
-/ad_configuration.
-/ad_creatives.
-/ad_feed.js?
-/ad_forum_
-/ad_frame.
-/ad_functions.
-/ad_holder/*
-/ad_iframe.
-/ad_iframe_
-/ad_insert.
-/ad_js.php
-/ad_label_
-/ad_left.
-/ad_legend_h.
-/ad_manager.
-/ad_notice.
-/ad_page_frame.
-/ad_rectangle_
-/ad_refresher.
-/ad_reloader_
-/ad_right.
-/ad_serv.
-/ad_server.
-/ad_server/*
-/ad_sizes=
-/ad_sky.
-/ad_space.
-/ad_square.
-/ad_supertile/*
-/ad_tag_
-/ad_tile/*
-/ad_top.
-/ad_vert.
-/ad_view_
-/adbanner.
-/adbanner/*
-/adbanners/*
-/adbot_promos/*
-/adbox.gif
-/adbrite.
-/adbureau.
-/adchannel_
-/adclick.
-/adclient.
-/adclient/*
-/adcode.
-/adcodes/*
-/adconfig.js
-/adconfig.xml?
-/adconfig/*
-/adcontent.$~object_subrequest
-/adcreative.
-/adcycle/*
-/addyn/3.0/*
-/addyn|*|adtech;
-/adengage1.
-/adengage_
-/adengine/*
-/adexclude/*
-/adf.cgi?
-/adfarm.
-/adfetch?
-/adfetcher?
-/adfooter.
-/adframe.
-/adframe/*
-/adframe?
-/adframe_
-/adfshow?
-/adfunction.
-/adfunctions.
-/adgraphics/*
-/adguru.
-/adheader.
-/adhomepage.jsp
-/adhtml/*
-/adiframe.
-/adiframe/*
-/adimage.aspx
-/adimage.php?
-/adimages.
-/adimages/*
-/adindex/*
-/adinjector.
-/adinsert.
-/adinterax.
-/adjs.php?
-/adjsmp.php?
-/adlabel.
-/adlabel_
-/adlayer.php?
-/adlayer/*
-/adleader.
-/adlink.
-/adlink_
-/adlinks.
-/adm/ad/*
-/adman.js
-/adman/www/*
-/admanagement/*
-/admanagementadvanced.
-/admanager.$~object_subrequest
-/admanager/*$~object_subrequest
-/admanager3.
-/admanagerstatus/*
-/admaster.
-/admaster?
-/admedia.
-/adnetwork.
-/adng.html
-/adonline.
-/adpage.
-/adpeeps.
-/adpeeps/*
-/adplayer.
-/adplayer/*
-/adplugin.
-/adpoint.
-/adpopup.
-/adproducts/*
-/adproxy.
-/adproxy/*
-/adrelated.
-/adreload?
-/adremote.
-/adrevenue/*
-/adrevolver/*
-/adrolays.
-/adroot/*
-/adrot.js
-/adruptive.
-/ads-1.js
-/ads-2.js
-/ads-banner.
-/ads-leader|
-/ads-rec|
-/ads-service.
-/ads-sky|
-/ads.dll/*
-/ads.htm
-/ads.php?
-/ads/acctid
-/ads/frame
-/ads/freewheel/*
-/ads/html
-/ads/java
-/ads/paid
-/ads/right
-/ads/text
-/ads/top
-/ads/www
-/ads2.php
-/ads2_2.
-/ads_iframe.
-/ads_php/*
-/ads_reporting/*
-/ads_v2.
-/ads_yahoo.
-/adsadclient31.
-/adsadview.
-/adsatt.
-/adsbanner.
-/adscluster.
-/adscontent2.
-/adscript.
-/adscripts/*
-/adsearch.
-/adsense.
-/adsense/*
-/adsense23.
-/adsense24.
-/adsense_
-/adserve/*
-/adserver.
-/adserver/*
-/adserver2.
-/adserver2/*
-/adserver?
-/adserver_
-/adservice|
-/adserving.
-/adsfac.
-/adsfolder/*
-/adshandler.
-/adsheader.
-/adshow?
-/adsiframe/*
-/adsimage/*
-/adsinclude.
-/adsinsert.
-/adsky.php
-/adslug_
-/adsmanagement/*
-/adsmanager/*
-/adsnew.
-/adsonar.
-/adspace.
-/adsponsor.
-/adspro/*
-/adsremote.
-/adsreporting/*
-/adssrv.
-/adstorage.
-/adstream.
-/adstream_nx.
-/adswap.
-/adswap/*
-/adsync/*
-/adsyndication.
-/adsystem/*
-/adtago.
-/adtags.
-/adtags/*
-/adtagtranslator.
-/adtech.
-/adtech/*
-/adtech;
-/adtech_
-/adtext.
-/adtext_
-/adtology.
-/adtop.js
-/adtrack/*
-/adtraff.
-/adtype.php?
-/adunit.
-/adunits/*
-/advert.
-/advert/*
-/advert?
-/advert_
-/advertise.
-/advertise/*
-/advertisement-
-/advertisement.
-/advertisement_
-/advertisements/*
-/advertisementview/*
-/advertising.
-/advertising/*
-/advertisingmanual.
-/advertize_on_
-/advertorials/*
-/advertpro/*
-/adverts.
-/adverts/*
-/adverts_
-/adview.
-/adviewer.
-/advision.
-/advt.gif
-/adworks.
-/adworks/*
-/adwrapper/*
-/adwrapperiframe.
-/aff_frame.
-/affad?q=
-/affads/*
-/affilatebanner.
-/affiliate*.php?
-/affiliate_banners/*
-/affiliatebanners/*
-/affiliates.*.aspx?
-/affiliates/banner
-/affiliatewiz/*
-/affiliationcash.
-/afimages.
-/afr.php?
-/ajax/ads/*
-/ajrotator/*
-/ajs.php?
-/ak/ads/*
-/annonser/*
-/api/ads/*
-/app/ads.js
-/article_ad.
-/aseadnshow.
-/audioads/*
-/auto_ad_change.
-/ban_m.php?
-/banimpress.
-/banman.asp?
-/banman/*
-/banner/affiliate/*
-/banner_ad.
-/banner_ad_
-/banner_ads.
-/banner_ads_
-/banner_control.php?
-/banner_db.php?
-/banner_file.php?
-/banner_js.*?
-/banner_management/*
-/banner_skyscraper.
-/bannerad.
-/bannerads-
-/banneradviva.
-/bannercode.php
-/bannerfarm/*
-/bannerframe.*?
-/bannermanager/*
-/bannermedia/*
-/bannerrotation.
-/banners.*&iframe=
-/banners/affiliate/*
-/banners_rotation.
-/bannerscript/*
-/bannerserver/*
-/bannersyndication.
-/bannerview.*?
-/bannery/*?banner=
-/baselinead.
-/behaviorads/*
-/bigboxad.
-/bkgrndads/*
-/blogad_
-/blogads.
-/blogads3/*
-/bmndoubleclickad.
-/bnrsrv.*?
-/boomad.
-/bottomad/*
-/br_ad_courier.
-/butler.php?type=
-/buttonads.
-/buyclicks/*
-/bw_adsys.
-/bytemark_ad.
-/cashad.
-/cashad2.
-/central/ads/*
-/cgi-bin/ads/*
-/chitika-ad?
-/circads.
-/cnnslads.
-/commercial_top.
-/commercials/*
-/common/ad/*
-/common/ads/*
-/contentad|
-/contextad.
-/controller/ads/*
-/corner_ads/*
-/cpxads.
-/ctamlive160x160.
-/customad.
-/cvs/ads/*
-/dart_ads/*
-/dartads.
-/dc_ads.
-/dcloadads/*
-/deliver.nmi?
-/deliverad/*
-/deliverjs.nmi?
-/delivery/ag.php
-/descpopup.js
-/direct_ads.
-/directads.
-/displayad.
-/displayads/*
-/dj_ad.js
-/dne_ad.
-/dnsads.html?
-/doubleclick.phpi?
-/doubleclick/iframe.
-/doubleclickcontainer.
-/doubleclicktag.
-/drawad.php?
-/dsg/bnn/*
-/dt.cms.ad.page.
-/dyn_banner.
-/dyn_banners_
-/dynamicad?
-/dynamiccsad?
-/dynbanner/flash/*
-/ebay_ads/*
-/emailads/*
-/external/ad.js
-/eyewondermanagement.
-/fatads.
-/featuredadshome.
-/files/ads/*
-/fimserve.
-/flash/ads/*
-/flashads.
-/flashads/*
-/footad-
-/footer_ad_include.
-/fuseads/*
-/gamersad.
-/get-ad.php?
-/get_ad.php?
-/get_player_ads_
-/getad.php?
-/getad.php|
-/getad?n=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini
deleted file mode 100644
index 30f1ad775..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini
+++ /dev/null
@@ -1,504 +0,0 @@
-# Calculate name=patterns.ini os_locale_lang==ru_RU
-# Adblock Plus preferences
-version=3
-
-[Subscription]
-url=https://easylist-downloads.adblockplus.org/morpeh+easylist.txt
-title=Morpeh Rus List (Ро��и�) + EasyList
-lastDownload=1265715958
-downloadStatus=synchronize_ok
-lastModified=Tue, 09 Feb 2010 09:00:13 GMT
-expires=1266147958
-requiredVersion=1.1
-alternativeLocations=http://adblockplus.mozdev.org/easylist/morpeh+easylist.txt;q=0.5,https://ares2.org/easylist/morpeh+easylist.txt;q=1.0
-
-[Subscription filters]
-! NOTE: This file is a combination of multiple subscriptions
-! Last modified:  9 Feb 2010 09:00 UTC
-!
-! *** Fetched from: http://adblockplus.mihalkin.ru/Russia.txt ***
-! Fanboy's Russia-addon Adblock list
-! License: http://creativecommons.org/licenses/by/3.0/
-! Subscription founders: Mihalkin Aleksander, Aleksey Solohin
-! Contact: mp3geek@gmail.com  http://fanboy.co.nz/adblock
-!
-! version 1.650 16.01.2010
-! Expires after 3 days
-!
-! White filters
-!
-@@acid3.acidtests.org/
-@@forum.antichat.ru/antichat/pic/*
-@@kanicq.ru/invisible/jquery.js
-@@http://www.overclockers.ru/images/news/*/*.jpg
-@@http://overclockers.ru/images/lab/*/*.jpg
-@@people.overclockers.ru/
-@@http://www.slo.ru/screenshots/*
-@@zaycev.net/m3_images/i/
-@@zaycev.net/m3_images/mp3player.swf?*
-@@*.rbcdaily.ru/jslib/
-@@http://rs.mail.ru/b*.jpg
-@@http://pics.rbc.ru/img/skin/
-@@|http://static.europe.own3d.tv/player/flowplayer.swf
-@@|http://static.liverail.com/libas3/*
-@@http://0lik.ru/uploads/posts/
-@@|http://spi.domainsponsor.com/css/*
-@@|http://spi.domainsponsor.com/images/*
-@@|http://spi.domainsponsor.com/favicon/*
-!
-! The basic list of expressions (strict filters are not present)
-!
-.sovsport.ru/banner-item/
-.sovsport.ru/ib
-*.bannerbank.ru/bb.cgi?*
-*.banners.mail.ru/*/*
-*.business.lbn.ru/cgi-bin/iframe/*
-*.cash4ru.net/*
-*.pop-bazar.ru/*
-*.realcoding.net/adv/
-*.takru.com/*
-*.the-people-group.com/*
-*.tt-i.ru/*.gif
-*.utro.ru/cgi-bin/iframe/*
-*.xbn.ru
-*xuk.ru/dev/*
-*xuk.ru/img/*/*
-24new.ru^
-bodyclick.net^
-eropop.ru/*
-forum.zloy.org/streez/*
-goldtraf.su^
-http:/*.luxup.ru/images/i/*
-http:/*.ngs.ru/*/*.gif
-http://*.abnad.net
-http://*.adfun.ru/*
-http://*.adv.vz.ru/*
-http://*.advmaker.ru/*
-http://*.begun.ru/*
-http://*.kavanga.ru/3756/prepareCode?*
-http://*.media.lbn.ru//cgi-bin/banner/*
-http://*.muhe.biz/*
-http://*.popup2m.com/*
-http://*.redtram.com/*
-http://*.top.hsdn.org/counter?*
-http://*.topcto.ru/cgi-bin/top.cgi?uid=*
-http://*.traf.spb.ru/*
-http://*.ucoz.ru/stat/*
-http://*.wmlink.ru/*
-http://*popunder.ru/*.php?id=$script
-http://0lik.ru/*
-http://100.smi.ru/cgi-bin/banner/*
-http://1adult.ru/*
-http://1ha.ad.md/cgi-bin/*
-http://1pop.ru/*
-http://1se.ru/*
-http://1traff.ru/*
-http://1under.ru/
-http://217.16.18.163/*
-http://217.16.18.213
-http://217.16.18.214
-http://217.16.28.104/*
-http://217.170.78.4
-http://217.170.78.7
-http://24s.ru/get.php?b=*
-http://28cm.ru/tmp/reklama/*
-http://2advert.net/*
-http://2da2.ru
-http://2krota.ru/rekla/*
-http://2pay.ru/gif/terminal.swf?link=*
-http://2vk.ru/skaski/banners2/*
-http://2x2.kz/cgi-bin/*
-http://386.by.ru/r/*
-http://3d.arxua.com/design/*468*60.gif
-http://468.lbe.ru/cgi-bin/banner/salex?*
-http://468.mb.auto.ru/cgi-bin/*
-http://468.vologdainfo.ru/*
-http://495ru.ru/*
-http://4dle.ru/*468x60.swf
-http://4ertik.ru
-http://62.105.135.100/images/default/default/adv/*
-http://77.91.228.66
-http://80.93.49.192/*
-http://80.93.56.187/*
-http://81.222.128.112/*
-http://81.222.128.113/*
-http://83.222.31.194/in.cgi?*
-http://85.21.193.204/adimage.php?*
-http://87.242.91.22/*
-http://87.242.91.23/*
-http://87.242.91.24/*
-http://87.242.91.25/*
-http://87.242.91.5/*
-http://88.208.22.84/*
-http://89.108.72.16/*
-http://90.156.144.98/_images/*
-http://90.189.192.208/banners/*
-http://99z.ru/*/*
-http://9months.ru/banners/
-http://a.abnad.net/iframe/*
-http://a.kavanga.ru/*
-http://a.nova-star.ru/*.swf
-http://a.ucoz.net/*
-http://a1tv.ru/images/*
-http://ab.adpro.com.ua/a.cgi?*
-http://ab.goodsblock.dt00.net/*
-http://abc.ru/banners/*
-http://abs120x600.auto.ru/cgi-bin/
-http://ac.goodsblock.dt00.net/*
-http://ac.goodsblock.dt00.net/crossdomain.xml
-http://ad.3dnews.ru/*
-http://ad.600.tbn.ru/*
-http://ad.abr.tbn.ru/*
-http://ad.adriver.ru
-http://ad.adriver.ru/cgi-bin/*
-http://ad.aer.tbn.ru/*
-http://ad.agava.tbn.ru/cgi-bin/iframe/*
-http://ad.bannerhost.ru/cgi-bin/iframe?*
-http://ad.bigpoint.net/*
-http://ad.fasty.net/*
-http://ad.harrenmedianetwork.com/*
-http://ad.mastermedia.ru/ad/*
-http://ad.mbn.bb.ru
-http://ad.playground.ru/*
-http://ad.popup.tbn.ru/cgi-bin/iframe/*
-http://ad.rambler.ru/*
-http://ad.ru.doubleclick.net
-http://ad.tbn.ru/cgi-bin/iframe/*
-http://ad.text.tbn.ru/cgi-bin/banner/*
-http://ad.text.tbn.ru/cgi-bin/banner/*
-http://ad.top1.adbn.ru/cgi-bin/banner/*
-http://ad.vba.ru/*
-http://ad.z5x.net/*
-http://news.liveinternet.ru/ad/*
-http://ad*.bb.ru
-http://ad*.rambler.ru/ban.clk?pg=*
-http://ad0.bigmir.net/*
-http://ad24.ru
-http://ad3.bannerbank.ru/*
-http://ad4.tutu.ru/*
-http://adb.tbn.ru/*
-http://adcash.ru/adv/*
-http://adcash.ru/img/*
-http://adfox.ru/*
-http://admigo.ru/banners/*
-http://admin.a1tv.ru/banner/*
-http://admulti.ru/*
-http://adne.info/wp-content/*.swf
-http://adnet.ru/*
-http://adob-photoshop.com/porno*.jpg
-http://ads.adfox.ru/*
-http://adserving.cpxinteractive.com/*
-http://adskape.ru/*
-http://adult-click.ru/*
-http://adulttraffic.ru
-http://adv.aport.ru
-http://adv.hardwarez.ru/cgi-bin/*
-http://adv.nadavi.net/*
-http://adv.vz.ru
-http://advat.ru/onegadget/*
-http://advert.exaccess.ru
-http://advmaker.ru/*
-http://www.overclockers.ru/im_b/*
-http://adwork.net.ua/*
-http://agro.net.ru
-http://agronews.ru/images/*.gif
-http://agronews.ru/images/flash/*.swf
-http://agrotv.ru/*.swf
-http://aif.yadro.ru/cgi-bin/show?*
-http://aimp.ru/data/banners/*
-http://alexf.name/wp-content/themes/*.swf
-http://allbest.ru/union/i/fc/*
-http://allboxing.ru/img/*.swf
-http://allnod.info/banner/*
-http://allnokia.ru/img/banners/*
-http://allnokia.ru/img/flash/*
-http://allsiemens.com/*.swf
-http://altblog.ru/*.swf
-http://ampmr.popunder.ru/js.php?id=*
-http://ampmr.popunder.ru/popunder.php?id=*
-http://an.yandex.ru/code/*
-http://an.yandex.ru/resource/
-http://anekdotov.net/show/sell/*
-http://anime-zone.ru/inc/nika/*
-http://anime-zone.ru/inc/partners/*
-http://anime.itopsites.com/button.php?id=*
-http://annews.ru/images/clients/*
-http://img.tizermine.net/banners/*
-http://antifront.info/templates/original/images/banner*.jpg
-http://antikvariat-k.ru/*.gif
-http://ar.atwola.com/*
-http://arena.ru/files/banners/*
-http://arriva.ru/new/*.swf
-http://artlive.ru
-http://ashifin.com.ua/gif/*ban*.gif
-http://ashifin.com.ua/load/popover.js
-http://augo.ru/uploads_admin/ads/*
-http://autocontext.begun.ru/*
-http://autoregcatalog.ru/baner/*
-http://autoru.1gb.ru/*
-http://avamaster.ru/banner/*
-http://avifilm.ru/new/*
-http://azart.net.ua/upload/bx/*
-http://azbukasexa.ru/rek/*
-http://azerimake.km.ru
-http://azerisoft.net/templates/azerisoft/images/*.swf
-http://azmus.ru/templates/azmus/images/spbr.jpg
-http://b.megaban.com.ua/?*
-http://b18c.cn/*
-http://b2bcontext.ru
-http://ban.aport.ru
-http://banner.b-one.com.ua/*
-http://banner.bashnya.ru/
-http://banner.kiev.ua/cgi-bin/bi.cgi?*
-http://banners.all-gsm.ru/*
-http://banners.partypartners.com/images/*
-http://banners.stimulhosting.com/*
-http://banners.su/banner.php?id=*
-http://banners.takru.com/*
-http://bans.bride.ru/*
-http://bans.dating.ru/*
-http://bans.ru/*img
-http://baratro.ru/*.jpg
-http://bash.org.ru/img/*.gif
-http://bashnya.ru/banner/
-http://bbn.img.com.ua/*
-http://bc1.adward.ru/?*
-http://bd.bdirect.ru/banners/*
-http://begun.spylog.com/*
-http://best-host.ru/images/reklama/*
-http://best-hoster.ru/banners/*
-http://bestkino.ru/partners/banners/*
-http://bestreferat.ru/images/b/*
-http://bezpaleva.kwot.biz/pu.php?*
-http://bezpredela.net/*.jpg
-http://biathlon.com/logo.php?Query=*
-http://biathlon.ru/images/sp????/*
-http://biga.ru/*
-http://bigban.mobi/*.img
-http://bigbord.net/img_banners/*
-http://bigmax.ru/main/images/bm/*
-http://bin-layer.de/*
-http://bin-layer.ru/*
-http://bizbanner.com.ua/_banners/*
-http://biztraff.eu/in.cgi?*
-http://blackmanos.kwot.biz/*
-http://blog.dimok.ru/flz/*
-http://blogi.ru
-http://blogun.ru/advert/*
-http://blogun.ru/aimg/*
-http://bn.meteo.by/ad/*
-http://bn.ohah.ru/c.php?img=*
-http://bn.orthodoxy.ru
-http://bn5.ru/mail/*
-http://bns.mignews.com/ads/*
-http://bookhere.ru/_nw/*
-http://bookz.ru/tpl/*.swf
-http://br.gcl.ru/cgi-bin*
-http://bradavky-a-orgasmy.com
-http://bs.mybb.ru/*
-http://bs.yandex.ru/*
-http://bt.od.ua/images/b/*
-http://www.fxcash.ru/banners/*
-http://btr.kz/banners/*
-http://bugaga.tut.by/*.swf
-http://bungalo.ru
-http://burfs.ru
-http://business.lbn.ru/*.js
-http://butt-head.ru/adv/*
-http://bw.pronto.ru/*
-http://bw.pronto.ru/img/*/*.swf
-http://bx.neolabs.kz/cgi100/*
-http://c.bigmir.net/*
-http://c.ile.ru/*
-http://c.waplog.net/ru/*
-http://carlobucks.ru/image/b/*
-http://cash4ru.net/banners/*
-http://cat.clx.ru/*
-http://catafalk.ru
-http://catsss.da.ru
-http://catzone.ws/templates/*.swf
-http://caxa.com.ua
-http://caxa.ru
-http://cdn.gigya.com/wildfire/do_not_delete.htm
-http://cdn.gigya.com/wildfire/i/*
-http://cdn.gigya.com/WildFire/swf/*
-http://cdpartner.ru/adv/*
-http://cdsuper.ru
-http://chitika.net
-http://classificados
-http://click.readme.ru/js/*
-http://clickbangpop.com/openx/www/delivery/*
-http://clickbux.ru
-http://clickcashmoney.com/bi?id=*
-http://clickhere.ru
-http://clicks.moy.su/Vsachina/*
-http://clicks.runews.radeant.com/*
-http://clicktorrent.info/*
-http://clickunder.net/*
-http://zuni.tyndex.ru/images/krt/*
-http://www.kinoline.com.ua/*.swf
-http://www.navyfield.ru/file/banner/*
-http://www.fast-torrent.ru/media/uploads/file/banner_system/*
-http://i.li.ru/ReActive/i/global/ad/*
-http://mystery.bigmir.net/game/banners/*
-http://media5.fast-torrent.ru/media/uploads/file/banner_system/*
-http://client.zarabotok.igproject.ru/*
-http://clombus.okoshechka.net/*
-http://cmslist.ru/files/*.swf
-http://cnt.one.ru/cgi-bin/*
-http://code.popup2m.com/*
-http://computerpress.ru/images/*.swf
-http://content.medialand.ru/*
-http://content.promoisland.net/*.swf
-http://content.relax.ru/*
-http://coolsoch.ru/scroll.js
-http://corepoker.ru/pic/*banner*.gif
-http://count.e-ratings.com.ua
-http://counter.topping.com.ua/cgi-bin/pinger.cgi?id=*
-http://counter.wapstart.ru/index.php?*
-http://counter.yadro.ru/hit?*
-http://counterstrike.ru/images/*468*60.gif
-http://counterstrike.ru/images/*banner*.gif
-http://counting.kmindex.ru/*
-http://cpaclicks.com
-http://cracklab.ru/images/r_*
-http://crutop.com
-http://crutop.nu
-http://crutop.ru
-http://cs.zoner.ru/banners/*
-http://cswinz.net.ru/Banner/*
-http://cybertown.ru/stat/?but=*
-http://cys.ru/button.png?url=*
-http://d.clx.ru/*
-http://da.ru/ad/*.gif
-http://dadas.ru
-http://darkoniarpg.ru/baners/*
-http://data.admigo.ru/banners/*
-http://data.investfunds.ru/organisations_banners/*
-http://data.marketgid.com/*
-http://data.russkidki.ru/banners/*
-http://dating.poleznosti.ru/page/*
-http://delphisources.ru/pages/scripts/recl_*
-http://demon-theatre.com/exchange/view.php?uid=*
-http://den7.kwot.biz/*
-http://denizzz.okoshechka.net/s/tpMUWum1840.php?id=*
-http://depositfiles.com/gold/*
-http://filepost.ru/img/i/*ban*.gif
-http://deribas.kwot.biz/pu.php?id=*
-http://desc.allshops.ru/pub_banners/
-http://designjunkie.ru/images/stories/head/img/banner_easy.gif
-http://designjunkie.ru/images/stories/head/sponsors/*
-http://deti-nochi.kiev.ua/images/*/*_banner_*.gif
-http://security.opennet.ru/img/*
-http://www.aimp.ru/data/banners/*
-http://micro-win.com/uploads/*.swf
-http://develop.com.ua/files/1/*.gif
-http://develop.com.ua/files/1/*.swf
-http://develop.com.ua/files/2/*.gif
-http://develop.com.ua/files/2/*.swf
-http://devilart.name/*
-http://teasergate.com/*
-http://mlan.ck.ua/images/rek/*
-http://softforfree.com/images2/*.swf
-http://potolkinn.com/*.swf
-http://content.promoisland.net/*
-http://xlusiv.net/uploads/banners/*
-http://mipohudeli.ru/images/flash/*
-http://traff.dirkino.su/pro/*.swf
-http://images.letitbit.net/images/promo/*
-http://associazio.com/*
-http://musiclife.kz/*.swf
-http://zoda.ru/images/bb/*
-http://www.promoheads.com/banners/*
-http://www.searchmarket.ru/riva/*.swf
-http://invictory.org/banners/*
-http://items.kleo.ru/cgi-bin/iframe/*
-http://www.kleo.ru/ban/*
-http://img.ximperia.com/adv/*
-http://www.notepad.lv/partneri/*
-http://devki.cc/!promo/*
-http://digisat.ru/*.gif
-http://dimartvideo.ru/player.swf?*
-http://dimox.name/wp-content/themes/dimox.name/i/b/*
-http://direct.quasir.info/*
-http://direct.yandex.ru/?top*
-http://dividend-center.com/adv/*
-http://dload.net.ru/*.gif
-http://dndd.ru/*
-http://doxera.com/*.gif
-http://doxera.com/*.jpg
-http://drive.richbanner.ru/*
-http://drweb.com/pix/*.swf
-http://duuw.nm.ru
-http://dynamic.exaccess.ru/asp/*
-http://dynamic.exaccess.ru/asp/*
-http://dynamic.exaccess.ru/banners/*
-http://dyxi.ru
-http://echo.teasernet.ru/*
-http://eldoradogold.org
-http://engine.adland.ru*
-http://engine.awaps.net/*
-http://engine.rorer.ru/cgi-bin/iframe/*
-http://engine.rorer.ru/request/*
-http://epartner.ru/ppdiz/*
-http://eronsk.ru/b/*
-http://erotizer.info/*
-http://erows.net/ad.bannerbank*.js
-http://erows.net/js/*
-http://eserver.ru/img/b/*.gif
-http://eurasiamebel.ru
-http://euro-football.ru/*.gif
-http://exaccess.ru/*
-http://exmoney.ru
-http://exnews.org/files/popuptrafru.js
-http://exploit.in/materials_/*
-http://fast-torrent.ru/upload/File/banner_system/*
-http://fast-torrent.ru/upload/Image/banner_system/*
-http://fast-torrent.webpandora.ru/PICS/banners/*
-http://fat.lv/baner_zone3.php
-http://fatall.kwot.biz/pu.php?id=*
-http://fatall.org/promo/*
-http://fatall.org/templates/online-video/images/ban*.gif
-http://feralex.front.ru/popup.js
-http://ferra.ru/images/news/*.gif
-http://fetishfront.ru/img/*/banner*.gif
-http://files.lov1.ru/*ban*.gif
-http://fileshare.in.ua/s/img/*.swf
-http://film.ru/img/advert/*
-http://filmfree.ru/images/*
-http://filmxa.net
-http://financeads.net
-http://finbs.ru
-http://fast.privetru.com/x/bswf/*
-http://privet.ru/x/bpng/*
-http://1portable.ru/uploads/*.swf
-http://order.hostlife.net/_rootimages/banners/*
-http://fixwap.net/ru/main.php?uid=*
-http://flaer.com.ua/banner*.swf
-http://flash.eastweb.ru/i/files/*
-http://flash.su/*.swf
-http://fleetmanagement.ru/uploads/*ban*.gif
-http://folder.richbanner.ru/*
-http://folder.richbanner.ru/*
-http://forum.antichat.ru/*.gif
-http://forum.antichat.ru/*.swf
-http://forum.blackhack.ru/banners/*
-http://forum.convex.ru/cyb/*
-http://forum.ixbt.com/*.swf
-http://forum.lavteam.com/banners/*
-http://forum.ru-board.com/board/temp*
-http://forum.sgh.ru/images/*.swf
-http://forum.sources.ru/asdf/*
-http://forum.tnx.net/*125x125.gif
-http://forum.uiny.ru/banner*.gif
-http://forum.vingrad.ru/r/*
-http://forum.worldok.ru/clipart4ipb/banners/*
-http://forum.xaknet.ru/*.gif
-http://forum.xaknet.ru/*.swf
-http://foundation.softkey.ru/banner/*
-http://free-torrents.org/forum/images/*.gif
-http://free-torrents.org/forum/images/*.swf
-http://free.siteedit.ru/images/adv/*
-http://free.siteedit.ru/system/reklamb.js
-http://freesoft.ru/banners/*
-http://fufa.ru/imgs/games/scroll/*
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-en/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-en/.calculate_directory
deleted file mode 100644
index 05e1d8ba4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-en/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip os_locale_language!=ru path=~/.mozilla/firefox/calculate.default
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-en/places.sqlite b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-en/places.sqlite
deleted file mode 100644
index 7f797fdc3..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-en/places.sqlite and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-ru/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-ru/.calculate_directory
deleted file mode 100644
index 18035e946..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-ru/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip os_locale_language==ru path=~/.mozilla/firefox/calculate.default
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-ru/places.sqlite b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-ru/places.sqlite
deleted file mode 100644
index 42800cec7..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/bookmarks-ru/places.sqlite and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/extensions.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/extensions.ini
deleted file mode 100644
index 53dd3a9a6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/extensions.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[ExtensionDirs]
-Extension0=/opt/firefox/extensions/langpack-it@firefox.mozilla.org
-Extension1=/opt/firefox/extensions/langpack-de@firefox.mozilla.org
-Extension2=/opt/firefox/extensions/langpack-bg@firefox.mozilla.org
-Extension3=/opt/firefox/extensions/langpack-ro@firefox.mozilla.org
-Extension4=/opt/firefox/extensions/langpack-ru@firefox.mozilla.org
-Extension5=/opt/firefox/extensions/langpack-uk@firefox.mozilla.org
-Extension6=/opt/firefox/extensions/langpack-pl@firefox.mozilla.org
-Extension7=/opt/firefox/extensions/langpack-pt-BR@firefox.mozilla.org
-Extension8=/opt/firefox/extensions/langpack-fr@firefox.mozilla.org
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/extensions.sqlite b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/extensions.sqlite
deleted file mode 100644
index e380d386b..000000000
Binary files a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/extensions.sqlite and /dev/null differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/mimeTypes.rdf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/mimeTypes.rdf
deleted file mode 100644
index 4c6f96c7c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/mimeTypes.rdf
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mimetype:application/msword"
-                   NC:value="application/msword"
-                   NC:editable="true"
-                   NC:fileExtensions="doc"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/vnd.ms-excel"
-                   NC:value="application/vnd.ms-excel"
-                   NC:editable="true"
-                   NC:description="">
-    <NC:fileExtensions>xls</NC:fileExtensions>
-    <NC:fileExtensions>xla</NC:fileExtensions>
-    <NC:fileExtensions>xlb</NC:fileExtensions>
-    <NC:fileExtensions>xlc</NC:fileExtensions>
-    <NC:fileExtensions>xlm</NC:fileExtensions>
-    <NC:fileExtensions>xlt</NC:fileExtensions>
-    <NC:fileExtensions>xlw</NC:fileExtensions>
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/vnd.ms-excel"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/vnd.oasis.opendocument.spreadsheet"
-                   NC:value="application/vnd.oasis.opendocument.spreadsheet"
-                   NC:editable="true"
-                   NC:fileExtensions="ods"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/vnd.oasis.opendocument.spreadsheet"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/vnd.oasis.opendocument.text"
-                   NC:value="application/vnd.oasis.opendocument.text"
-                   NC:editable="true"
-                   NC:fileExtensions="odt"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/vnd.oasis.opendocument.text"/>
-  </RDF:Description>
-
-  <RDF:Description RDF:about="urn:scheme:mailto"
-                   NC:value="mailto">
-    <NC:possibleApplication RDF:resource="urn:handler:local:/usr/bin/xdg-open"/>
-    <NC:handlerProp RDF:resource="urn:scheme:externalApplication:mailto"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://www.mibbit.com/?url=%s"
-                   NC:prettyName="Mibbit"
-                   NC:uriTemplate="https://www.mibbit.com/?url=%s" />
-  <RDF:Description RDF:about="urn:scheme:externalApplication:file"
-                   NC:prettyName="xdg-open"
-                   NC:path="/usr/bin/xdg-open" />
-  <RDF:Description RDF:about="urn:scheme:externalApplication:mailto"
-                   NC:prettyName="xdg-open"
-                   NC:path="/usr/bin/xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-tar"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"
-                   NC:prettyName="Яндек�.Календарь"
-                   NC:uriTemplate="https://calendar.yandex.ru/importics.xml?ics=%s" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-tar"
-                   NC:value="application/x-tar"
-                   NC:editable="true"
-                   NC:fileExtensions="tar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:irc"
-                   NC:value="irc">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:irc"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"
-                   NC:prettyName="Яндек�.Почта"
-                   NC:uriTemplate="https://mail.yandex.ru/compose?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-rar-compressed"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:scheme:handler:ircs"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-tar"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/msword"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/vnd.ms-excel"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/vnd.ms-excel"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/vnd.oasis.opendocument.text"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/vnd.oasis.opendocument.text"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/vnd.oasis.opendocument.spreadsheet"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/vnd.oasis.opendocument.spreadsheet"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:mailto"
-                     NC:value="mailto">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:text/rtf"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-torrent"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:root"
-                   NC:ru_defaultHandlersVersion="4" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/msword"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/vnd.oasis.opendocument.spreadsheet"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/vnd.oasis.opendocument.text"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/vnd.ms-excel"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/zip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-gzip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-gzip"
-                   NC:value="application/x-gzip"
-                   NC:editable="true"
-                   NC:fileExtensions="gz"
-                   NC:description="gzip">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"
-                   NC:prettyName="Mail.Ru"
-                   NC:uriTemplate="http://win.mail.ru/cgi-bin/sentmsg?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:handler:application/pdf"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-torrent"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-torrent"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:text/rtf"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:text/rtf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/zip"
-                   NC:value="application/zip"
-                   NC:editable="true"
-                   NC:fileExtensions="zip"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:file"
-                   NC:value="file">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:file"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:schemes:root">
-    <RDF:li RDF:resource="urn:scheme:mailto"/>
-    <RDF:li RDF:resource="urn:scheme:webcal"/>
-    <RDF:li RDF:resource="urn:scheme:irc"/>
-    <RDF:li RDF:resource="urn:scheme:ircs"/>
-    <RDF:li RDF:resource="urn:scheme:file"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:ircs"
-                   NC:value="ircs">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:ircs"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:schemes">
-    <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:webcal"
-                   NC:value="webcal">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:webcal"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-rar-compressed"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:mailto"
-                   NC:alwaysAsk="false">
-    <NC:possibleApplication RDF:resource="urn:handler:local:/usr/bin/xdg-open"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/pdf"
-                   NC:value="application/pdf"
-                   NC:editable="true"
-                   NC:fileExtensions="pdf"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:text/rtf"
-                   NC:value="text/rtf"
-                   NC:editable="true"
-                   NC:fileExtensions="rtf"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:text/rtf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-torrent"
-                   NC:value="application/x-torrent"
-                   NC:editable="true"
-                   NC:fileExtensions="torrent"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-torrent"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetypes">
-    <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:irc"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-rar-compressed"
-                   NC:value="application/x-rar-compressed"
-                   NC:editable="true"
-                   NC:fileExtensions="rar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:webcal"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:application/pdf"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-torrent"/>
-    <RDF:li RDF:resource="urn:mimetype:application/zip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/msword"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-rar-compressed"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-gzip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-tar"/>
-    <RDF:li RDF:resource="urn:mimetype:application/vnd.ms-excel"/>
-    <RDF:li RDF:resource="urn:mimetype:application/vnd.opendocument.spreadsheet"/>
-    <RDF:li RDF:resource="urn:mimetype:application/vnd.opendocument.text"/>
-    <RDF:li RDF:resource="urn:mimetype:text/rtf"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:handler:file"
-                   NC:alwaysAsk="false">
-    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:file"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-gzip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/zip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
-                   NC:prettyName="Gmail"
-                   NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-</RDF:RDF>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/prefs.js b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/prefs.js
deleted file mode 100644
index d5995d52b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/calculate.default/prefs.js
+++ /dev/null
@@ -1,83 +0,0 @@
-#размер ди�ковой квоты под к�ш (в Кб)
-user_pref("browser.cache.disk.capacity", 5000);
-#�охран�ть файлы без запро�а на выбор пути
-user_pref("browser.download.useDownloadDir", false);
-#отключить проверку браузера по умолчанию
-user_pref("browser.shell.checkDefaultBrowser", false);
-#домашн�� �траница
-user_pref("browser.startup.homepage", "http://start.calculate-linux.org");
-#?os_locale_language==ru#
-user_pref("browser.startup.homepage", "http://start.calculate-linux.ru");
-#os_locale_language#
-#вер�и� по�леднего браузера, открывшего текущий профиль (нужно чтобы не отправл�л на �айт firefox)
-user_pref("browser.startup.homepage_override.mstone", "ignore");
-#�крывать панель вкладок когда открыта только одна �траница
-user_pref("browser.tabs.autoHide", false);
-#отключить вопро� при закрытии браузерв
-user_pref("browser.tabs.warnOnClose", false);
-#переме�тить иконку adblock из toolbar в statusbar
-#?pkg(www-plugins/adblock-mozilla-plugin)!=#
-user_pref("extensions.adblockplus.showinstatusbar", true);
-user_pref("extensions.adblockplus.showintoolbar", false);
-#pkg#
-#активировать тему kde oxygen
-#?pkg(www-plugins/oxygen-mozilla-plugin)!=#
-user_pref("general.skins.selectedSkin", "oxygen");
-user_pref("ui.allow_platform_file_picker", false);
-#pkg#
-#не показывать окно закачек при добавлении закачек
-user_pref("browser.download.manager.showAlertOnComplete", false);
-user_pref("browser.download.manager.showWhenStarting", false);
-#у�тановить google как пои�ковик по умолчанию
-#?os_locale_language==ru#
-user_pref("keyword.URL", "http://www.google.ru/search?q=");
-#os_locale_language#
-#?os_locale_language!=ru#
-user_pref("keyword.URL", "http://www.google.com/search?q=");
-#os_locale_language#
-
-#?pkg(www-plugins/spell-mozilla-plugin)!=#
-# не определ�ть автоматиче�ки �ловарь
-user_pref("spellchecker.autoChangeDictionary", false);
-# не определ�ть �ловарь по набору
-user_pref("spellchecker.detectDictionaryAsIType", false);
-#pkg#
-
-# у�тановка �ловар� по локали
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==de#
-user_pref("spellchecker.dictionary", "de-DE");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==en#
-user_pref("spellchecker.dictionary", "en-US");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==es#
-user_pref("spellchecker.dictionary", "es-ES");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==fr#
-user_pref("spellchecker.dictionary", "fr-reforme1990");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==it#
-user_pref("spellchecker.dictionary", "it-IT");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==pl#
-user_pref("spellchecker.dictionary", "pl");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==pt_BR#
-user_pref("spellchecker.dictionary", "pt-BR");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==pt#
-user_pref("spellchecker.dictionary", "pt");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ru#
-user_pref("spellchecker.dictionary", "ru");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==ro#
-user_pref("spellchecker.dictionary", "ro");
-#pkg#
-#?pkg(www-plugins/spell-mozilla-plugin)!=&&os_locale_language==uk#
-user_pref("spellchecker.dictionary", "uk-UA");
-#pkg#
-#отключаем помощь mozilla
-user_pref("toolkit.telemetry.prompted", 2);
-user_pref("toolkit.telemetry.rejected", true);
-user_pref("toolkit.telemetry.enabled", false);
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/profiles.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/profiles.ini
deleted file mode 100644
index 2ac148c0c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/firefox-10.0/.mozilla/firefox/profiles.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[General]
-#запу�кать � по�ледним и�пользованным профилем
-StartWithLastProfile=1
-
-[Profile0]
-#им� профил� по умолчанию
-Name=default
-IsRelative=1
-#путь к профилю по умолчанию
-Path=calculate.default
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
deleted file mode 100644
index 9d519b053..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-midori = 0.4
-
-[update]
-midori = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
deleted file mode 100644
index 392545d3d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.config/midori)==&&ini(update.midori)!=off&&ini(ver.midori)==&&pkg()>=0.4
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
deleted file mode 100644
index af6ba7f4c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=~/.config
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
deleted file mode 100644
index fad0633f8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=samba
-
-[settings]
-#?pkg(media-fonts/droid)!=#
-default-font-family=Droid Sans
-monospace-font-family=Droid Sans Mono Slashed
-#pkg#
-enable-site-specific-quirks=true
-last-window-width=1020
-last-window-height=740
-last-web-search=2
-show-statusbar=false
-toolbar-items=TabNew,Back,Forward,ReloadStop,Homepage,Panel,Location,BookmarkAdd,Search,CompactMenu,
-load-on-startup=MIDORI_STARTUP_HOMEPAGE
-#?os_locale_language!=ru#
-homepage=http://start.calculate-linux.org
-#os_locale_language#
-#?os_locale_language==ru#
-homepage=http://start.calculate-linux.ru
-#os_locale_language#
-preferred-encoding=MIDORI_ENCODING_CUSTOM
-always-show-tabbar=true
-enable-html5-database=true
-
-[extensions]
-libtoolbar-editor.so=true
-libadblock.so=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.calculate/ini.env
deleted file mode 100644
index bea357e38..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-opera = 10.6
-
-[update]
-opera = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.calculate_directory
deleted file mode 100644
index 8d3544093..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.opera)==&&ini(update.opera)!=off&&ini(ver.opera)==&&pkg()>=10.6&&pkg()<11.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/bookmarks.adr-en b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/bookmarks.adr-en
deleted file mode 100644
index 00c44f36f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/bookmarks.adr-en
+++ /dev/null
@@ -1,194 +0,0 @@
-# Calculate name=bookmarks.adr os_locale_language!=ru
-Opera Hotlist version 2.0
-Options: encoding = utf8, version=3
-
-#FOLDER
-	ID=15
-	NAME=Корзина
-	CREATED=1283425887
-	TRASH FOLDER=YES
-	DELETABLE=NO
-	UNIQUEID=A86AF3602B5641109DE0DAC709AEDDBD
-
--
-
-#FOLDER
-	ID=25
-	NAME=Calculate Linux
-	CREATED=1283427685
-	EXPANDED=YES
-	UNIQUEID=04A1FF90B68711DF868EA98007EBCEEB
-
-#URL
-	ID=59
-	NAME=Planet Calculate
-	URL=http://www.calculate-linux.org/blogs/en
-	CREATED=1283430513
-	UNIQUEID=99F41B40B68D11DF8C818F55C21D2F5B
-
-#URL
-	ID=61
-	NAME=Forums
-	URL=http://www.calculate-linux.org/projects/en/boards
-	CREATED=1283430529
-	UNIQUEID=A393A350B68D11DF8C83F845B5EC5D89
-
-#URL
-	ID=56
-	NAME=Issues
-	URL=http://www.calculate-linux.org/projects/calculatelinux/issues
-	CREATED=1283430481
-	UNIQUEID=86B50B20B68D11DF8C7EA240EBA4134B
-
-#URL
-	ID=54
-	NAME=IRC Chat
-	URL=http://www.calculate-linux.org/irc
-	CREATED=1283430457
-	UNIQUEID=78E71BA0B68D11DF8C7C846F36741BB3
-
-#URL
-	ID=52
-	NAME=Calculate Linux is a Gentoo-based family of three distinguished distributions.
-	URL=http://www.calculate-linux.org/en
-	CREATED=1283430429
-	VISITED=1283430758
-	DESCRIPTION=Calculate Directory Server (CDS) is a solution that supports Windows and Linux clients via LDAP + SAMBA, providing proxy, mail and Jabbers servers with streamlined user management. Calculate Linux Desktop (CLD) is a workstation and client distribution with KDE, Gnome or Xfce desktop that includes a wizard to configure a connection to Calculate Directory Server. Calculate Linux Scratch (CLS) is live DVD with a build framework for creating a custom distribution.
-	UNIQUEID=67A67390B68D11DF8C7A9A836C665693
-
-#URL
-	ID=57
-	NAME=News
-	URL=http://www.calculate-linux.org/news
-	CREATED=1283430488
-	UNIQUEID=8AE9DB30B68D11DF8C7FB7265AB864FE
-
-#URL
-	ID=55
-	NAME=Documentation
-	URL=http://www.calculate-linux.org/main/en
-	CREATED=1283430472
-	DESCRIPTION=Redmine
-	UNIQUEID=81838B90B68D11DF8C7D8FC8E41652E3
-
-#URL
-	ID=58
-	NAME=New Packages
-	URL=http://www.calculate-linux.org/packages/newset
-	CREATED=1283430506
-	UNIQUEID=95BBA1B0B68D11DF8C80F4C6C5E1C781
-
-#URL
-	ID=60
-	NAME=Mailing Lists
-	URL=http://www.calculate-linux.org/main/en/maillist
-	CREATED=1283430521
-	DESCRIPTION=Redmine
-	UNIQUEID=9EA67FC0B68D11DF8C8293032F74FB29
-
-#FOLDER
-	ID=35
-	NAME=Социальные �ети
-	CREATED=1283429559
-	EXPANDED=YES
-	UNIQUEID=618E0150B68B11DF86E0E88E3A8833B7
-
-#URL
-	ID=38
-	NAME=Calculate Linux (calculatelinux) on Twitter
-	URL=http://twitter.com/calculatelinux
-	CREATED=1283427830
-	VISITED=1283430705
-	UNIQUEID=5AFB67F0B68711DF8692A805CD35241D
-
-#URL
-	ID=69
-	NAME=Calculate Linux | Facebook
-	URL=http://www.facebook.com/group.php?gid=97309000613
-	CREATED=1283430737
-	VISITED=1283430761
-	DESCRIPTION= Facebook - �то �оциальна� �еть, в которой вы можете найти новых друзей и возобновить �в�зь �о �тарыми. Также вы можете �в�зать�� � коллегами по работе и учебе. Общайте�ь � друзь�ми, загружайте фото и видео, и узнавайте много нового об окружающих ва� люд�х � помощью Facebook.
-	UNIQUEID=1F8B7A50B68E11DF8C8BE251A17E7898
-
--
-
-#URL
-	ID=65
-	NAME=Calculate - LinuxQuestions.org
-	URL=http://www.linuxquestions.org/questions/calculate-89/
-	CREATED=1283430663
-	VISITED=1283430800
-	DESCRIPTION=Calculate - This forum is for the discussion of Calculate Linux.
-	ACTIVE=YES
-	UNIQUEID=F3B3E020B68D11DF8C87F620553A34FE
-
--
-
-#FOLDER
-	ID=39
-	NAME=Свободное программное обе�печение
-	CREATED=1283427759
-	EXPANDED=YES
-	UNIQUEID=3064D940B68711DF8690971FA0066B7D
-
-#URL
-	ID=66
-	NAME=DistroWatch.com: Put the fun back into computing. Use Linux, BSD.
-	URL=http://distrowatch.com/
-	CREATED=1283430671
-	VISITED=1283430784
-	DESCRIPTION=News and feature lists of Linux and BSD distributions.
-	UNIQUEID=F8541C30B68D11DF8C88B0877C0686A4
-
-#URL
-	ID=67
-	NAME=LinuxTracker | The Premier Linux BitTorrent Website
-	URL=http://linuxtracker.org/
-	CREATED=1283430683
-	VISITED=1283430787
-	DESCRIPTION=The Largest Linux ISO Torrent Repository online!
-	UNIQUEID=FF345D30B68D11DF8C89B09075B3F6F9
-
--
-
-#FOLDER
-	ID=42
-	NAME=Gentoo
-	CREATED=1283428013
-	EXPANDED=YES
-	UNIQUEID=C7E2E460B68711DF8698BDF520ACD94F
-
-#URL
-	ID=63
-	NAME=Gentoo Forums :: Главна�
-	URL=http://forums.gentoo.org/
-	CREATED=1283430571
-	VISITED=1283430776
-	UNIQUEID=BC61E360B68D11DF8C85B29B47AE922E
-
-#URL
-	ID=45
-	NAME=Gentoo Linux -- Gentoo Linux News
-	URL=http://www.gentoo.org/
-	CREATED=1283428033
-	VISITED=1283430566
-	UNIQUEID=D41943F0B68711DF8699DDDF2E6532B1
-
-#URL
-	ID=62
-	NAME=Gentoo Linux Wiki
-	URL=http://en.gentoo-wiki.com/wiki/Main_Page
-	CREATED=1283430552
-	VISITED=1283430776
-	UNIQUEID=B167AD50B68D11DF8C84F97714E049F1
-
-#URL
-	ID=64
-	NAME=Gentoo Bugzilla Main Page
-	URL=http://bugs.gentoo.org/
-	CREATED=1283430581
-	VISITED=1283430584
-	UNIQUEID=C2C700F0B68D11DF8C86B39F11A52ABD
-
--
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/bookmarks.adr-ru b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/bookmarks.adr-ru
deleted file mode 100644
index 9881ade7c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/bookmarks.adr-ru
+++ /dev/null
@@ -1,229 +0,0 @@
-Opera Hotlist version 2.0
-Options: encoding = utf8, version=3
-
-#FOLDER
-	ID=24
-	NAME=Корзина
-	CREATED=1283425887
-	ACTIVE=YES
-	TRASH FOLDER=YES
-	DELETABLE=NO
-	UNIQUEID=A86AF3602B5641109DE0DAC709AEDDBD
-
--
-
-#FOLDER
-	ID=26
-	NAME=Calculate Linux
-	CREATED=1283427685
-	EXPANDED=YES
-	UNIQUEID=04A1FF90B68711DF868EA98007EBCEEB
-
-#URL
-	ID=27
-	NAME=Форумы
-	URL=http://www.calculate-linux.ru/projects/ru/boards
-	CREATED=1283427658
-	UNIQUEID=F4914C00B68611DF868C9986315815D7
-
-#URL
-	ID=28
-	NAME=Планета Calculate
-	URL=http://www.calculate-linux.ru/blogs/ru
-	CREATED=1283427652
-	VISITED=1283429178
-	UNIQUEID=F0E66C70B68611DF868BB2821C4D1463
-
-#URL
-	ID=29
-	NAME=Задачи
-	URL=http://www.calculate-linux.ru/projects/calculatelinux/issues
-	CREATED=1283427672
-	VISITED=1283428200
-	UNIQUEID=FC82FD00B68611DF868DDCCB73460D13
-
-#URL
-	ID=30
-	NAME=IRC чат
-	URL=http://www.calculate-linux.ru/irc
-	CREATED=1283427714
-	VISITED=1283428117
-	UNIQUEID=156EB020B68711DF868FBA19514F81C7
-
-#URL
-	ID=31
-	NAME=Calculate Linux - �емей�тво ди�трибутивов, �озданных на о�нове проекта Gentoo GNU/Linux.
-	URL=http://www.calculate-linux.ru/ru
-	CREATED=1283427938
-	VISITED=1283428207
-	DESCRIPTION=Calculate Linux �вл�ет�� оптимизированным ди�трибутивом, предназначенным дл� бы�трого развёртывани� в корпоративной �реде. Он о�нован на проекте Gentoo  и обладает многочи�ленными предварительно �конфигурированными функци�ми. Calculate Linux делит�� на три направлени� - Calculate Linux Desktop, Calculate Directory Server и Calculate Linux Scratch.
-	UNIQUEID=9B5C1E70B68711DF8696BDAD18A50274
-
-#URL
-	ID=32
-	NAME=�ово�ти
-	URL=http://www.calculate-linux.ru/news
-	CREATED=1283428125
-	VISITED=1283428128
-	UNIQUEID=0ADB0EA0B68811DF869CD7C6A05D4D67
-
-#URL
-	ID=33
-	NAME=Документаци�
-	URL=http://www.calculate-linux.ru/main/ru
-	CREATED=1283428145
-	VISITED=1283428198
-	DESCRIPTION=Redmine
-	UNIQUEID=16CE98D0B68811DF869DD3DED211B989
-
-#URL
-	ID=34
-	NAME=�овые пакеты
-	URL=http://www.calculate-linux.ru/packages/newset
-	CREATED=1283428189
-	VISITED=1283428202
-	UNIQUEID=30BA56D0B68811DF869EC9E16B0AFB70
-
-#URL
-	ID=35
-	NAME=Спи�ки ра��ылки
-	URL=http://www.calculate-linux.ru/main/ru/maillist
-	CREATED=1283428192
-	DESCRIPTION=Redmine
-	UNIQUEID=32C9AED0B68811DF869FD6A9FA904F3B
-
-#FOLDER
-	ID=36
-	NAME=Социальные �ети
-	CREATED=1283429559
-	EXPANDED=YES
-	UNIQUEID=618E0150B68B11DF86E0E88E3A8833B7
-
-#URL
-	ID=37
-	NAME=Calculate Linux | Facebook
-	URL=http://www.facebook.com/group.php?gid=101281876595263
-	CREATED=1283427884
-	VISITED=1283428231
-	DESCRIPTION= Facebook - �то �оциальна� �еть, в которой вы можете найти новых друзей и возобновить �в�зь �о �тарыми. Также вы можете �в�зать�� � коллегами по работе и учебе. Общайте�ь � друзь�ми, загружайте фото и видео, и узнавайте много нового об окружающих ва� люд�х � помощью Facebook.
-	UNIQUEID=7ADE8D90B68711DF8694CFDA3010A281
-
-#URL
-	ID=38
-	NAME=В Контакте | Добро пожаловать
-	URL=http://vkontakte.ru/index.php
-	CREATED=1283429547
-	VISITED=1283429564
-	UNIQUEID=5A5D2F50B68B11DF86DFF6AE8B6FD3B9
-
-#URL
-	ID=39
-	NAME=Calculate Linux (calculatelinux) on Twitter
-	URL=http://twitter.com/calculatelinux
-	CREATED=1283427830
-	UNIQUEID=5AFB67F0B68711DF8692A805CD35241D
-
--
-
-#URL
-	ID=40
-	NAME=Pastebin Calculate Linux
-	URL=http://pastebin.calculate-linux.ru/ru
-	CREATED=1305706839
-	DESCRIPTION=Серви� дл� размещени� блоков кода
-	UNIQUEID=B6B4E150812711E0856DCD64707F289F
-
--
-
-#FOLDER
-	ID=41
-	NAME=Свободное программное обе�печение
-	CREATED=1283427759
-	EXPANDED=YES
-	UNIQUEID=3064D940B68711DF8690971FA0066B7D
-
-#URL
-	ID=42
-	NAME=Linuxoid - в�е что знаю о Linux
-	URL=http://www.tux.in.ua/
-	CREATED=1283427861
-	VISITED=1283427864
-	DESCRIPTION=OpenSource программы, на�тройка Linux, Asterisk, FreeBSD
-	UNIQUEID=6D7EF040B68711DF8693F18D75B4981C
-
--
-
-#FOLDER
-	ID=43
-	NAME=Gentoo
-	CREATED=1283428013
-	EXPANDED=YES
-	UNIQUEID=C7E2E460B68711DF8698BDF520ACD94F
-
-#URL
-	ID=44
-	NAME=Gentoo Linux Wiki
-	URL=http://ru.gentoo-wiki.com/wiki/Заглавна�_�траница
-	CREATED=1283428044
-	UNIQUEID=DAA7BB70B68711DF869A8E98074B3101
-
-#URL
-	ID=45
-	NAME=Russian Gentoo Linux Community
-	URL=http://www.gentoo.ru/
-	CREATED=1283427984
-	VISITED=1283428025
-	UNIQUEID=B6B35350B68711DF869787B395BF5EC4
-
-#URL
-	ID=46
-	NAME=Gentoo Linux -- Gentoo Linux News
-	URL=http://www.gentoo.org/
-	CREATED=1283428033
-	VISITED=1283428252
-	UNIQUEID=D41943F0B68711DF8699DDDF2E6532B1
-
-#URL
-	ID=47
-	NAME=gentoo-doc - Project Hosting on Google Code
-	URL=http://code.google.com/p/gentoo-doc/
-	CREATED=1283428059
-	UNIQUEID=E371A400B68711DF869BCFF76D4243EC
-
--
-
-#FOLDER
-	ID=48
-	NAME=Другие ре�ур�ы
-	CREATED=1283429231
-	EXPANDED=YES
-	UNIQUEID=9DAE6B80B68A11DF86D8B0250AAAB262
-
-#URL
-	ID=49
-	NAME=Упаковка из картона, гофрокартона, микрогофрокартона, подарочна� и рекламна�, коробки, гофро�щики, картонные коробки.
-	URL=http://www.calculate.ru/
-	CREATED=1283429243
-	VISITED=1283429458
-	DESCRIPTION=Подбор, ра�чет и заказ упаковки из различных видов картона.
-	UNIQUEID=A502A400B68A11DF86D9E76D82804DA2
-
-#URL
-	ID=50
-	NAME=До�ки объ�влений, бе�платные объ�влени�, деловые объ�влени�, ча�тные объ�влени�
-	URL=http://www.acoola.ru/
-	CREATED=1283429250
-	VISITED=1305706436
-	DESCRIPTION=До�ки бе�платных объ�влений на Acoola.ru. Размещение бе�платных объ�влений на тематиче�ких до�ках объ�влений по категори�м купить, продать, �про�, предложение
-	UNIQUEID=A94EA590B68A11DF86DAA1679B4A4A83
-
-#URL
-	ID=51
-	NAME=OpenID Сервер
-	URL=http://iduser.net/
-	CREATED=1283429290
-	VISITED=1283429438
-	UNIQUEID=C123DFA0B68A11DF86DBFE7291F7ED71
-
--
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/operaprefs.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/operaprefs.ini
deleted file mode 100644
index b92bf580f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/operaprefs.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-# Calculate format=kde
-
-#?pkg(media-fonts/droid)!=#
-[CSS Generic Font Family]
-Serif=Droid Serif
-Sans-Serif=Droid Sans
-Monospace=Droid Sans Mono Slashed
-
-[Fonts]
-Normal=16,4,0,0,0,0,Times New Roman
-PRE=16,4,0,0,0,0,Courier
-EmailCompose=12,4,0,0,0,0,Droid Sans Mono Slashed
-Email=13,4,0,0,0,0,Droid Sans Mono Slashed
-HTMLCompose=12,4,0,0,0,0,Droid Sans Mono Slashed
-Menu=13,4,0,0,0,0,Droid Sans
-Toolbar=13,4,0,0,0,0,Droid Sans
-Dialog=13,4,0,0,0,0,Droid Sans
-Panel=13,4,0,0,0,0,Droid Sans
-Tooltip=13,4,0,0,0,0,Droid Sans
-Form.Text=12,4,0,0,0,0,Droid Sans Mono Slashed
-Form.Input=12,4,0,0,0,0,Droid Sans
-Form.Button=12,4,0,0,0,0,Droid Sans
-H1=32,7,0,0,0,0,Droid Serif
-H2=24,7,0,0,0,0,Droid Serif
-H3=18,7,0,1,0,0,Droid Serif
-H4=16,7,0,0,0,0,Droid Serif
-H5=13,7,0,0,0,0,Droid Serif
-H6=12,7,0,0,0,0,Droid Serif
-#pkg#
-
-[User Prefs]
-#?os_locale_language!=ru#
-Home URL=http://start.calculate-linux.org
-#os_locale_language#
-#?os_locale_language==ru#
-Home URL=http://start.calculate-linux.ru
-#os_locale_language#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/speeddial.ini-en b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/speeddial.ini-en
deleted file mode 100644
index 4197fcdb4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/speeddial.ini-en
+++ /dev/null
@@ -1,70 +0,0 @@
-# Calculate name=speeddial.ini os_locale_language!=ru
-Opera Preferences version 2.1
-; Do not edit this file while Opera is running
-; This file is stored in UTF-8 encoding
-
-[Background]
-Enabled=1
-
-[Speed Dial 1]
-Title=Calculate Linux is a Gentoo-based family of three distinguished distributions.
-Url=http://www.calculate-linux.org/en
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 2]
-Title=Calculate Linux | Facebook
-Url=http://www.facebook.com/group.php?gid=97309000613
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 3]
-Title=Calculate Linux (calculatelinux) on Twitter
-Url=http://twitter.com/calculatelinux
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 4]
-Title=Gentoo Linux -- Gentoo Linux News
-Url=http://www.gentoo.org/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 5]
-Title=Gentoo Forums :: Главна�
-Url=http://forums.gentoo.org/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 6]
-Title=Gentoo Linux Wiki
-Url=http://en.gentoo-wiki.com/wiki/Main_Page
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 7]
-Title=DistroWatch.com: Put the fun back into computing. Use Linux, BSD.
-Url=http://distrowatch.com/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 8]
-Title=LinuxTracker | The Premier Linux BitTorrent Website
-Url=http://linuxtracker.org/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 9]
-Title=Calculate - LinuxQuestions.org
-Url=http://www.linuxquestions.org/questions/calculate-89/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/speeddial.ini-ru b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/speeddial.ini-ru
deleted file mode 100644
index 980030d22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-10.6/.opera/speeddial.ini-ru
+++ /dev/null
@@ -1,69 +0,0 @@
-Opera Preferences version 2.1
-; Do not edit this file while Opera is running
-; This file is stored in UTF-8 encoding
-
-[Background]
-Enabled=1
-
-[Speed Dial 1]
-Title=Calculate Linux - �емей�тво ди�трибутивов, �озданных на о�нове проекта Gentoo GNU/Linux.
-Url=http://www.calculate-linux.ru/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 2]
-Title=Calculate Linux
-Url=http://vkontakte.ru/club10221243
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 3]
-Title=Calculate Linux | Facebook
-Url=http://www.facebook.com/group.php?gid=101281876595263
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 4]
-Title=Calculate Linux (calculatelinux) в Твиттере
-Url=http://twitter.com/calculatelinux
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 5]
-Title=Pastebin Calculate Linux
-Url=http://pastebin.calculate-linux.ru/ru
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 6]
-Title=OpenID Сервер
-Url=http://iduser.net/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 7]
-Title=Russian Gentoo Linux Community
-Url=http://www.gentoo.ru/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 8]
-Title=Gentoo Linux -- Gentoo Linux News
-Url=http://www.gentoo.org/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
-
-[Speed Dial 9]
-Title=Linuxoid - в�е что знаю о Linux
-Url=http://www.tux.in.ua/
-Reload Enabled=0
-Reload Interval=2147483646
-Reload Only If Expired=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
deleted file mode 100644
index 7532d69b0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-opera = 11.5
-
-[update]
-opera = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
deleted file mode 100644
index c84f481d4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.opera)==&&ini(update.opera)!=off&&ini(ver.opera)==&&pkg()>=11.5
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
deleted file mode 100644
index 7d4c64fe1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-# Calculate format=kde
-
-#?pkg(media-fonts/droid)!=#
-[CSS Generic Font Family]
-Fantasy=Droid Sans
-Serif=Droid Serif
-Sans-Serif=Droid Sans
-Cursive=Droid Serif
-Monospace=Droid Sans Mono Slashed
-
-[Fonts]
-Normal=14,4,0,0,0,0,Droid Sans
-PRE=14,4,0,0,0,0,Droid Sans Mono Slashed
-Form.Text=12,4,0,0,0,0,Droid Sans
-EmailCompose=12,4,0,0,0,0,Droid Sans
-Email=13,4,0,0,0,0,Droid Sans
-HTMLCompose=12,4,0,0,0,0,Droid Sans
-Form.Input=12,4,0,0,0,0,Droid Sans
-Form.Button=12,4,0,0,0,0,Droid Sans
-H1=32,7,0,0,0,0,Droid Sans
-H2=24,7,0,0,0,0,Droid Sans
-H3=18,7,0,0,0,0,Droid Sans
-H4=16,7,0,0,0,0,Droid Sans
-H5=13,7,0,0,0,0,Droid Sans
-H6=12,7,0,0,0,0,Droid Sans
-#pkg#
-
-[Install]
-Newest Used Version=11.52.1100
-
-[Mail]
-Handler=3
-
-[State]
-Run=0
-
-[User Prefs]
-#?os_locale_language!=ru#
-Home URL=http://start.calculate-linux.org
-#os_locale_language#
-#?os_locale_language==ru#
-Home URL=http://start.calculate-linux.ru
-#os_locale_language#
-Startup Type=2
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
deleted file mode 100644
index 05faeef73..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate name=speeddial.ini os_locale_language!=ru
-
-[Speed Dial 1]
-Url=http://www.calculate-linux.org/
-
-[Speed Dial 2]
-Url=http://pastebin.calculate-linux.org/
-
-[Speed Dial 3]
-http://www.linuxquestions.org/questions/calculate-89/
-
-[Speed Dial 4]
-Url=http://www.facebook.com/group.php?gid=97309000613
-
-[Speed Dial 5]
-Url=http://twitter.com/#!/calculatelinux
-
-[Speed Dial 6]
-Url=http://www.distrowatch.com/calculate
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
deleted file mode 100644
index e1643e928..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate name=speeddial.ini os_locale_language==ru
-
-[Speed Dial 1]
-Url=http://www.calculate-linux.ru/
-
-[Speed Dial 2]
-Url=http://pastebin.calculate-linux.ru/
-
-[Speed Dial 3]
-Url=http://vkontakte.ru/calculatelinux
-
-[Speed Dial 4]
-Url=http://www.facebook.com/group.php?gid=101281876595263
-
-[Speed Dial 5]
-Url=http://twitter.com/#!/calculatelinux
-
-[Speed Dial 6]
-Url=http://www.distrowatch.com/calculate
-
-[Speed Dial 7]
-Url=http://www.gentoo.ru/
-
-[Speed Dial 8]
-Url=http://www.tux.in.ua/
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
deleted file mode 100644
index 9b29c30e4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&exists(~/.config/qupzilla)==&&ini(update.qupzilla)!=off&&ini(ver.qupzilla)==&&pkg()>=1.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
deleted file mode 100644
index 1660d9251..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
+++ /dev/null
@@ -1,117 +0,0 @@
-# Calculate format=json path=~/.config/qupzilla/profiles/default
-{
- "roots": {
-  "bookmark_bar": {
-   "children": [
-    {
-     "description": "",
-     "keyword": "",
-     "name": "Calculate",
-     "type": "url",
-#?os_locale_language!=ru#
-     "url": "http://www.calculate-linux.org/",
-#os_locale_language#
-#?os_locale_language==ru#
-     "url": "http://www.calculate-linux.ru/",
-#os_locale_language#
-     "visit_count": 0
-    },
-    {
-     "type": "separator"
-    },
-    {
-     "description": "",
-     "keyword": "",
-     "type": "url",
-#?os_locale_language!=ru#
-     "name": "Download",
-     "url": "http://www.calculate-linux.org/main/en/download",
-#os_locale_language#
-#?os_locale_language==ru#
-     "name": "Скачать",
-     "url": "http://www.calculate-linux.ru/main/ru/download",
-#os_locale_language#
-     "visit_count": 0
-    },
-    {
-     "description": "",
-     "keyword": "",
-     "type": "url",
-#?os_locale_language!=ru#
-     "name": "Documentation",
-     "url": "http://www.calculate-linux.org/main/en/documentation",
-#os_locale_language#
-#?os_locale_language==ru#
-     "name": "Документаци�",
-     "url": "http://www.calculate-linux.ru/main/ru/documentation",
-#os_locale_language#
-     "visit_count": 0
-    },
-    {
-     "description": "",
-     "keyword": "",
-     "type": "url",
-#?os_locale_language!=ru#
-     "name": "Forums",
-     "url": "http://www.calculate-linux.org/projects/en/boards",
-#os_locale_language#
-#?os_locale_language==ru#
-     "name": "Форумы",
-     "url": "http://www.calculate-linux.ru/projects/ru/boards",
-#os_locale_language#
-     "visit_count": 0
-    },
-    {
-     "description": "",
-     "keyword": "",
-     "type": "url",
-#?os_locale_language!=ru#
-     "name": "Planet",
-     "url": "http://www.calculate-linux.org/blogs/en",
-#os_locale_language#
-#?os_locale_language==ru#
-     "name": "Планета",
-     "url": "http://www.calculate-linux.ru/blogs/ru",
-#os_locale_language#
-     "visit_count": 0
-    },
-    {
-     "description": "",
-     "keyword": "",
-     "type": "url",
-#?os_locale_language!=ru#
-     "name": "Issues",
-     "url": "http://www.calculate-linux.org/projects/calculatelinux/issues",
-#os_locale_language#
-#?os_locale_language==ru#
-     "name": "Задачи",
-     "url": "http://www.calculate-linux.ru/projects/calculatelinux/issues",
-#os_locale_language#
-     "visit_count": 0
-    }
-   ],
-   "description": "",
-   "expanded": true,
-   "expanded_sidebar": true,
-   "name": "",
-   "type": "folder"
-  },
-  "bookmark_menu": {
-   "children": [],
-   "description": "",
-   "expanded": true,
-   "expanded_sidebar": true,
-   "name": "",
-   "type": "folder"
-  },
-  "other": {
-   "children": [],
-   "description": "",
-   "expanded": true,
-   "expanded_sidebar": true,
-   "name": "",
-   "type": "folder"
-  }
- },
- "version": 1
-}
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
deleted file mode 100644
index fd9ad6782..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate path=~/.config/qupzilla/profiles/default/adblock
-Title: 
-Url: 
-[Adblock Plus 1.1.1]
-@@||calculate-linux^$document
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
deleted file mode 100644
index 7f0725aa8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=samba path=~/.calculate
-[ver]
-qupzilla = 1.8
-
-[update]
-qupzilla = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
deleted file mode 100644
index b9ae48a77..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=samba path=~/.config/qupzilla/profiles
-[Profiles]
-startProfile="default"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
deleted file mode 100644
index 34b248c77..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
+++ /dev/null
@@ -1,70 +0,0 @@
-# Calculate comment=# path=~/.config/qupzilla/profiles/default
-[AddressBar]
-ShowLoadingProgress=true
-ProgressStyle=1
-# otherwise crash
-showSwitchTab=true
-AddCountryDomainWithAltKey=false
-
-[Browser-Tabs-Settings]
-TabsOnTop=true
-AskOnClosing=false
-
-[Browser-Fonts]
-StandardFont=Times New Roman
-CursiveFont=Times New Roman
-FantasyFont=Droid Sans Mono
-FixedFont=Droid Sans Mono
-SansSerifFont=Times New Roman
-SerifFont=Times New Roman
-DefaultFontSize=16
-FixedFontSize=14
-MinimumFontSize=3
-MinimumLogicalFontSize=5
-
-[Browser-Tabs-Settings]
-newEmptyTabAfterActive=false
-newTabAfterActive=false
-
-[Browser-View-Settings]
-showMenubar=false
-showStatusBar=false
-showWebSearchBar=false
-
-[ClickToFlash]
-whitelist=youtube.com, vk.com
-
-[Cookie-Settings]
-filterTrackingCookie=true
-
-[SearchEngines]
-activeEngine=Google
-DefaultEngine=Google
-
-[SpellCheck]
-dictionaryPath=/usr/share/myspell
-
-[SpeedDial]
-#?os_locale_language!=ru#
-pages="url:\"http://www.linuxquestions.org/questions/calculate-89\"|title:\"Calculate Forum\";url:\"https://www.facebook.com/CalculateLinux\"|title:\"Calculate Linux\";url:\"https://plus.google.com/communities/117324990797580045769\"|title:\"Calculate Linux\xa0\x2013 \x421\x43e\x43e\x431\x449\x435\x441\x442\x432\x43e\xa0\x2013 Google+\";url:\"http://www.youtube.com/user/CalculateTube\"|title:\"Calculate Linux - YouTube\";url:\"https://twitter.com/calculatelinux\"|title:\"Calculate Linux (@calculatelinux) | \x422\x432\x438\x442\x442\x435\x440\";url:\"http://pastebin.calculate-linux.org\"|title:\"Pastebin Calculate Linux\";"
-#os_locale_language#
-#?os_locale_language==ru#
-pages="url:\"http://vk.com/calculatelinux\"|title:\"Calculate \x432 \x412\x41a\x43e\x43d\x442\x430\x43a\x442\x435\";url:\"https://www.facebook.com/CalculateLinux.ru\"|title:\"Calculate Linux \x432 Facebook\";url:\"https://plus.google.com/communities/100511365552994940528\"|title:\"Calculate Linux /rus\xa0\x2013 \x421\x43e\x43e\x431\x449\x435\x441\x442\x432\x43e\xa0\x2013 Google+\";url:\"http://ok.ru/calculate\"|title:\"Calculate \x432 \x41e\x434\x43d\x43e\x43a\x43b\x430\x441\x441\x43d\x438\x43a\x430\x445\";url:\"http://www.youtube.com/user/CalculateTube\"|title:\"Calculate \x432 YouTube\";url:\"https://twitter.com/calculatelinux\"|title:\"Calculate \x432 \x422\x432\x438\x442\x442\x435\x440\";"
-#os_locale_language#
-pagesrow=6
-sdcenter=true
-
-[Web-Browser-Settings]
-DNS-Prefetch=true
-DoNotTrack=true
-LocalCacheSize=100
-maximumCachedPages=10
-
-[Web-URL-Settings]
-#?os_locale_language!=ru#
-homepage=@Variant(\0\0\0\x11\0\0\0 http://start.calculate-linux.org/)
-#os_locale_language#
-#?os_locale_language==ru#
-homepage=@Variant(\0\0\0\x11\0\0\0 http://start.calculate-linux.ru/)
-#os_locale_language#
-afterLaunch=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
deleted file mode 100644
index 3c3da2e89..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.xorg)!=off&&ini(ver.xorg)==&&pkg()>=1.7
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
deleted file mode 100644
index b99c29f40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate
-file://#-ini(resource.documents)-#
-file://#-ini(resource.pictures)-#
-file://#-ini(resource.music)-#
-file://#-ini(resource.videos)-#
-file://#-ini(resource.downloads)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
deleted file mode 100644
index 7725ce385..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-xorg = 1.7
-
-[update]
-xorg = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
deleted file mode 100644
index 8311bd3a3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate path=~/.config
-XDG_DESKTOP_DIR="#-ini(resource.desktop)-#"
-XDG_DOCUMENTS_DIR="#-ini(resource.documents)-#"
-XDG_DOWNLOAD_DIR="#-ini(resource.downloads)-#"
-XDG_MUSIC_DIR="#-ini(resource.music)-#"
-XDG_PICTURES_DIR="#-ini(resource.pictures)-#"
-XDG_PUBLICSHARE_DIR="#-ini(resource.public)-#"
-XDG_TEMPLATES_DIR="#-ini(resource.templates)-#"
-XDG_VIDEOS_DIR="#-ini(resource.videos)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
deleted file mode 100644
index db26807f5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&ini(update.parcellite)!=off&&ini(ver.parcellite)==&&pkg()>=1.1 path=~/.config name=parcellite
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
deleted file mode 100644
index d6ed3023a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-parcellite = 1.1
-
-[update]
-parcellite = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
deleted file mode 100644
index c51935d57..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde
-[rc]
-use_primary=true
-history_key=<Ctrl><Alt>V
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
deleted file mode 100644
index b1ef4abf2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&ini(update.pcmanfm)!=off&&ini(ver.pcmanfm)==&&pkg()>=1.2.3 append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
deleted file mode 100644
index 800f15938..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=samba path=~/.config/pcmanfm/default
-[*]
-desktop_font=Droid Sans 10
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-show_documents=1
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-show_documents=0
-#env#
-show_mounts=0
-show_trash=0
-show_wm_menu=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
deleted file mode 100644
index 86d7ba122..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-pcmanfm = 1.2.3
-
-[update]
-pcmanfm = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
deleted file mode 100644
index a36000571..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.config/libfm
-[config]
-single_click=1
-auto_selection_delay=0
-
-[ui]
-shadow_hidden=1
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
deleted file mode 100644
index 045882128..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.config/pcmanfm/default
-[ui]
-focus_previous=1
-
-[volume]
-mount_on_startup=0
-mount_removable=0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
deleted file mode 100644
index c1bb3ce8d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.x11vnc)!=off&&ini(ver.x11vnc)==&&pkg()>=0.9
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
deleted file mode 100644
index 00c4bf03d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-x11vnc = 0.9
-
-[update]
-x11vnc = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
deleted file mode 100644
index 2e8415af5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications link=/usr/share/applications/x11vnc.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
deleted file mode 100644
index 390a6d93c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=raw
-! xscreensaver ---------------------------------------------------------------
-!font settings
-xscreensaver.Dialog.headingFont:        -*-fixed-bold-r-*-*-18-*-*-*-*-*-*-*
-xscreensaver.Dialog.bodyFont:           -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
-xscreensaver.Dialog.labelFont:          -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
-xscreensaver.Dialog.unameFont:          -*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*
-xscreensaver.Dialog.buttonFont:         -*-fixed-bold-r-*-*-13-*-*-*-*-*-*-*
-xscreensaver.Dialog.dateFont:           -*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*
-xscreensaver.passwd.passwdFont:         -*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*
-
-!color settings
-xscreensaver*borderColor:               #666666
-xscreensaver.Dialog.foreground:         #ffffff
-xscreensaver.Dialog.background:         #2c2c2c
-xscreensaver.Dialog.topShadowColor:     #2c2c2c
-xscreensaver.Dialog.bottomShadowColor:  #2c2c2c
-xscreensaver.Dialog.Button.foreground:  #2c2c2c
-xscreensaver.Dialog.Button.background:  #ffffff
-!username/password input box and date text colour
-xscreensaver.Dialog.text.foreground:    #2c2c2c
-xscreensaver.Dialog.text.background:    #ffffff
-xscreensaver.Dialog.internalBorderWidth:1
-xscreensaver.Dialog.borderWidth:        1
-xscreensaver.Dialog.shadowThickness:    2
-!timeout bar (background is actually determined by Dialog.text.background)
-xscreensaver.passwd.thermometer.foreground:  #666666
-xscreensaver.passwd.thermometer.background:  #2c2c2c
-xscreensaver.passwd.thermometer.width:       6
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
deleted file mode 100644
index 5836d7672..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-xscreensaver = 5.20
-
-[update]
-xscreensaver = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
deleted file mode 100644
index 1946bc35b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.xscreensaver)!=off&&ini(ver.xscreensaver)==&&pkg()>=5.10
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
deleted file mode 100644
index b335c44d8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
+++ /dev/null
@@ -1,12 +0,0 @@
-timeout:	0:10:00
-#?os_root_type==livecd#
-lock:		false
-#os_root_type#
-#?os_root_type!=livecd#
-lock:		true
-lockTimeout:	0:00:05
-#os_root_type#
-mode:		one
-selected:	139
-textMode:	literal
-textLiteral:	Calculate Linux Desktop
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
deleted file mode 100644
index 4dc684148..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
+++ /dev/null
@@ -1,62 +0,0 @@
-! дл� применени� на�троек в текущей �е��ии и�пользуйте `xrdb -load ~/.Xresources`
-
-Xft.antialias: true
-Xft.dpi: 96
-Xft.rgba: none
-Xft.hinting: true
-Xft.hintstyle: hintslight
-
-URxvt.perl-ext-common: default,tabbed,matcher
-
-URxvt.url-launcher: /usr/bin/chromium
-URxvt.matcher.button: 2
-URxvt.colorUL: #cacc46
-URxvt.underlineURLs: true
-URxvt.underlineColor: #cacc46
-
-URxvt.font: xft:Droid Sans Mono Slashed:pixelsize=13
-URxvt.boldFont: xft:Droid Sans Mono Slashed:bold
-
-URxvt.saveLines: 5000
-URxvt.geometry: 100x35
-URxvt.termName: rxvt
-
-URxvt.scrollBar: true
-URxvt.scrollstyle: plain
-URxvt.scrollBar_right: true
-URxvt.scrollColor: #1A1A1A
-
-! color the man
-URxvt.colorMode: on
-URxvt.boldColors: on
-URxvt.dynamicColors: on
-URxvt.colorULMode: on
-URxvt.underLine: off
-URxvt.colorBDMode: on
-URxvt.colorBD:  cyan
-
-URxvt.background: #2c2c2c
-URxvt.foreground: #dcdccc
-URxvt.color0: #2c2c2c
-URxvt.color1: #705050
-URxvt.color2: #60b48a
-URxvt.color3: #dfaf8f
-URxvt.color4: #9ab8d7
-URxvt.color5: #dc8cc3
-URxvt.color6: #8cd0d3
-URxvt.color7: #dcdccc
-URxvt.color8: #709080
-URxvt.color9: #dca3a3
-URxvt.color10: #72d5a3
-URxvt.color11: #f0dfaf
-URxvt.color12: #94bff3
-URxvt.color13: #ec93d3
-URxvt.color14: #93e0e3
-URxvt.color15: #ffffff
-
-URxvt.tabbed.tabbar-fg: 2
-URxvt.tabbed.tabbar-bg: 0
-URxvt.tabbed.tab-fg: 3
-URxvt.tabbed.tab-bg: 0
-
-! URxvt.iconFile: /usr/share/pixmaps/terminal.xpm
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
deleted file mode 100644
index 4b28faf64..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-urxvt = 9.15
-
-[update]
-urxvt = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
deleted file mode 100644
index aee5eb33c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.urxvt)!=off&&ini(ver.urxvt)==&&pkg()>=9.15
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
deleted file mode 100644
index 5ede18a60..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/urxvt-rxvt-unicode.desktop path=~/.local/share/applications mirror
-[Desktop Entry]
-Categories=GTK;System;TerminalEmulator;Utility;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
deleted file mode 100644
index 3cfdbd7f3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.xfce4-terminal)!=off&&ini(ver.xfce4-terminal)==&&pkg()>=0.6.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
deleted file mode 100644
index 9cd8223b5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=~/.config/xfce4/terminal format=raw comment=;
-(gtk_accel_path "<Actions>/terminal-window/contents" "")
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
deleted file mode 100644
index a3c5b78d1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate path=~/.calculate format=samba
-
-[ver]
-xfce4-terminal = 0.6.0
-
-[update]
-xfce4-terminal = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
deleted file mode 100644
index cfe6e512e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate path=~/.config/xfce4/terminal format=raw comment=#
-[Configuration]
-ColorBackground=#2c2c2c2c2c2c
-ColorBold=#dcdcdcdccccc
-ColorCursor=
-ColorForeground=#dcdcdcdccccc
-ColorPalette=#2c2c2c2c2c2c;#707050505050;#6060b4b48a8a;#dfdfafaf8f8f;#9a9ab8b8d7d7;#dcdc8c8cc3c3;#8c8cd0d0d3d3;#dcdcdcdccccc;#707090908080;#dcdca3a3a3a3;#7272d5d5a3a3;#f0f0dfdfafaf;#9494bfbff3f3;#ecec9393d3d3;#9393e0e0e3e3;#ffffffffffff
-ColorSelection=#dcdcdcdccccc
-FontName=Droid Sans Mono Slashed 10
-ScrollingLines=5000
-ScrollingOnOutput=FALSE
-ShortcutsNoMenukey=TRUE
-ShortcutsNoMnemonics=TRUE
-TabActivityColor=#2c2c2c2c2c2c
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
deleted file mode 100644
index 871d6545d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.xterm)!=off&&ini(ver.xterm)==&&pkg()>=314
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
deleted file mode 100644
index 935cab115..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-xterm = 314
-
-[update]
-xterm = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
deleted file mode 100644
index a8463f862..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications link=/usr/share/applications/uxterm.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
deleted file mode 100644
index a8c93b80a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde path=~/.local/share/applications link=/usr/share/applications/xterm.desktop
-[Desktop Entry]
-NoDisplay=true
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
deleted file mode 100644
index 0e2be1c30..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(x11-themes/calculate-icon-theme)!=&&ini(update.calculate-icon-theme)!=off&&ini(ver.calculate-icon-theme)<14&&pkg(x11-themes/calculate-icon-theme)>=14-r2
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
deleted file mode 100644
index 2e602a614..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=~/.calculate cl_ebuild_phase!=
-
-[main]
-profile_setup = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
deleted file mode 100644
index 624970d91..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_ebuild_phase==
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
deleted file mode 100644
index 1e938483e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-calculate-icon-theme = 14
-
-[update]
-calculate-icon-theme = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
deleted file mode 100644
index 1a2db72b6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch path=~/.kde4/share/config pkg(kde-base/plasma-workspace)!=
-<reg>start-here-kde</reg>
-<text>start-calculate</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
deleted file mode 100644
index e16d89158..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch path=~/.config/xfce4/xfconf/xfce-perchannel-xml pkg(xfce-base/xfce4-panel)!=
-<reg>property name="button-icon" type="string" value="start-here[^"]+"</reg>
-<text>property name="button-icon" type="string" value="start-calculate"</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
deleted file mode 100644
index c54f2f6dc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&ini(update.xcursors)!=off&&ini(ver.xcursors)<14&&pkg()>=14 append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
deleted file mode 100644
index fa8f1fba5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=~/.icons/default format=kde
-
-[icon theme]
-Inherits=Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
deleted file mode 100644
index 1bea056e0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate path=~/.calculate format=samba
-
-[ver]
-xcursors = 14
-
-[update]
-xcursors = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
deleted file mode 100644
index 66046e0e4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&ini(update.openbox)!=off&&ini(ver.openbox)==&&exists(~/.config/openbox/rc.xml)==&&pkg()>=3.6 append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
deleted file mode 100644
index 2391fef49..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[ver]
-openbox = 3.6
-
-[update]
-openbox = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
deleted file mode 100644
index 4d601d05d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
+++ /dev/null
@@ -1,810 +0,0 @@
-# Calculate path=~/.config/openbox
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Do not edit this file, it will be overwritten on install.
-        Copy the file to $HOME/.config/openbox/ instead. -->
-<openbox_config xmlns="http://openbox.org/3.4/rc" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <resistance>
-    <strength>10</strength>
-    <screen_edge_strength>20</screen_edge_strength>
-  </resistance>
-  <focus>
-    <focusNew>yes</focusNew>
-    <!-- always try to focus new windows when they appear. other rules do
-       apply -->
-    <followMouse>no</followMouse>
-    <!-- move focus to a window when you move the mouse into it -->
-    <focusLast>yes</focusLast>
-    <!-- focus the last used window when changing desktops, instead of the one
-       under the mouse pointer. when followMouse is enabled -->
-    <underMouse>no</underMouse>
-    <!-- move focus under the mouse, even when the mouse is not moving -->
-    <focusDelay>200</focusDelay>
-    <!-- when followMouse is enabled, the mouse must be inside the window for
-       this many milliseconds (1000 = 1 sec) before moving focus to it -->
-    <raiseOnFocus>no</raiseOnFocus>
-    <!-- when followMouse is enabled, and a window is given focus by moving the
-       mouse into it, also raise the window -->
-  </focus>
-  <placement>
-    <policy>Smart</policy>
-    <!-- 'Smart' or 'UnderMouse' -->
-    <center>yes</center>
-    <!-- whether to place windows in the center of the free area found or
-       the top left corner -->
-    <monitor>Primary</monitor>
-    <!-- with Smart placement on a multi-monitor system, try to place new windows
-       on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
-       the active window is, 'Primary' - only on the primary monitor -->
-    <primaryMonitor>1</primaryMonitor>
-    <!-- The monitor where Openbox should place popup dialogs such as the
-       focus cycling popup, or the desktop switch popup.  It can be an index
-       from 1, specifying a particular monitor.  Or it can be one of the
-       following: 'Mouse' - where the mouse is, or
-                  'Active' - where the active window is -->
-  </placement>
-  <theme>
-    <name>Clearlooks</name>
-    <titleLayout>NLIMC</titleLayout>
-    <!--
-      available characters are NDSLIMC, each can occur at most once.
-      N: window icon
-      L: window label (AKA title).
-      I: iconify
-      M: maximize
-      C: close
-      S: shade (roll up/down)
-      D: omnipresent (on all desktops).
-  -->
-    <keepBorder>yes</keepBorder>
-    <animateIconify>yes</animateIconify>
-    <font place="ActiveWindow">
-      <name>Droid Sans</name>
-      <size>10</size>
-      <!-- font size in points -->
-      <weight>Bold</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="InactiveWindow">
-      <name>Droid Sans</name>
-      <size>10</size>
-      <!-- font size in points -->
-      <weight>Normal</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="MenuHeader">
-      <name>Droid Sans</name>
-      <size>10</size>
-      <!-- font size in points -->
-      <weight>Normal</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="MenuItem">
-      <name>Droid Sans</name>
-      <size>10</size>
-      <!-- font size in points -->
-      <weight>Normal</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="ActiveOnScreenDisplay">
-      <name>Droid Sans</name>
-      <size>10</size>
-      <!-- font size in points -->
-      <weight>Normal</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="InactiveOnScreenDisplay">
-      <name>Droid Sans</name>
-      <size>10</size>
-      <!-- font size in points -->
-      <weight>Normal</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-  </theme>
-  <desktops>
-    <!-- this stuff is only used at startup, pagers allow you to change them
-       during a session
-
-       these are default values to use when other ones are not already set
-       by other applications, or saved in your session
-
-       use obconf if you want to change these without having to log out
-       and back in -->
-    <number>4</number>
-    <firstdesk>1</firstdesk>
-    <names>
-      <!-- set names up here if you want to, like this:
-    <name>desktop 1</name>
-    <name>desktop 2</name>
-    -->
-    </names>
-    <popupTime>875</popupTime>
-    <!-- The number of milliseconds to show the popup for when switching
-       desktops.  Set this to 0 to disable the popup. -->
-  </desktops>
-  <resize>
-    <drawContents>yes</drawContents>
-    <popupShow>NonPixel</popupShow>
-    <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
-    <popupPosition>Center</popupPosition>
-    <!-- 'Center', 'Top', or 'Fixed' -->
-    <popupFixedPosition>
-      <!-- these are used if popupPosition is set to 'Fixed' -->
-      <x>10</x>
-      <!-- positive number for distance from left edge, negative number for
-         distance from right edge, or 'Center' -->
-      <y>10</y>
-      <!-- positive number for distance from top edge, negative number for
-         distance from bottom edge, or 'Center' -->
-    </popupFixedPosition>
-  </resize>
-  <!-- You can reserve a portion of your screen where windows will not cover when
-     they are maximized, or when they are initially placed.
-     Many programs reserve space automatically, but you can use this in other
-     cases. -->
-  <margins>
-    <top>0</top>
-    <bottom>0</bottom>
-    <left>0</left>
-    <right>0</right>
-  </margins>
-  <dock>
-    <position>TopLeft</position>
-    <!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
-    <floatingX>0</floatingX>
-    <floatingY>0</floatingY>
-    <noStrut>no</noStrut>
-    <stacking>Above</stacking>
-    <!-- 'Above', 'Normal', or 'Below' -->
-    <direction>Vertical</direction>
-    <!-- 'Vertical' or 'Horizontal' -->
-    <autoHide>no</autoHide>
-    <hideDelay>300</hideDelay>
-    <!-- in milliseconds (1000 = 1 second) -->
-    <showDelay>300</showDelay>
-    <!-- in milliseconds (1000 = 1 second) -->
-    <moveButton>Middle</moveButton>
-    <!-- 'Left', 'Middle', 'Right' -->
-  </dock>
-  <keyboard>
-    <chainQuitKey>C-g</chainQuitKey>
-    <!-- Keybindings for desktop switching -->
-    <keybind key="C-A-Left">
-      <action name="GoToDesktop">
-        <to>left</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="C-A-Right">
-      <action name="GoToDesktop">
-        <to>right</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="C-A-Up">
-      <action name="GoToDesktop">
-        <to>up</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="C-A-Down">
-      <action name="GoToDesktop">
-        <to>down</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Left">
-      <action name="SendToDesktop">
-        <to>left</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Right">
-      <action name="SendToDesktop">
-        <to>right</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Up">
-      <action name="SendToDesktop">
-        <to>up</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Down">
-      <action name="SendToDesktop">
-        <to>down</to>
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="W-F1">
-      <action name="GoToDesktop">
-        <to>1</to>
-      </action>
-    </keybind>
-    <keybind key="W-F2">
-      <action name="GoToDesktop">
-        <to>2</to>
-      </action>
-    </keybind>
-    <keybind key="W-F3">
-      <action name="GoToDesktop">
-        <to>3</to>
-      </action>
-    </keybind>
-    <keybind key="W-F4">
-      <action name="GoToDesktop">
-        <to>4</to>
-      </action>
-    </keybind>
-    <keybind key="W-d">
-      <action name="ToggleShowDesktop"/>
-    </keybind>
-    <!-- Keybindings for windows -->
-    <keybind key="A-F4">
-      <action name="Close"/>
-    </keybind>
-    <keybind key="A-Escape">
-      <action name="Lower"/>
-      <action name="FocusToBottom"/>
-      <action name="Unfocus"/>
-    </keybind>
-    <keybind key="A-space">
-      <action name="ShowMenu">
-        <menu>client-menu</menu>
-      </action>
-    </keybind>
-    <!-- Keybindings for window switching -->
-    <keybind key="A-Tab">
-      <action name="NextWindow">
-        <finalactions>
-          <action name="Focus"/>
-          <action name="Raise"/>
-          <action name="Unshade"/>
-        </finalactions>
-      </action>
-    </keybind>
-    <keybind key="A-S-Tab">
-      <action name="PreviousWindow">
-        <finalactions>
-          <action name="Focus"/>
-          <action name="Raise"/>
-          <action name="Unshade"/>
-        </finalactions>
-      </action>
-    </keybind>
-    <keybind key="C-A-Tab">
-      <action name="NextWindow">
-        <panels>yes</panels>
-        <desktop>yes</desktop>
-        <finalactions>
-          <action name="Focus"/>
-          <action name="Raise"/>
-          <action name="Unshade"/>
-        </finalactions>
-      </action>
-    </keybind>
-    <!-- Keybindings for window switching with the arrow keys -->
-    <keybind key="W-S-Right">
-      <action name="DirectionalCycleWindows">
-        <direction>right</direction>
-      </action>
-    </keybind>
-    <keybind key="W-S-Left">
-      <action name="DirectionalCycleWindows">
-        <direction>left</direction>
-      </action>
-    </keybind>
-    <keybind key="W-S-Up">
-      <action name="DirectionalCycleWindows">
-        <direction>up</direction>
-      </action>
-    </keybind>
-    <keybind key="W-S-Down">
-      <action name="DirectionalCycleWindows">
-        <direction>down</direction>
-      </action>
-    </keybind>
-    <!-- Keybindings for running applications -->
-    <keybind key="W-e">
-      <action name="Execute">
-        <startupnotify>
-          <enabled>true</enabled>
-          <name>Konqueror</name>
-        </startupnotify>
-        <command>kfmclient openProfile filemanagement</command>
-      </action>
-    </keybind>
-  </keyboard>
-  <mouse>
-    <dragThreshold>1</dragThreshold>
-    <!-- number of pixels the mouse must move before a drag begins -->
-    <doubleClickTime>500</doubleClickTime>
-    <!-- in milliseconds (1000 = 1 second) -->
-    <screenEdgeWarpTime>400</screenEdgeWarpTime>
-    <!-- Time before changing desktops when the pointer touches the edge of the
-       screen while moving a window, in milliseconds (1000 = 1 second).
-       Set this to 0 to disable warping -->
-    <screenEdgeWarpMouse>false</screenEdgeWarpMouse>
-    <!-- Set this to TRUE to move the mouse pointer across the desktop when
-       switching due to hitting the edge of the screen -->
-    <context name="Frame">
-      <mousebind button="A-Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind button="A-Left" action="Click">
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="A-Left" action="Drag">
-        <action name="Move"/>
-      </mousebind>
-      <mousebind button="A-Right" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="A-Right" action="Drag">
-        <action name="Resize"/>
-      </mousebind>
-      <mousebind button="A-Middle" action="Press">
-        <action name="Lower"/>
-        <action name="FocusToBottom"/>
-        <action name="Unfocus"/>
-      </mousebind>
-      <mousebind button="A-Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="A-Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
-      <mousebind button="C-A-Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="C-A-Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
-      <mousebind button="A-S-Up" action="Click">
-        <action name="SendToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="A-S-Down" action="Click">
-        <action name="SendToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Titlebar">
-<!--
-при �двиге развернутого окна вниз держа за заголовок, оно примет обычный размер
-      <mousebind button="Left" action="Drag">
-        <action name="Move"/>
-      </mousebind>
--->
-      <mousebind button="Left" action="Drag">
-        <action name="If">
-          <maximized>yes</maximized>
-          <then>
-            <action name="Unmaximize"/>
-            <action name="MoveToEdge">
-              <direction>north</direction>
-            </action>
-            <action name="Move"/>
-          </then>
-        </action>
-        <action name="Move"/>
-      </mousebind>
-<!--
-конец в�тавки
--->
-      <mousebind button="Left" action="DoubleClick">
-        <action name="ToggleMaximize"/>
-      </mousebind>
-<!--
-отключение �ворачивани� окна в заголовок при помощи колё�ика
-      <mousebind button="Up" action="Click">
-        <action name="if">
-          <shaded>no</shaded>
-          <then>
-            <action name="Shade"/>
-            <action name="FocusToBottom"/>
-            <action name="Unfocus"/>
-            <action name="Lower"/>
-          </then>
-        </action>
-      </mousebind>
-      <mousebind button="Down" action="Click">
-        <action name="if">
-          <shaded>yes</shaded>
-          <then>
-            <action name="Unshade"/>
-            <action name="Raise"/>
-          </then>
-        </action>
-      </mousebind>
--->
-    </context>
-    <context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="Middle" action="Press">
-        <action name="Lower"/>
-        <action name="FocusToBottom"/>
-        <action name="Unfocus"/>
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Top">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize">
-          <edge>top</edge>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Left">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize">
-          <edge>left</edge>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Right">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize">
-          <edge>right</edge>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Bottom">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize">
-          <edge>bottom</edge>
-        </action>
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="TRCorner BRCorner TLCorner BLCorner">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="Left" action="Drag">
-        <action name="Resize"/>
-      </mousebind>
-    </context>
-    <context name="Client">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind button="Middle" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-    </context>
-    <context name="Icon">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="AllDesktops">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="Left" action="Click">
-        <action name="ToggleOmnipresent"/>
-      </mousebind>
-    </context>
-    <context name="Shade">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind button="Left" action="Click">
-        <action name="ToggleShade"/>
-      </mousebind>
-    </context>
-    <context name="Iconify">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind button="Left" action="Click">
-        <action name="Iconify"/>
-      </mousebind>
-    </context>
-    <context name="Maximize">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="Middle" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="Left" action="Click">
-        <action name="ToggleMaximize"/>
-      </mousebind>
-      <mousebind button="Middle" action="Click">
-        <action name="ToggleMaximize">
-          <direction>vertical</direction>
-        </action>
-      </mousebind>
-      <mousebind button="Right" action="Click">
-        <action name="ToggleMaximize">
-          <direction>horizontal</direction>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Close">
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind button="Left" action="Click">
-        <action name="Close"/>
-      </mousebind>
-    </context>
-    <context name="Desktop">
-<!--
-Отключим �мену рабочих �толов колё�иком мышки
-      <mousebind button="Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
--->
-      <mousebind button="A-Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="A-Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
-      <mousebind button="C-A-Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="C-A-Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
-      <mousebind button="Left" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-    </context>
-    <context name="Root">
-      <!-- Menus -->
-      <mousebind button="Middle" action="Press">
-        <action name="ShowMenu">
-          <menu>client-list-combined-menu</menu>
-        </action>
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="ShowMenu">
-          <menu>root-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="MoveResize">
-      <mousebind button="Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
-      <mousebind button="A-Up" action="Click">
-        <action name="GoToDesktop">
-          <to>previous</to>
-        </action>
-      </mousebind>
-      <mousebind button="A-Down" action="Click">
-        <action name="GoToDesktop">
-          <to>next</to>
-        </action>
-      </mousebind>
-    </context>
-  </mouse>
-  <menu>
-    <!-- You can specify more than one menu file in here and they are all loaded,
-       just don't make menu ids clash or, well, it'll be kind of pointless -->
-    <!-- default menu file (or custom one in $HOME/.config/openbox/) -->
-    <file>menu.xml</file>
-    <hideDelay>200</hideDelay>
-    <!-- if a press-release lasts longer than this setting (in milliseconds), the
-       menu is hidden again -->
-    <middle>no</middle>
-    <!-- center submenus vertically about the parent entry -->
-    <submenuShowDelay>100</submenuShowDelay>
-    <!-- time to delay before showing a submenu after hovering over the parent
-       entry.
-       if this is a negative value, then the delay is infinite and the
-       submenu will not be shown until it is clicked on -->
-    <submenuHideDelay>400</submenuHideDelay>
-    <!-- time to delay before hiding a submenu when selecting another
-       entry in parent menu
-       if this is a negative value, then the delay is infinite and the
-       submenu will not be hidden until a different submenu is opened -->
-    <showIcons>yes</showIcons>
-    <!-- controls if icons appear in the client-list-(combined-)menu -->
-    <manageDesktops>yes</manageDesktops>
-    <!-- show the manage desktops section in the client-list-(combined-)menu -->
-  </menu>
-  <applications>
-    <!--
-  # this is an example with comments through out. use these to make your
-  # own rules, but without the comments of course.
-  # you may use one or more of the name/class/role/title/type rules to specify
-  # windows to match
-
-  <application name="the window's _OB_APP_NAME property (see obxprop)"
-              class="the window's _OB_APP_CLASS property (see obxprop)"
-          groupname="the window's _OB_APP_GROUP_NAME property (see obxprop)"
-         groupclass="the window's _OB_APP_GROUP_CLASS property (see obxprop)"
-               role="the window's _OB_APP_ROLE property (see obxprop)"
-              title="the window's _OB_APP_TITLE property (see obxprop)"
-               type="the window's _OB_APP_TYPE property (see obxprob)..
-                      (if unspecified, then it is 'dialog' for child windows)">
-  # you may set only one of name/class/role/title/type, or you may use more
-  # than one together to restrict your matches.
-
-  # the name, class, role, and title use simple wildcard matching such as those
-  # used by a shell. you can use * to match any characters and ? to match
-  # any single character.
-
-  # the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
-  #    or desktop
-
-  # when multiple rules match a window, they will all be applied, in the
-  # order that they appear in this list
-
-
-    # each rule element can be left out or set to 'default' to specify to not 
-    # change that attribute of the window
-
-    <decor>yes</decor>
-    # enable or disable window decorations
-
-    <shade>no</shade>
-    # make the window shaded when it appears, or not
-
-    <position force="no">
-      # the position is only used if both an x and y coordinate are provided
-      # (and not set to 'default')
-      # when force is "yes", then the window will be placed here even if it
-      # says you want it placed elsewhere.  this is to override buggy
-      # applications who refuse to behave
-      <x>center</x>
-      # a number like 50, or 'center' to center on screen. use a negative number
-      # to start from the right (or bottom for <y>), ie -50 is 50 pixels from
-      # the right edge (or bottom). use 'default' to specify using value
-      # provided by the application, or chosen by openbox, instead.
-      <y>200</y>
-      <monitor>1</monitor>
-      # specifies the monitor in a xinerama setup.
-      # 1 is the first head, or 'mouse' for wherever the mouse is
-    </position>
-
-    <size>
-      # the size to make the window.
-      <width>20</width>
-      # a number like 20, or 'default' to use the size given by the application.
-      # you can use fractions such as 1/2 or percentages such as 75% in which
-      # case the value is relative to the size of the monitor that the window
-      # appears on.
-      <height>30%</height>
-    </size>
-
-    <focus>yes</focus>
-    # if the window should try be given focus when it appears. if this is set
-    # to yes it doesn't guarantee the window will be given focus. some
-    # restrictions may apply, but Openbox will try to
-
-    <desktop>1</desktop>
-    # 1 is the first desktop, 'all' for all desktops
-
-    <layer>normal</layer>
-    # 'above', 'normal', or 'below'
-
-    <iconic>no</iconic>
-    # make the window iconified when it appears, or not
-
-    <skip_pager>no</skip_pager>
-    # asks to not be shown in pagers
-
-    <skip_taskbar>no</skip_taskbar>
-    # asks to not be shown in taskbars. window cycling actions will also
-    # skip past such windows
-
-    <fullscreen>yes</fullscreen>
-    # make the window in fullscreen mode when it appears
-
-    <maximized>true</maximized>
-    # 'Horizontal', 'Vertical' or boolean (yes/no)
-  </application>
-
-  # end of the example
--->
-  </applications>
-</openbox_config>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
deleted file mode 100644
index f4c60855b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-xfce = 4.10
-
-[update]
-xfce = on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
deleted file mode 100644
index adb6aff8f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(xfce-base/xfdesktop)!=&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.10 
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
deleted file mode 100644
index a8b6e2d2d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba
-[Configuration]
-MiscSingleClick=TRUE
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
deleted file mode 100644
index 0faee5229..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate link=/usr/share/applications/pidgin.desktop mirror env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=&&ur_jid!=
-[Desktop Entry]
-Hidden=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
deleted file mode 100644
index b8ca220dd..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=false
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
deleted file mode 100644
index 567306725..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
deleted file mode 100644
index b01a3a543..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-    <Name>Xfce</Name>
-    
-    <DefaultAppDirs/>
-    <DefaultDirectoryDirs/>
-    
-    <Include>
-        <Category>X-Xfce-Toplevel</Category>
-    </Include>
-
-    <Exclude>
-        <Filename>exo-terminal-emulator.desktop</Filename>
-        <Filename>exo-file-manager.desktop</Filename>
-        <Filename>exo-web-browser.desktop</Filename>
-        <Filename>exo-mail-reader.desktop</Filename>
-        <Filename>xfce4-about.desktop</Filename>
-    </Exclude>
-
-    <Layout>
-        <Merge type="all"/>
-        <Menuname>Settings</Menuname>
-        <Separator/>
-        <Filename>xfce4-run.desktop</Filename>
-        <Filename>xfce4-session-logout.desktop</Filename>
-    </Layout>
-
-    <Menu>
-        <Name>Settings</Name>
-        <Directory>xfce-settings.directory</Directory>
-        <Include>
-            <Category>Settings</Category>
-        </Include>
-        
-        <Layout>
-            <Filename>xfce-settings-manager.desktop</Filename>
-        </Layout>
-    </Menu>
-    
-    <Menu>
-        <Name>Accessories</Name>
-        <Directory>xfce-accessories.directory</Directory>
-        <Include>
-            <Or>
-                <Category>Accessibility</Category>
-                <Category>Core</Category>
-                <Category>Legacy</Category>
-                <Category>Utility</Category>
-            </Or>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Development</Name>
-        <Directory>xfce-development.directory</Directory>
-        <Include>
-            <Category>Development</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Education</Name>
-        <Directory>xfce-education.directory</Directory>
-        <Include>
-            <Category>Education</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Games</Name>
-        <Directory>xfce-games.directory</Directory>
-        <Include>
-            <Category>Game</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Graphics</Name>
-        <Directory>xfce-graphics.directory</Directory>
-        <Include>
-            <Category>Graphics</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Multimedia</Name>
-        <Directory>xfce-multimedia.directory</Directory>
-        <Include>
-            <Category>Audio</Category>
-            <Category>Video</Category>
-            <Category>AudioVideo</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Network</Name>
-        <Directory>xfce-network.directory</Directory>
-        <Include>
-            <Category>Network</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Office</Name>
-        <Directory>xfce-office.directory</Directory>
-        <Include>
-            <Category>Office</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>System</Name>
-        <Directory>xfce-system.directory</Directory>
-        <OnlyUnallocated/>
-        <Include>
-            <Category>System</Category>
-        </Include>
-    </Menu>
-    
-    <Menu>
-        <Name>Other</Name>
-        <Directory>xfce-other.directory</Directory>
-        <OnlyUnallocated/>
-        <Include>
-            <All/>
-        </Include>
-    </Menu>
-    
-</Menu>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
deleted file mode 100644
index a9462b894..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
+++ /dev/null
@@ -1,8 +0,0 @@
-0.2.16
-600
-400
-Droid Sans Mono Slashed 10
-1
-0
-0
-0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
deleted file mode 100644
index 1912981fb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-# Calculate format=samba append=replace
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-[Calculate Linux Install]
-row=1
-col=0
-
-[GParted]
-row=1
-col=1
-
-#?os_locale_language!=ru&&os_locale_language!=bg#
-[Installation Guide]
-#os_locale_language#
-#?os_locale_language==ru#
-[Руковод�тво по у�тановке]
-#os_locale_language#
-#?os_locale_language==bg#
-[Ръковод�тво за ин�талиране]
-#os_locale_language#
-row=2
-col=0
-
-[Calculate Linux Community]
-row=2
-col=1
-
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-[Home]
-row=0
-col=0
-
-[Share]
-row=0
-col=1
-
-[FTP]
-row=0
-col=2
-#env#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
deleted file mode 100644
index 78c13536a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=procmail
-#?pkg(www-client/opera)!=#
-WebBrowser=opera-browser
-#pkg#
-#?pkg(www-client/firefox)!=#
-WebBrowser=firefox
-#pkg#
-#?pkg(www-client/chromium)!=#
-WebBrowser=chromium-browser-chromium
-#pkg#
-#?pkg(www-client/qupzilla)!=#
-WebBrowser=qupzilla
-#pkg#
-
-FileManager=Thunar
-
-#?pkg(mail-client/thunderbird)!=#
-MailReader=thunderbird
-#pkg#
-#?pkg(mail-client/evolution)!=#
-MailReader=evolution
-#pkg#
-#?pgk(mail-client/claws-mail)!=||pkg(mail-client/sylpheed)!=#
-MailReader=sylpheed-claws
-#pkg#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
deleted file mode 100644
index fd2387746..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-layout=3
-date_font=Droid Sans 8
-time_font=Droid Sans 22
-date_format=%Y-%m-%d
-time_format=%H:%M
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
deleted file mode 100644
index cbd772570..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-browser.desktop)!= link=/usr/share/applications/calculate-browser.desktop name=10000000030.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
deleted file mode 100644
index 26fcecdc7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-mail.desktop)!= link=/usr/share/applications/calculate-mail.desktop name=10000000031.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
deleted file mode 100644
index 94e80022e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-chat.desktop)!= link=/usr/share/applications/calculate-chat.desktop name=10000000032.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
deleted file mode 100644
index babdad5b0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-im.desktop)!= link=/usr/share/applications/calculate-im.desktop name=10000000033.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
deleted file mode 100644
index 0f8ee7343..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-writer.desktop)!= link=/usr/share/applications/calculate-writer.desktop name=10000000034.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
deleted file mode 100644
index 2eaf1ddd3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-calc.desktop)!= link=/usr/share/applications/calculate-calc.desktop name=10000000035.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
deleted file mode 100644
index 306f0d87a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-calculator.desktop)!= link=/usr/share/applications/calculate-calculator.desktop name=10000000036.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
deleted file mode 100644
index a42cc6784..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-imageedit.desktop)!= link=/usr/share/applications/calculate-imageedit.desktop name=10000000037.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
deleted file mode 100644
index cc5b57089..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-photomanager.desktop)!= link=/usr/share/applications/calculate-photomanager.desktop name=10000000038.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
deleted file mode 100644
index 1e65abba9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-audioplayer.desktop)!= link=/usr/share/applications/calculate-audioplayer.desktop name=10000000039.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
deleted file mode 100644
index c5e50843c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-videoplayer.desktop)!= link=/usr/share/applications/calculate-videoplayer.desktop name=10000000040.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
deleted file mode 100644
index 315caeb1f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate hr_cdrom_set==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
deleted file mode 100644
index 5f386c405..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-imageburn.desktop)!= link=/usr/share/applications/calculate-imageburn.desktop name=10000000041.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
deleted file mode 100644
index 26ae5c176..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-textedit.desktop)!= link=/usr/share/applications/calculate-textedit.desktop name=10000000043.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
deleted file mode 100644
index 422b1a123..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/usr/share/applications/calculate-terminal.desktop)!= link=/usr/share/applications/calculate-terminal.desktop name=10000000044.desktop symbolic force
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
deleted file mode 100644
index be8ac6135..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate name=10000000007.desktop
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Lock Screen
-Name[ru]=Блокирование �еан�а
-Comment=
-Exec=xflock4
-Icon=system-lock-screen
-Path=
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
deleted file mode 100644
index 0285d31ca..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-display_type=1
-group_policy=2
-default_group=0
-never_modify_config=false
-model=pc104
-layouts=#-os_locale_xkbname-#
-variants=,
-#?os_locale_language==us#
-toggle_option=
-#os_locale_language#
-#?os_locale_language!=us#
-toggle_option=grp:caps_toggle,grp_led:scroll
-#os_locale_language#
-compose_key_position=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
deleted file mode 100644
index 15e403e79..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate comment=#
-creenshot_dir=file:#-ini(resource.pictures)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/3.4.4.6/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/3.4.4.6/.calculate_directory
deleted file mode 100644
index 5c085d285..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/3.4.4.6/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_ver>=3.4.4.6
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/3.4.4.6/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/3.4.4.6/xfce4-panel.xml
deleted file mode 100644
index 6f9ece985..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/3.4.4.6/xfce4-panel.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="panels" type="uint" value="2">
-    <property name="panel-0" type="empty">
-      <property name="position" type="string" value="p=6;x=0;y=0"/>
-      <property name="size" type="uint" value="32"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="1"/>
-#?env(client.os_remote_auth)==||ur_domain_set==off#	
-        <value type="int" value="20"/>
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-        <value type="int" value="21"/>
-        <value type="int" value="22"/>
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=#
-        <value type="int" value="23"/>
-#env#
-        <value type="int" value="4"/>
-        <value type="int" value="8"/>
-        <value type="int" value="3"/>
-        <value type="int" value="12"/>
-        <value type="int" value="9"/>
-        <value type="int" value="6"/>
-        <value type="int" value="10"/>
-        <value type="int" value="5"/>
-        <value type="int" value="7"/>
-        <value type="int" value="2"/>
-      </property>
-      <property name="background-alpha" type="uint" value="95"/>
-    </property>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=10;x=0;y=0"/>
-      <property name="size" type="uint" value="56"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-#?exists(~/.config/xfce4/panel/launcher-30/10000000030.desktop)!=#
-        <value type="int" value="30"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-31/10000000031.desktop)!=#
-        <value type="int" value="31"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-32/10000000032.desktop)!=#
-        <value type="int" value="32"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-33/10000000033.desktop)!=#
-        <value type="int" value="33"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-34/10000000034.desktop)!=#
-        <value type="int" value="34"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-35/10000000035.desktop)!=#
-        <value type="int" value="35"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-36/10000000036.desktop)!=#
-	<value type="int" value="36"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-37/10000000037.desktop)!=#
-        <value type="int" value="37"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-38/10000000038.desktop)!=#
-        <value type="int" value="38"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-39/10000000039.desktop)!=#
-        <value type="int" value="39"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-40/10000000040.desktop)!=#
-        <value type="int" value="40"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-41/10000000041.desktop)!=#
-        <value type="int" value="41"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-43/10000000043.desktop)!=#
-        <value type="int" value="43"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-44/10000000044.desktop)!=#
-        <value type="int" value="44"/>
-#exists#
-      </property>
-      <property name="length" type="uint" value="10"/>
-      <property name="autohide" type="bool" value="true"/>
-      <property name="background-alpha" type="uint" value="95"/>
-    </property>
-  </property>
-  <property name="plugins" type="empty">
-    <property name="plugin-1" type="string" value="applicationsmenu">
-      <property name="show-button-title" type="bool" value="false"/>
-#?pkg(x11-themes/calculate-icon-theme)<14-r6#
-      <property name="button-icon" type="string" value="start-calculate"/>
-#pkg#
-    </property>
-    <property name="plugin-2" type="string" value="actions">
-      <property name="appearance" type="uint" value="0"/>
-      <property name="items" type="array">
-        <value type="string" value="+logout"/>
-      </property>
-    </property>
-    <property name="plugin-3" type="string" value="tasklist">
-      <property name="flat-buttons" type="bool" value="true"/>
-      <property name="sort-order" type="uint" value="4"/>
-      <property name="window-scrolling" type="bool" value="false"/>
-      <property name="middle-click" type="uint" value="1"/>
-    </property>
-    <property name="plugin-4" type="string" value="pager"/>
-    <property name="plugin-5" type="string" value="datetime"/>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="plugin-7" type="string" value="showdesktop"/>
-      <property name="names-visible" type="array">
-        <value type="string" value="апплет networkmanager"/>
-        <value type="string" value="blueman-applet"/>
-      </property>
-      <property name="size-max" type="uint" value="24"/>
-    </property>
-    <property name="plugin-8" type="string" value="showdesktop"/>
-    <property name="plugin-9" type="string" value="thunar-tpa"/>
-#?os_locale_lat_set==off#
-    <property name="plugin-10" type="string" value="xkb-plugin"/>
-#os_locale_lat_set#
-    <property name="plugin-7" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000007.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-20" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#"/>
-      <property name="icon-name" type="string" value="folder_home"/>
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-21" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#/Home"/>
-      <property name="icon-name" type="string" value="folder_home"/>
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-22" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#/Share"/>
-      <property name="icon-name" type="string" value="gnome-fs-share"/>
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-23" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#/FTP"/>
-#?pkg(x11-themes/elementary-icon-theme)!=#
-      <property name="icon-name" type="string" value="folder-download"/>
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)==#
-      <property name="icon-name" type="string" value="zen-icon"/>
-#pkg#
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-30" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000030.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-31" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000031.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-32" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000032.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-33" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000033.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-34" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000034.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-35" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000035.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-36" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000036.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-37" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000037.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-38" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000038.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-39" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000039.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-40" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000040.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-41" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000041.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-43" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000043.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-44" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000044.desktop"/>
-      </property>
-    </property>
-    <property name="clipman" type="empty">
-      <property name="settings" type="empty">
-        <property name="add-primary-clipboard" type="bool" value="false"/>
-	<property name="history-ignore-primary-clipboard" type="bool" value="false"/>
-      </property>
-    </property>
-    <property name="plugin-12" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
deleted file mode 100644
index a7dfad232..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="keyboards" version="1.0">
-  <property name="Default" type="empty">
-#?hr_laptop==#
-    <property name="Numlock" type="bool" value="true"/>
-#hr_laptop#
-#?hr_laptop!=#
-    <property name="Numlock" type="bool" value="false"/>
-#hr_laptop#
-    <property name="KeyRepeat" type="empty">
-      <property name="Rate" type="int" value="30"/>
-      <property name="Delay" type="int" value="330"/>
-      </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
deleted file mode 100644
index aa08d3485..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="thunar" version="1.0">
-  <property name="misc-single-click-timeout" type="uint" value="0"/>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
deleted file mode 100644
index ebddbbb49..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-desktop" version="1.0">
-  <property name="desktop-icons" type="empty">
-    <property name="file-icons" type="empty">
-      <property name="show-trash" type="bool" value="false"/>
-      <property name="show-removable" type="bool" value="false"/>
-      <property name="show-filesystem" type="bool" value="false"/>
-#?env(client.os_remote_auth)==||ur_domain_set==off#
-      <property name="show-home" type="bool" value="true"/>
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-      <property name="show-home" type="bool" value="false"/>
-#env#
-    </property>
-    <property name="icon-size" type="uint" value="48"/>
-    <property name="single-click" type="bool" value="true"/>
-  </property>
-  <property name="backdrop" type="empty">
-    <property name="screen0" type="empty">
-      <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-#"/>
-      </property>
-    </property>
-  </property>
-  <property name="desktop-menu" type="empty">
-    <property name="show" type="bool" value="false"/>
-    <property name="show-icons" type="bool" value="false"/>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index 0732b1d45..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="Scroll_Lock" type="string" value="xflock4"/>
-      <property name="Print" type="string" value="xfce4-screenshooter -f"/>
-      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
-      <property name="&lt;Shift&gt;&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout --logout"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
-      <property name="XF86Search" type="string" value="xdg-open /usr/share/applications/catfish.desktop"/>
-      <property name="XF86Tools" type="string" value="xdg-open /usr/share/applications/calculate-audioplayer.desktop"/>
-      <property name="XF86Calculator" type="string" value="xdg-open /usr/share/applications/calculate-calculator.desktop"/>
-      #?pkg(x11-misc/wmctrl)!=#
-      <property name="XF86HomePage" type="string" value="wmctrl -s 0"/>
-      #pkg#
-      <property name="XF86Display" type="string" value=""/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
deleted file mode 100644
index ec6a287f6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-notifyd" version="1.0">
-  <property name="expire-timeout" type="int" value="2"/>
-  <property name="theme" type="string" value="lightdm-calculate"/>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
deleted file mode 100644
index 9498b0be4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-# Calculate format=xml_xfce cl_ver<3.4.4.6
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="panels" type="uint" value="2">
-    <property name="panel-0" type="empty">
-      <property name="position" type="string" value="p=6;x=0;y=0"/>
-      <property name="size" type="uint" value="32"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="1"/>
-#?env(client.os_remote_auth)==||ur_domain_set==off#	
-        <value type="int" value="20"/>
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on#
-        <value type="int" value="21"/>
-        <value type="int" value="22"/>
-#env#
-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=#
-        <value type="int" value="23"/>
-#env#
-        <value type="int" value="4"/>
-        <value type="int" value="8"/>
-        <value type="int" value="3"/>
-        <value type="int" value="12"/>
-        <value type="int" value="9"/>
-        <value type="int" value="6"/>
-        <value type="int" value="10"/>
-        <value type="int" value="5"/>
-        <value type="int" value="7"/>
-        <value type="int" value="2"/>
-      </property>
-      <property name="background-alpha" type="uint" value="95"/>
-    </property>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=10;x=0;y=0"/>
-      <property name="size" type="uint" value="56"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-#?exists(~/.config/xfce4/panel/launcher-30/10000000030.desktop)!=#
-        <value type="int" value="30"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-31/10000000031.desktop)!=#
-        <value type="int" value="31"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-32/10000000032.desktop)!=#
-        <value type="int" value="32"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-33/10000000033.desktop)!=#
-        <value type="int" value="33"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-34/10000000034.desktop)!=#
-        <value type="int" value="34"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-35/10000000035.desktop)!=#
-        <value type="int" value="35"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-36/10000000036.desktop)!=#
-	<value type="int" value="36"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-37/10000000037.desktop)!=#
-        <value type="int" value="37"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-38/10000000038.desktop)!=#
-        <value type="int" value="38"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-39/10000000039.desktop)!=#
-        <value type="int" value="39"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-40/10000000040.desktop)!=#
-        <value type="int" value="40"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-41/10000000041.desktop)!=#
-        <value type="int" value="41"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-43/10000000043.desktop)!=#
-        <value type="int" value="43"/>
-#exists#
-#?exists(~/.config/xfce4/panel/launcher-44/10000000044.desktop)!=#
-        <value type="int" value="44"/>
-#exists#
-      </property>
-      <property name="length" type="uint" value="10"/>
-      <property name="autohide" type="bool" value="true"/>
-      <property name="background-alpha" type="uint" value="95"/>
-    </property>
-  </property>
-  <property name="plugins" type="empty">
-    <property name="plugin-1" type="string" value="applicationsmenu">
-      <property name="show-button-title" type="bool" value="false"/>
-#?pkg(x11-themes/calculate-icon-theme)<14-r6#
-      <property name="button-icon" type="string" value="start-calculate"/>
-#pkg#
-    </property>
-    <property name="plugin-2" type="string" value="actions">
-      <property name="appearance" type="uint" value="0"/>
-      <property name="items" type="array">
-        <value type="string" value="+logout"/>
-      </property>
-    </property>
-    <property name="plugin-3" type="string" value="tasklist">
-      <property name="flat-buttons" type="bool" value="true"/>
-      <property name="sort-order" type="uint" value="1"/>
-      <property name="window-scrolling" type="bool" value="false"/>
-    </property>
-    <property name="plugin-4" type="string" value="pager"/>
-    <property name="plugin-5" type="string" value="datetime"/>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="plugin-7" type="string" value="showdesktop"/>
-      <property name="names-visible" type="array">
-        <value type="string" value="апплет networkmanager"/>
-        <value type="string" value="blueman-applet"/>
-      </property>
-      <property name="size-max" type="uint" value="24"/>
-    </property>
-    <property name="plugin-8" type="string" value="showdesktop"/>
-    <property name="plugin-9" type="string" value="thunar-tpa"/>
-    <property name="plugin-10" type="string" value="xkb-plugin"/>
-    <property name="plugin-7" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000007.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-20" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#"/>
-      <property name="icon-name" type="string" value="folder_home"/>
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-21" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#/Home"/>
-      <property name="icon-name" type="string" value="folder_home"/>
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-22" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#/Share"/>
-      <property name="icon-name" type="string" value="gnome-fs-share"/>
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-23" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/#-ur_login-#/FTP"/>
-#?pkg(x11-themes/elementary-icon-theme)!=#
-      <property name="icon-name" type="string" value="folder-download"/>
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)==#
-      <property name="icon-name" type="string" value="zen-icon"/>
-#pkg#
-      <property name="hidden-files" type="bool" value="false"/>
-      <property name="file-pattern" type="string" value="*"/>
-    </property>
-    <property name="plugin-30" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000030.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-31" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000031.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-32" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000032.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-33" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000033.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-34" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000034.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-35" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000035.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-36" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000036.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-37" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000037.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-38" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000038.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-39" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000039.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-40" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000040.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-41" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000041.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-43" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000043.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-44" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="10000000044.desktop"/>
-      </property>
-    </property>
-    <property name="clipman" type="empty">
-      <property name="settings" type="empty">
-        <property name="add-primary-clipboard" type="bool" value="false"/>
-	<property name="history-ignore-primary-clipboard" type="bool" value="false"/>
-      </property>
-    </property>
-    <property name="plugin-12" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
deleted file mode 100644
index 26143fba2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-session" version="1.0">
-  <property name="xfce4-power-manager" type="empty">
-    <property name="power-button-action" type="uint" value="3"/>
-    <property name="lid-action-on-battery" type="uint" value="1"/>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
deleted file mode 100644
index fab8c38b2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-session" version="1.0">
-  <property name="general" type="empty">
-    <property name="FailsafeSessionName" type="empty"/>
-    <property name="SessionName" type="string" value="Default"/>
-    <property name="SaveOnExit" type="bool" value="false"/>
-  </property>
-  <property name="sessions" type="empty">
-    <property name="Failsafe" type="empty">
-      <property name="IsFailsafe" type="empty"/>
-      <property name="Count" type="empty"/>
-      <property name="Client0_Command" type="empty"/>
-      <property name="Client0_PerScreen" type="empty"/>
-      <property name="Client1_Command" type="empty"/>
-      <property name="Client1_PerScreen" type="empty"/>
-      <property name="Client2_Command" type="empty"/>
-      <property name="Client2_PerScreen" type="empty"/>
-      <property name="Client3_Command" type="empty"/>
-      <property name="Client3_PerScreen" type="empty"/>
-      <property name="Client4_Command" type="empty"/>
-      <property name="Client4_PerScreen" type="empty"/>
-    </property>
-  </property>
-  <property name="splash" type="empty">
-    <property name="Engine" type="empty"/>
-  </property>
-  <property name="shutdown" type="empty">
-    <property name="LockScreen" type="bool" value="true"/>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
deleted file mode 100644
index 9bc9cf6f5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfwm4" version="1.0">
-  <property name="general" type="empty">
-    <property name="button_layout" type="string" value="O|HMC"/>
-    <property name="mousewheel_rollup" type="bool" value="false"/>
-    <property name="move_opacity" type="int" value="90"/>
-    <property name="placement_ratio" type="int" value="10"/>
-    <property name="resize_opacity" type="int" value="90"/>
-    <property name="scroll_workspaces" type="bool" value="false"/>
-    <property name="show_frame_shadow" type="bool" value="true"/>
-    <property name="show_popup_shadow" type="bool" value="true"/>
-    <property name="snap_to_windows" type="bool" value="true"/>
-    <property name="title_alignment" type="string" value="left"/>
-    <property name="title_font" type="string" value="Droid Sans Bold 10"/>
-    <property name="tile_on_move" type="bool" value="false"/>
-    <property name="use_compositing" type="bool" value="true"/>
-    <property name="wrap_windows" type="bool" value="true"/>
-    <property name="wrap_resistance" type="int" value="50"/>
-#?pkg(x11-themes/xfwm4-themes)!=#
-    <property name="theme" type="string" value="Default-4.6"/>
-#pkg#
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index cbcb71001..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calculate format=xml_xfce
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Net" type="empty">
-#?main.os_linux_ver>=13#
-    <property name="ThemeName" type="string" value="Calculate"/>
-#main.os_linux_ver#
-#?main.os_linux_ver<13#
-    <property name="ThemeName" type="string" value="Adwaita"/>
-#main.os_linux_ver#
-    <property name="IconThemeName" type="string" value="Calculate"/>
-    <property name="DoubleClickTime" type="int" value="600"/>
-  </property>
-  <property name="Xft" type="empty">
-    <property name="Antialias" type="int" value="1"/>
-    <property name="HintStyle" type="string" value="hintmedium"/>
-  </property>
-  <property name="Gtk" type="empty">
-    <property name="FontName" type="string" value="Droid Sans 10"/>
-    <property name="CursorThemeName" type="string" value="Calculate"/>
-    <property name="IconSizes" type="string" value="panel-applications-menu=22,22:gtk-menu=22,22:panel-directory=22,22:panel-directory-menu=22,22"/>
-  </property>
-</channel>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
deleted file mode 100644
index f21f14d08..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=compiz link=/usr/share/applications/Thunar.desktop mirror
-[Desktop Entry]
-#�мена категории
-Categories=System;
-Icon=system-file-manager
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
deleted file mode 100644
index 12db8d9a1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gparted.desktop mirror
-[Desktop Entry]
-#?os_root_type==livecd#
-Exec=sudo /usr/sbin/gparted %f
-#os_root_type#
-#?os_root_type!=livecd#
-Exec=gksu /usr/sbin/gparted %f
-#os_root_type#
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
deleted file mode 100644
index 28c035b3b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/xfce-keyboard-settings.desktop mirror
-[Desktop Entry]
-#�мена иконки
-Icon=preferences-desktop-keyboard-shortcuts
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
deleted file mode 100644
index 0c791669a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/xfce4-about.desktop mirror
-[Desktop Entry]
-#�мена иконки
-Icon=help-browser
-Categories=X-XFCE;X-Xfce-Toplevel;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
deleted file mode 100644
index 6209d349e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/xfce4-run.desktop mirror
-[Desktop Entry]
-#�мена иконки
-Icon=player_play
-Categories=X-XFCE;X-Xfce-Toplevel;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
deleted file mode 100644
index 89bb70bcf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=compiz link=/usr/share/applications/xfce4-taskmanager.desktop mirror
-[Desktop Entry]
-# �мена категории
-Categories=System;
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
deleted file mode 100644
index eeb9cc61f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde link=/usr/share/desktop-directories/xfce-accessories.directory mirror
-
-[Desktop Entry]
-Name=Utilities
-Name[de]=Dienstprogramme
-Name[es]=Utilidades
-Name[fr]=Utilitaires
-Name[it]=Accessori
-Name[pl]=Narzędzia
-Name[pt_BR]=Utilitários
-Name[ru]=Служебные
-Name[uk]=Утиліти
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
deleted file mode 100644
index ef163de22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde link=/usr/share/desktop-directories/xfce-multimedia.directory mirror
-[Desktop Entry]
-Name[ru]=Мультимеди�
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
deleted file mode 100644
index 08e9c0ca2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=kde link=/usr/share/desktop-directories/xfce-network.directory mirror
-[Desktop Entry]
-Name[ru]=Интернет
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
deleted file mode 100644
index 20023aae7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=compiz pkg(www-client/chromium)!= link=/usr/share/applications/chromium-browser-chromium.desktop mirror
-[Desktop Entry]
-#поддержка вызова /usr/lib64/xfce4/exo-1/exo-helper-1 --launch WebBrowser
-Type=X-XFCE-Helper
-X-XFCE-Category=WebBrowser
-X-XFCE-Commands=chromium-browser
-X-XFCE-CommandsWithParameter=chromium-browser "%s"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
deleted file mode 100644
index 8522a5b08..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=patch exists(/etc/mime.types)!= link=/etc/mime.types force mirror
-<reg>(\n|\A)#.*</reg>
-<text></text>
-<reg>(\n|\A)\s*(?=\n)</reg>
-<text></text>
-<reg>\A\s*\n</reg>
-<text></text>
-<reg>((?:\n|\A)\S+).*</reg>
-<text>\1; xdg-open '%s'</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
deleted file mode 100644
index 879d99897..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
deleted file mode 100644
index 73aeb737d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=FTP
-Comment=Browser FTP
-Categories=Application;
-Exec=thunar /home/#-ur_login-#/FTP
-#?pkg(x11-themes/elementary-icon-theme)!=#
-Icon=folder-download
-#pkg#
-#?pkg(x11-themes/elementary-icon-theme)==#
-Icon=update-manager
-#pkg#
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
deleted file mode 100644
index 74f89cc67..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on append=replace
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Home
-Comment=Browser Home
-Categories=Application;
-Exec=thunar /home/#-ur_login-#/Home
-Icon=user-home
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
deleted file mode 100644
index 3e286ae40..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate chmod=755 os_root_type==livecd
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name[bg]=Ръковод�тво за ин�талиране
-Name[ru]=Руковод�тво по у�тановке
-Name=Installation Guide
-Comment=
-Categories=Application;
-#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
-#os_locale_language#
-#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)==0#
-Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
-#os_locale_language#
-
-#?os_locale_language==ru&&pkg(www-client/chromium)>0#
-Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
-#os_locale_language#
-Icon=help-contents
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
deleted file mode 100644
index 6b4240bd9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate chmod=755 format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Application
-Name=Share
-Comment=Browser Share
-Categories=Application;
-Exec=thunar /home/#-ur_login-#/Share
-Icon=folder-remote
-Terminal=false
-StartupNotify=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
deleted file mode 100644
index c58ec7438..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/calculate-chat.desktop mirror os_root_type==livecd
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
deleted file mode 100644
index b65a60076..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/cl-console-gui-install.desktop os_root_type==livecd mirror
-[Desktop Entry]
-NoDisplay=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
deleted file mode 100644
index fadd87f4d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate chmod=755 format=kde link=/usr/share/applications/gparted.desktop mirror os_root_type==livecd
-[Desktop Entry]
-Exec=sudo /usr/sbin/gparted %f
-!OnlyShowIn=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
deleted file mode 100644
index c2b079cfa..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env(client.os_remote_auth)==&&ini(domain)!=#-env(client.os_remote_auth)-#||ur_domain_set==off&&ini(domain)!=#-env(client.os_remote_auth)-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.dmrc b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
deleted file mode 100644
index 7e51bf660..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=~ pkg(lxde-base/lxdm)== name=.dmrc append=remove merge(sys-apps/calculate-utils)!=
-# To delete a file necessary when changing the system
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
deleted file mode 100644
index 79174a08d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=~ pkg(lxde-base/lxdm)!=&&pkg(xfce-base/xfce4-session)!= name=.dmrc merge(sys-apps/calculate-utils)!=
-
-[Desktop]
-Session=xfce
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
deleted file mode 100644
index 171de1f86..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env(client.os_remote_auth)!=&&ur_domain_set==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
deleted file mode 100644
index feea6d99a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate env=client format=samba path=~/.calculate
-
-[main]
-domain = #-os_remote_auth-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/ini.env
deleted file mode 100644
index cc37f7177..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/ini.env
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=samba path=~/.calculate 
-
-[main]
-resolution = #-os_x11_standart-#
-xsession = #-cl_desktop_xsession-#
-elog = #-elog()-#
-#?cl_ebuild_phase==#
-!profile_setup =
-#cl_ebuild_phase#
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
deleted file mode 100644
index f970baeff..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env(client.os_remote_auth)==||ur_domain_set==off
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
deleted file mode 100644
index e2850fcf8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=~/.calculate
-
-[main]
-domain = 
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
deleted file mode 100644
index 3a4723d00..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/lib name=AccountsService chmod=0755 chown=root:root merge()!=&&pkg()>=1.6.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
deleted file mode 100644
index 6525634ba..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/var/calculate/remote/share/faces/#-ur_login-#.face,root)!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
deleted file mode 100644
index 3f6ef4252..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=#-ur_login-# link=/var/calculate/remote/share/faces/#-ur_login-#.face mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
deleted file mode 100644
index d1d6c096b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kde name=#-ur_login-#
-[User]
-#?exists(/var/calculate/remote/share/faces/#-ur_login-#.face,root)!=#
-Icon=/var/lib/AccountsService/icons/#-ur_login-#
-#exists#
-SystemAccount=false
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
deleted file mode 100644
index e9bc357c4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate exec=/bin/bash
-
-# перезапу�к accounts-daemon
-/usr/bin/pkill -f accounts-daemon
-:
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
deleted file mode 100644
index 48dadaae2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share name=sddm chmod=0755 chown=root:root merge()!=&&pkg()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
deleted file mode 100644
index d1266f7be..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate exists(/var/calculate/remote/share/faces/#-ur_login-#.face,root)!= chmod=0755 chown=root:root
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
deleted file mode 100644
index 21aae82ae..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=#-ur_login-#.face.icon link=/var/calculate/remote/share/faces/#-ur_login-#.face mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
deleted file mode 100644
index e842777c5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip exists(#-ur_home_path-#/.face,root)!= chmod=0755 chown=root:root
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
deleted file mode 100644
index 579cffac5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=#-ur_login-# path=/var/lib/AccountsService/icons link=#-ur_home_path-#/.face mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/README-eng.txt
deleted file mode 100644
index 228e706c0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/README-eng.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=skip
-
-The ac_desktop_profile event:
-- package installation
-- user profile configuration
-
-Action: package configuration within a user profile
-env: desktop
diff --git a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_desktop_profile/README-rus.txt
deleted file mode 100644
index 5df453649..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_desktop_profile/README-rus.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=skip
-
-Событие ac_desktop_profile:
-- у�тановка пакета
-- на�тройка профил� пользовател�
-
-Дей�твие: на�тройка пакета в профиле пользовател�
-env: desktop
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_configure/.calculate_directory
deleted file mode 100644
index 986581c87..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install ac_install_configure==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_install_configure/README-eng.txt
deleted file mode 100644
index e9f97dbec..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-ac_install_configure event:
-- System setup with 'cl-setup-*'
-
-Action: calling templates for system configuration
-env: install 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_install_configure/README-rus.txt
deleted file mode 100644
index 82e15c45b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/README-rus.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_configure:
-- на�тройка �и�темы при помощи утилит 'cl-setup-*'
-
-Дей�твие: Вызовы шаблонов на�тройки компонентов �и�темы
-env: install
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/audio b/profiles/templates/deprecated/3.4/6_ac_install_configure/audio
deleted file mode 100644
index 091256b6f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/audio
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge=media-sound/alsa-utils,media-sound/pulseaudio,kde-plasma/plasma-pa,kde-apps/kmix,media-sound/volumeicon,media-sound/pavucontrol,media-sound/qastools cl_setup==audio||cl_setup== append=skip 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/boot b/profiles/templates/deprecated/3.4/6_ac_install_configure/boot
deleted file mode 100644
index 3808f1dd9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/boot
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge=sys-boot/grub,sys-apps/preload cl_setup==boot||cl_setup== append=skip 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/locale b/profiles/templates/deprecated/3.4/6_ac_install_configure/locale
deleted file mode 100644
index 35cb742da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/locale
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge=sys-libs/glibc,sys-apps/portage,sys-apps/baselayout,sys-apps/openrc,x11-base/xorg-server cl_setup==locale||cl_setup== append=skip 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/network b/profiles/templates/deprecated/3.4/6_ac_install_configure/network
deleted file mode 100644
index 61443e241..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/network
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge=sys-apps/openrc,gnome-extra/nm-applet,net-misc/networkmanager,kde-misc/plasma-nm,sys-apps/baselayout cl_setup==network||cl_setup== append=skip 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/session b/profiles/templates/deprecated/3.4/6_ac_install_configure/session
deleted file mode 100644
index 0c4f6d037..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/session
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba merge=x11-base/xorg-server,x11-misc/lightdm cl_setup==session||cl_setup== path=/etc/calculate name=calculate.env
-
-[main]
-cl_home_crypt_set = #-cl_install_home_crypt_set-#
-
-[install]
-cl_autologin = #-cl_autologin-#
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_configure/video b/profiles/templates/deprecated/3.4/6_ac_install_configure/video
deleted file mode 100644
index 4fc114085..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_configure/video
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge=x11-base/xorg-server,gnome-base/gdm,gnome-base/gdm,lxde-base/lxdm,sys-boot/grub,media-gfx/calculate-wallpapers,media-gfx/dm-themes-calculate,media-gfx/kdm-themes-calculate cl_setup==video||cl_setup== append=skip 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_flash/.calculate_directory
deleted file mode 100644
index 8458bae17..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install cl_ver>=3.4.0_beta3&&ac_install_flash==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_install_flash/README-eng.txt
deleted file mode 100644
index dd39fb618..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-The ac_install_flash event:
-- system installation on USB-Flash
-
-Action: system setup for booting from an USB-Flash
-env: install
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_install_flash/README-rus.txt
deleted file mode 100644
index b8478933f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/README-rus.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_flash:
-- у�тановка �и�темы на USB-Flash
-
-Дей�твие: на�тройка �и�темы дл� загрузки � USB-Flash
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/.calculate_directory
deleted file mode 100644
index 8515dfce3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/calcboot)!=&&pkg(media-gfx/gfxboot-themes-calculate)== append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/isolinux/calcmenu.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/isolinux/calcmenu.c32
deleted file mode 100644
index ae4e8b398..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/isolinux/calcmenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/calcmenu.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/syslinux/calcmenu.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/syslinux/calcmenu.c32
deleted file mode 100644
index ae4e8b398..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/syslinux/calcmenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/calcmenu.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/syslinux/syslinux.cfg b/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/syslinux/syslinux.cfg
deleted file mode 100644
index 768fabba9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/calcboot/syslinux/syslinux.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch
-<reg>LABEL=\S+</reg>
-<text>UUID=#-os_install_root_uuid-#</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_flash/calculate-utils/.calculate_directory
deleted file mode 100644
index 0112ead1d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-apps/calculate-utils)!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/calculate-utils/linux/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_flash/calculate-utils/linux/.calculate_directory
deleted file mode 100644
index afec7e616..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/calculate-utils/linux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
deleted file mode 100644
index dc5aca4b6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(media-gfx/gfxboot-themes-calculate)!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
deleted file mode 100644
index 74562e40c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/chain.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
deleted file mode 100644
index 64b29fea6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/gfxboot.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
deleted file mode 100644
index 6a28459dc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/ldlinux.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
deleted file mode 100644
index a271c04d5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/libcom32.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
deleted file mode 100644
index c05d446bc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/libutil.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
deleted file mode 100644
index 74562e40c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/chain.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
deleted file mode 100644
index 64b29fea6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/gfxboot.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
deleted file mode 100644
index 6a28459dc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/ldlinux.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
deleted file mode 100644
index a271c04d5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/libcom32.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32 b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
deleted file mode 100644
index c05d446bc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/libutil.c32 mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg b/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
deleted file mode 100644
index 768fabba9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=patch
-<reg>LABEL=\S+</reg>
-<text>UUID=#-os_install_root_uuid-#</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/grub/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_flash/grub/.calculate_directory
deleted file mode 100644
index 29a7a1c46..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/grub/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate os_install_arch_machine==x86_64&&pkg(sys-boot/grub)>=2 path=/boot
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/grub/grub.cfg b/profiles/templates/deprecated/3.4/6_ac_install_flash/grub/grub.cfg
deleted file mode 100644
index f324aa25a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/grub/grub.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=patch
-<reg> doload=squashfs</reg>
-<text> cdroot_type=vfat doload=vfat,nls_cp866,nls_utf8,squashfs</text>
-<reg>LABEL=\S+</reg>
-<text>UUID=#-os_install_root_uuid-#</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/.calculate_directory
deleted file mode 100644
index ea55b7e6a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(sys-boot/syslinux)!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/isolinux/isolinux.bin b/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/isolinux/isolinux.bin
deleted file mode 100644
index 769dc1545..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/isolinux/isolinux.bin
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/isolinux.bin mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/syslinux/isolinux.bin b/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/syslinux/isolinux.bin
deleted file mode 100644
index 769dc1545..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_flash/syslinux/syslinux/isolinux.bin
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-cl_install_path_from-#/usr/share/syslinux/isolinux.bin mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/.calculate_directory
deleted file mode 100644
index e96403647..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install ac_install_patch==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_install_patch/README-eng.txt
deleted file mode 100644
index 629bba5e3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-The ac_install_patch event:
-- package installation
-
-Action: modification of the package source
-env: install
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_install_patch/README-rus.txt
deleted file mode 100644
index 8f6d479fc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/README-rus.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_patch:
-- у�тановка пакета
-
-Дей�твие: модификаци� и�ходного кода пакета
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/erlang/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/erlang/.calculate_directory
deleted file mode 100644
index 4cad89db8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/erlang/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=15&&merge()<17
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
deleted file mode 100644
index 15900b940..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff
-diff --git a/otp_src_R15B03/erts/configure b/otp_src_R15B03/erts/configure
-index 166f716..d01d32f 100755
---- a/otp_src_R15B03/erts/configure
-+++ b/otp_src_R15B03/erts/configure
-@@ -18337,7 +18337,7 @@ TERMCAP_LIB=
- if test "x$with_termcap" != "xno" &&
-    test "X$host" != "Xwin32"; then
-     # try these libs
--    termcap_libs="ncurses curses termcap termlib"
-+    termcap_libs="tinfo ncurses curses termcap termlib"
- 
-     for termcap_lib in $termcap_libs; do
- 	as_ac_Lib=`echo "ac_cv_lib_$termcap_lib''_tgetent" | $as_tr_sh`
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/python-twitter/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
deleted file mode 100644
index a113fb705..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()>=0.8.1 append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/python-twitter/message_len.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/python-twitter/message_len.patch
deleted file mode 100644
index b32272948..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/dev-python/python-twitter/message_len.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff
-diff --git a/twitter.py b/twitter.py
-index 5e58582..c411241 100755
---- a/twitter.py
-+++ b/twitter.py
-@@ -65,7 +65,7 @@ except ImportError:
- import oauth2 as oauth
- 
- 
--CHARACTER_LIMIT = 140
-+CHARACTER_LIMIT = 300
- 
- # A singleton representing a lazily instantiated FileCache.
- DEFAULT_CACHE = object()
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/gdm/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/gdm/.calculate_directory
deleted file mode 100644
index 5c965ea54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/gdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/gdm/user_sort.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/gdm/user_sort.patch
deleted file mode 100644
index 1b4c6096f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/gnome-base/gdm/user_sort.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-# Calculate format=diff merge(gnome-base/gdm)>=2.20&&merge(gnome-base/gdm)<=3
-diff --git a/gui/gdmuser.c b/gui/gdmuser.c
-index 2dff3f6..27a169f 100644
---- a/gui/gdmuser.c
-+++ b/gui/gdmuser.c
-@@ -232,13 +232,32 @@ gdm_sort_func (gpointer d1, gpointer d2)
- {
-     GdmUser *a = d1;
-     GdmUser *b = d2;
-+    char *astr;
-+    char *bstr;
- 
-     if (!d1 || !d2)
-         return (0);
- 
--    return (strcmp (a->login, b->login));
-+    astr = (a->gecos && strcmp(a->gecos, "") != 0 ) ? a->gecos : a->login;
-+    bstr = (b->gecos && strcmp(b->gecos, "") != 0 ) ? b->gecos : b->login;
-+    if(astr == a->gecos && bstr == b->gecos && !strcmp(astr,bstr)) {
-+	return (strcmp (a->login, b->login));
-+    }
-+
-+    return (strcmp (astr, bstr));
- }
- 
-+static gint
-+gdm_sort_login_func (gpointer d1, gpointer d2)
-+{
-+    GdmUser *a = d1;
-+    GdmUser *b = d2;
-+
-+    if (!d1 || !d2)
-+        return (0);
-+
-+    return (strcmp (a->login, b->login));
-+}
- 
- static gboolean
- setup_user (struct passwd *pwent,
-@@ -267,7 +286,7 @@ setup_user (struct passwd *pwent,
- 				   defface, read_faces);
- 
- 	    if ((user) &&
--		(! g_list_find_custom (*users, user, (GCompareFunc) gdm_sort_func))) {
-+		(! g_list_find_custom (*users, user, (GCompareFunc) gdm_sort_login_func))) {
- 		cnt++;
- 		*users = g_list_insert_sorted (*users, user,
- 		     (GCompareFunc) gdm_sort_func);
-diff --git a/gui/greeter/greeter_item_ulist.c b/gui/greeter/greeter_item_ulist.c
-index 574a10b..d9f2628 100644
---- a/gui/greeter/greeter_item_ulist.c
-+++ b/gui/greeter/greeter_item_ulist.c
-@@ -187,14 +187,23 @@ greeter_populate_user_list (GtkTreeModel *tm)
- 		GdmUser    *usr = li->data;
- 		GtkTreeIter iter = {0};
- 		char       *label;
-+		char       *gecos;
-+		char       *login;
- 		char       *name;
- 		gboolean    active;
- 
-+		login = gdm_common_text_to_escaped_utf8 (usr->login);
-+
- 		if (usr->gecos && strcmp (usr->gecos, "") != 0) {
--			name = gdm_common_text_to_escaped_utf8 (usr->gecos);
--		} else {
--			name = gdm_common_text_to_escaped_utf8 (usr->login);
-+			gecos = gdm_common_text_to_escaped_utf8 (usr->gecos);
-+			name = g_strdup_printf ("%s\n%s",gecos,login);
-+			g_free (gecos);
- 		}
-+		else {
-+			name = g_strdup (login);
-+		}
-+
-+		g_free (login);
- 
- 		if (g_hash_table_lookup (displays_hash, usr->login))
- 			active = TRUE;
-@@ -202,12 +211,11 @@ greeter_populate_user_list (GtkTreeModel *tm)
- 			active = FALSE;
- 
- 		if (active) {
--			label = g_strdup_printf ("<b>%s</b>\n    <i><small>%s</small></i>",
-+			label = g_strdup_printf ("%s  <i><small>%s</small></i>",
- 						 name,
- 						 _("Already logged in"));
- 		} else {
--			label = g_strdup_printf ("<b>%s</b>\n",
--						 name);
-+			label = g_strdup (name);
- 		}
- 
- 		g_free (name);
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
deleted file mode 100644
index 19a0f5d7e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()>=4
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
deleted file mode 100644
index d8bf79026..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate format=diff
-diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
-index ef54230..af3ef94 100644
---- a/kdeui/icons/kiconloader.cpp
-+++ b/kdeui/icons/kiconloader.cpp
-@@ -1041,6 +1041,10 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
-             }
- #endif
-             if (genericFallback)
-+            {
-+                // restore genericFallback flag
-+                genericFallback = name.endsWith(QLatin1String("-x-generic"));
-                 // we already tested the base name
-                 break;
-+            }
- 
-            int rindex = currentName.lastIndexOf('-');
-            if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
deleted file mode 100644
index 61d6614e5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=diff
---- kdelibs-4.3.1.orig/kdecore/services/kfoldermimetype.cpp
-+++ kdelibs-4.3.1/kdecore/services/kfoldermimetype.cpp
-@@ -77,11 +77,11 @@ QString KFolderMimeTypePrivate::iconName( const KUrl& _url ) const
-   // There are also other directories with 0 size, such as /proc, that may
-   // be mounted, but those are unlikely to contain .directory (and checking
-   // this would require KMountPoint from kio).
--  KDE_struct_stat buff;
--  if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
--      && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
--    return KMimeTypePrivate::iconName( _url );
--  }
-+  //KDE_struct_stat buff;
-+  //if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
-+  //    && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
-+  //  return KMimeTypePrivate::iconName( _url );
-+  //}
- 
-   KUrl u( _url );
-   u.addPath( ".directory" );
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
deleted file mode 100644
index 19a0f5d7e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()>=4
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
deleted file mode 100644
index e08c1137b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff
-diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
-index 75ab482..328f88d 100644
---- a/src/kiconloader.cpp
-+++ b/src/kiconloader.cpp
-@@ -940,6 +940,8 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size) cons
-             //qCDebug(KICONTHEMES) << "Looking up" << currentName;
- 
-             if (genericFallback) {
-+                // restore genericFallback flag
-+                genericFallback = name.endsWith(QLatin1String("-x-generic"));
-                 // we already tested the base name
-                 break;
-             }
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
deleted file mode 100644
index 8650b7218..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()==0.9.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
deleted file mode 100644
index de5f8a58f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=diff
-diff --git a/lxqt-config-monitor/monitor.h b/lxqt-config-monitor/monitor.h
-index 01d313c..6674fbe 100644
---- a/lxqt-config-monitor/monitor.h
-+++ b/lxqt-config-monitor/monitor.h
-@@ -20,6 +20,7 @@
- #ifndef _MONITOR_H_
- #define _MONITOR_H_
- 
-+#include <QObject>
- #include <QStringList>
- #include <QHash>
- #include <QList>
-@@ -79,4 +80,4 @@ public:
- /**Gets size from string rate. String rate format is "widthxheight". Example: 800x600*/
- QSize sizeFromString(QString str);
- 
--#endif // _MONITOR_H_
-\ No newline at end of file
-+#endif // _MONITOR_H_
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/digikam/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/digikam/.calculate_directory
deleted file mode 100644
index 1469ff8f9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/digikam/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()>=5.1.0&&os_install_arch_machine==i686 append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
deleted file mode 100644
index ecbb0095d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate format=diff
-diff -up digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h.libraw_endian digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h
---- digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h.libraw_endian	2016-08-08 12:19:25.000000000 -0500
-+++ digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h	2016-08-09 09:23:01.387824702 -0500
-@@ -612,10 +612,10 @@ typedef struct
- #elif defined(__INTEL__)
- #define LibRawBigEndian 0
- 
--#elif defined(_M_IX86)
-+#elif defined(_M_IX86) || defined(__i386__)
- #define LibRawBigEndian 0
- 
--#elif defined(_M_X64) || defined(__amd64__)
-+#elif defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
- #define LibRawBigEndian 0
- 
- #elif defined(__LITTLE_ENDIAN__)
-@@ -625,6 +625,13 @@ typedef struct
- #define LibRawBigEndian 1
- #elif defined(_ARM_)
- #define LibRawBigEndian 0
-+
-+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define LibRawBigEndian 0
-+
-+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#define LibRawBigEndian 1
-+
- #else
- #ifndef qXCodeRez
- #error Unable to figure out byte order.
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/.calculate_directory
deleted file mode 100644
index 5c965ea54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.2.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.2.patch
deleted file mode 100644
index bf24f422b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=patch merge(media-gfx/gimp)>=2.8.2&&merge(media-gfx/gimp)<2.8.4
-diff -Naur a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
---- a/app/config/gimpguiconfig.c	2012-03-12 23:18:06.000000000 +0400
-+++ b/app/config/gimpguiconfig.c	2012-05-18 12:47:30.000000000 +0400
-@@ -197,7 +197,7 @@
-   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
-                                     "toolbox-wilber",
-                                     TOOLBOX_WILBER_BLURB,
--                                    TRUE,
-+                                    FALSE,
-                                     GIMP_PARAM_STATIC_STRINGS);
-   path = gimp_config_build_data_path ("themes");
-   GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
-diff -Naur a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
---- a/app/widgets/gimpcairo-wilber.c	2012-03-12 23:18:07.000000000 +0400
-+++ b/app/widgets/gimpcairo-wilber.c	2012-05-18 12:47:12.000000000 +0400
-@@ -37,8 +37,7 @@
-  * It works best if you combine all paths into one. Inkscape has a
-  * function to do that.
-  */
--static const gchar wilber_path[] =
--  "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
-+static const gchar wilber_path[] = "";
- 
- static cairo_path_t *wilber_cairo_path = NULL;
- static gdouble       wilber_x1, wilber_y1;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.4.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.4.patch
deleted file mode 100644
index 87d3781bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=diff merge(media-gfx/gimp)>=2.8.4
-diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
-index a1fc464..223762c 100644
---- a/app/config/gimpguiconfig.c
-+++ b/app/config/gimpguiconfig.c
-@@ -197,7 +197,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
-   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
-                                     "toolbox-wilber",
-                                     TOOLBOX_WILBER_BLURB,
--                                    TRUE,
-+                                    FALSE,
-                                     GIMP_PARAM_STATIC_STRINGS);
-   path = gimp_config_build_data_path ("themes");
-   GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
-diff --git a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
-index 62fe06f..d991adb 100644
---- a/app/widgets/gimpcairo-wilber.c
-+++ b/app/widgets/gimpcairo-wilber.c
-@@ -37,8 +37,7 @@
-  * It works best if you combine all paths into one. Inkscape has a
-  * function to do that.
-  */
--static const gchar wilber_path[] =
--  "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
-+static const gchar wilber_path[] = "";
- 
- static cairo_path_t *wilber_cairo_path = NULL;
- static gdouble       wilber_x1, wilber_y1;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
deleted file mode 100644
index 87d3781bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate format=diff merge(media-gfx/gimp)>=2.8.4
-diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
-index a1fc464..223762c 100644
---- a/app/config/gimpguiconfig.c
-+++ b/app/config/gimpguiconfig.c
-@@ -197,7 +197,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
-   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
-                                     "toolbox-wilber",
-                                     TOOLBOX_WILBER_BLURB,
--                                    TRUE,
-+                                    FALSE,
-                                     GIMP_PARAM_STATIC_STRINGS);
-   path = gimp_config_build_data_path ("themes");
-   GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
-diff --git a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
-index 62fe06f..d991adb 100644
---- a/app/widgets/gimpcairo-wilber.c
-+++ b/app/widgets/gimpcairo-wilber.c
-@@ -37,8 +37,7 @@
-  * It works best if you combine all paths into one. Inkscape has a
-  * function to do that.
-  */
--static const gchar wilber_path[] =
--  "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
-+static const gchar wilber_path[] = "";
- 
- static cairo_path_t *wilber_cairo_path = NULL;
- static gdouble       wilber_x1, wilber_y1;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/inkscape/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
deleted file mode 100644
index 5c965ea54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!= append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
deleted file mode 100644
index dcd2bcbcf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff
-diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
-index 4492661..45b09ec 100644
---- a/src/ui/clipboard.cpp
-+++ b/src/ui/clipboard.cpp
-@@ -1402,7 +1402,7 @@ void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &
- 
-         Glib::ustring target;
-         if (atom_name) {
--            target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
-+            target = Gdk::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
-         }
- 
-         listTargets.push_back(target);
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
deleted file mode 100644
index 61b890246..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()>=1.5.4.4 append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
deleted file mode 100644
index 1b84b0bc3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=splash.c link=../splashutils-gentoo-1.0.17/splash.c mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
deleted file mode 100644
index c9fb2f5b3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# Calculate format=diff
---- splash.c
-+++ splash.c
-@@ -148,6 +148,24 @@ static void fix_rc_variable(char *s)
- }
- 
- /*
-+ * Get shutdown splash settings from /etc/conf.d/splash
-+ */
-+static int splash_config_gentoo_shutdown(fbspl_cfg_t *cfg, fbspl_type_t type)
-+{
-+	RC_STRINGLIST *confd;
-+	char *t;
-+
-+	confd = rc_config_load("/etc/conf.d/splash");
-+
-+	t = rc_config_value(confd, "SPLASH_THEME_SHUTDOWN");
-+	if (t)
-+		fbsplash_acc_theme_set(t);
-+
-+	rc_stringlist_free(confd);
-+	return 0;
-+}
-+
-+/*
-  * Get splash settings from /etc/conf.d/splash
-  */
- static int splash_config_gentoo(fbspl_cfg_t *cfg, fbspl_type_t type)
-@@ -790,6 +808,8 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
- 		config = fbsplash_lib_init(type);
- 		splash_config_gentoo(config, type);
- 		fbsplash_parse_kcmdline(false);
-+		if(strcmp(runlev, RC_LEVEL_SHUTDOWN)==0)
-+			splash_config_gentoo_shutdown(config, type);
- 	}
- 
- 	/* Extremely weird.. should never happen. */
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
deleted file mode 100644
index 20be50ae6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/../splashutils-gentoo-1.0.17 name=splash.c link=splash.c mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
deleted file mode 100644
index a5b364183..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=splash.c append=remove
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
deleted file mode 100644
index 2c2319794..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=diff
-diff --git a/splashutils-1.5.4.4/src/libfbsplash.c b/splashutils-1.5.4.4/src/libfbsplash.c
-index 1774f9d..c3faebd 100644
---- src/libfbsplash.c
-+++ src/libfbsplash.c
-@@ -495,7 +495,9 @@ int fbsplash_cache_cleanup(char **profile_save)
- 
- nosave:
- 	/* Clear a stale mtab entry that might have been created by the initscripts. */
--	system("/bin/sed -i -e '\\#"FBSPLASH_CACHEDIR"# d' /etc/mtab");
-+	if(lstat("/etc/mtab", &buf) != 0 || !S_ISLNK(buf.st_mode)) {
-+		system("/bin/sed -i -e '\\#"FBSPLASH_CACHEDIR"# d' /etc/mtab");
-+	}
- 
- 	umount2(what, MNT_DETACH);
- 	return err;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/text_align.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/text_align.patch
deleted file mode 100644
index 9a2a7507b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/text_align.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-# Calculate format=diff
-diff --git a/splashutils-1.5.4.4/docs/theme_format b/splashutils-1.5.4.4/docs/theme_format
-index 2cc629b..8932583 100644
---- a/splashutils-1.5.4.4/docs/theme_format
-+++ b/splashutils-1.5.4.4/docs/theme_format
-@@ -91,6 +91,9 @@ that they enclose.
- * text_y=<n>
-   The y coordinate of the main system message.
- 
-+* text_align [left|middle|right] [top|middle|bottom]
-+  Text align of the main system message.
-+
- * text_size=<n>
-   The size of the font used to render the main system message.
- 
-diff --git a/splashutils-1.5.4.4/src/parse.c b/splashutils-1.5.4.4/src/parse.c
-index ad7676d..0728419 100644
---- a/splashutils-1.5.4.4/src/parse.c
-+++ b/splashutils-1.5.4.4/src/parse.c
-@@ -20,7 +20,7 @@
- struct cfg_opt {
- 	char *name;
- 	enum {
--		t_int, t_path, t_box, t_icon, t_rect, t_color, t_fontpath,
-+		t_int, t_path, t_box, t_icon, t_rect, t_color, t_fontpath, t_align,
- 		t_type_open, t_type_close, t_anim, t_text, t_textbox_open, t_textbox_close,
- 	} type;
- 	void *val;
-@@ -28,6 +28,7 @@ struct cfg_opt {
- 
- int line = 0;
- u16 text_x, text_y;
-+u8 text_align = 0;
- u16 text_size;
- color text_color;
- char *text_font;
-@@ -147,6 +148,10 @@ struct cfg_opt opts[] =
- 		.type = t_fontpath,
- 		.val = &text_font	},
- 
-+	{	.name = "text_align",
-+		.type = t_align,
-+		.val = &text_align	},
-+
- 	{	.name = "text",
- 		.type = t_text,
- 		.val = NULL		},
-@@ -216,6 +221,44 @@ static bool skip_nonwhitespace(char **buf, bool req)
- 	return true;
- }
- 
-+static void parse_align(char *t, struct cfg_opt opt)
-+{
-+	(*(u8*)opt.val) = 0;
-+	/* Parse x position */
-+
-+	if (!strncmp(t, "left", 4)) {
-+		(*(u8*)opt.val) |= F_HS_LEFT;
-+		t += 4;
-+	} else if (!strncmp(t, "right", 5)) {
-+		(*(u8*)opt.val) |= F_HS_RIGHT;
-+		t += 5;
-+	} else if (!strncmp(t, "middle", 6)) {
-+		(*(u8*)opt.val) |= F_HS_HMIDDLE;
-+		t += 6;
-+	} else {
-+		parse_error("expected 'left', 'right' or 'middle' instead of '%s'", t);
-+		return;
-+	}
-+
-+	if (!skip_whitespace(&t, true))
-+		return;
-+	/* Parse y position */
-+
-+	if (!strncmp(t, "top", 3)) {
-+		(*(u8*)opt.val) |= F_HS_TOP;
-+		t += 3;
-+	} else if (!strncmp(t, "bottom", 6)) {
-+		(*(u8*)opt.val) |= F_HS_BOTTOM;
-+		t += 6;
-+	} else if (!strncmp(t, "middle", 6)) {
-+		(*(u8*)opt.val) |= F_HS_VMIDDLE;
-+		t += 6;
-+	} else {
-+		parse_error("expected 'top', 'bottom' or 'middle' instead of '%s'", t);
-+		(*(u8*)opt.val) |= F_HS_TOP;
-+	}
-+}
-+
- static void parse_int(char *t, struct cfg_opt opt)
- {
- 	if (*t != '=') {
-@@ -1115,7 +1160,7 @@ void add_main_msg()
- 		return;
- 	}
- 
--	ct->hotspot = F_HS_LEFT | F_HS_TOP;
-+	ct->hotspot = text_align;
- 	ct->style = TTF_STYLE_NORMAL;
- 	ct->x = text_x;
- 	ct->y = text_y;
-@@ -1245,6 +1290,11 @@ int parse_cfg(char *cfgfile, stheme_t *theme)
- 					parse_int(t, opts[i]);
- 					break;
- 
-+				case t_align:
-+					skip_whitespace(&t, false);
-+					parse_align(t, opts[i]);
-+					break;
-+
- 				case t_box:
- 				{
- 					box *tbox = parse_box(t);
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
deleted file mode 100644
index 9b1d41fad..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/splashutils-gentoo-1.0.17/splash.c b/splashutils-gentoo-1.0.17/splash.c
-index 5220571..794dba1 100644
---- a/splashutils-gentoo-1.0.17/splash.c
-+++ b/splashutils-gentoo-1.0.17/splash.c
-@@ -148,6 +148,24 @@ static void fix_rc_variable(char *s)
- }
- 
- /*
-+ * Get shutdown splash settings from /etc/conf.d/splash
-+ */
-+static int splash_config_gentoo_shutdown(fbspl_cfg_t *cfg, fbspl_type_t type)
-+{
-+	RC_STRINGLIST *confd;
-+	char *t;
-+
-+	confd = rc_config_load("/etc/conf.d/splash");
-+
-+	t = rc_config_value(confd, "SPLASH_THEME_SHUTDOWN");
-+	if (t)
-+		fbsplash_acc_theme_set(t);
-+
-+	rc_stringlist_free(confd);
-+	return 0;
-+}
-+
-+/*
-  * Get splash settings from /etc/conf.d/splash
-  */
- static int splash_config_gentoo(fbspl_cfg_t *cfg, fbspl_type_t type)
-@@ -790,6 +808,8 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
- 		config = fbsplash_lib_init(type);
- 		splash_config_gentoo(config, type);
- 		fbsplash_parse_kcmdline(false);
-+		if(strcmp(runlev, RC_LEVEL_SHUTDOWN)==0)
-+			splash_config_gentoo_shutdown(config, type);
- 	}
- 
- 	/* Extremely weird.. should never happen. */
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-libs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/media-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/media-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/choqok/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/choqok/.calculate_directory
deleted file mode 100644
index 7a2c9ab22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/choqok/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=1.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/choqok/branding.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/choqok/branding.patch
deleted file mode 100644
index bd07f2d8b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/choqok/branding.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=diff
-diff --git a/microblogs/twitter/twittereditaccount.cpp b/microblogs/twitter/twittereditaccount.cpp
-index efea8d5..9f50534 100644
---- a/microblogs/twitter/twittereditaccount.cpp
-+++ b/microblogs/twitter/twittereditaccount.cpp
-@@ -40,8 +40,8 @@ along with this program; if not, see http://www.gnu.org/licenses/
- #include <QCheckBox>
- #include <KInputDialog>
- 
--const char * twitterConsumerKey = "VyXMf0O7CvciiUQjliYtYg";
--const char * twitterConsumerSecret = "uD2HvsOBjzt1Vs6SnouFtuxDeHmvOOVwmn3fBVyCw0";
-+const char * twitterConsumerKey = "irARiVrv825Fl2oZaYiQA";
-+const char * twitterConsumerSecret = "qYZa8Dszrow6vry4iwtSm1zTidnW7ii8IQztgXWZY";
- 
- TwitterEditAccountWidget::TwitterEditAccountWidget(TwitterMicroBlog *microblog,
-                                                     TwitterAccount* account, QWidget* parent)
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/.calculate_directory
deleted file mode 100644
index 0dcdf8384..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=2.1.8
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/README.txt b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/README.txt
deleted file mode 100644
index 3246d2003..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate append=skip
-Модуль вз�т из репозитори� https://github.com/processone/ejabberd-contrib.
-�еобходим дл� работы �охраниени� перепи�ки ejabberd.
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
deleted file mode 100644
index de7f59948..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-# Calculate format=diff merge(net-im/ejabberd)>=16.01&&merge(net-im/ejabberd)<16.02
-diff --git a/src/mod_logxml.erl b/src/mod_logxml.erl
-new file mode 100644
-index 0000000..ac822c1
---- /dev/null
-+++ b/src/mod_logxml.erl
-@@ -0,0 +1,271 @@
-+%%%----------------------------------------------------------------------
-+%%% File    : mod_logxml.erl
-+%%% Author  : Badlop
-+%%% Purpose : Log XMPP packets to XML file
-+%%% Created : 
-+%%% Id      : 
-+%%%----------------------------------------------------------------------
-+
-+-module(mod_logxml).
-+-author('badlop@ono.com').
-+
-+-behaviour(gen_mod).
-+
-+-export([start/2, init/7, stop/1,
-+	 send_packet/4, receive_packet/5]).
-+
-+-include("ejabberd.hrl").
-+-include("jlib.hrl").
-+
-+-define(PROCNAME, ejabberd_mod_logxml).
-+
-+%% -------------------
-+%% Module control
-+%% -------------------
-+
-+start(Host, Opts) ->
-+    Logdir = gen_mod:get_opt(logdir, Opts, fun(A) -> A end, "/tmp/jabberlogs/"),
-+
-+    Rd = gen_mod:get_opt(rotate_days, Opts, fun(A) -> A end, 1),
-+    Rf = case gen_mod:get_opt(rotate_megs, Opts, fun(A) -> A end, 10) of
-+	     no -> no;
-+	     Rf1 -> Rf1*1024*1024
-+	 end,
-+    Rp = case gen_mod:get_opt(rotate_kpackets, Opts, fun(A) -> A end, 10) of
-+	     no -> no;
-+	     Rp1 -> Rp1*1000
-+	 end,
-+    RotateO = {Rd, Rf, Rp},
-+    CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, fun(A) -> A end, 1),
-+
-+    Timezone = gen_mod:get_opt(timezone, Opts, fun(A) -> A end, local),
-+
-+    Orientation = gen_mod:get_opt(orientation, Opts, fun(A) -> A end, [send, recv]),
-+    Stanza = gen_mod:get_opt(stanza, Opts, fun(A) -> A end, [iq, message, presence, other]),
-+    Direction = gen_mod:get_opt(direction, Opts, fun(A) -> A end, [internal, vhosts, external]),
-+    FilterO = {
-+      {orientation, Orientation},
-+      {stanza, Stanza},
-+      {direction, Direction}},
-+    ShowIP = gen_mod:get_opt(show_ip, Opts, fun(A) -> A end, false),
-+
-+    ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-+	     spawn(?MODULE, init, [binary_to_list(Host), Logdir, RotateO, CheckRKP,
-+				   Timezone, ShowIP, FilterO])).
-+
-+stop(Host) ->
-+    ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! stop,
-+    {wait, Proc}.
-+
-+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) ->
-+    {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone),
-+    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day,
-+	 Timezone, ShowIP, FilterO).
-+
-+%% -------------------
-+%% Main
-+%% -------------------
-+
-+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC,
-+	      Gregorian_day_log, Timezone) ->
-+    {RO_days, RO_size, RO_packets} = RotateO,
-+
-+    Rotate1 = case RO_packets of
-+		  no -> false;
-+		  PacketC -> true;
-+		  _ -> false
-+	      end,
-+
-+    Filesize = filelib:file_size(Filename),
-+    Rotate2 = if 
-+		  RO_size == no -> false;
-+		  Filesize >= RO_size -> true;
-+		  true -> false
-+	      end,
-+
-+    Gregorian_day_today = get_gregorian_day(),
-+    Rotate3 = if
-+		  RO_days == no -> false;
-+		  (Gregorian_day_today - Gregorian_day_log) >= RO_days -> 
-+		      true;
-+		  true -> false
-+	      end,
-+
-+    case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of
-+	true -> 
-+	    {IoDevice2, Filename2, Gregorian_day2} =
-+		rotate_log(IoDevice, Logdir, Host, Timezone),
-+	    {IoDevice2, Filename2, Gregorian_day2, 0};
-+	false -> 
-+	    {IoDevice, Filename, Gregorian_day_log, PacketC+1}
-+    end.
-+
-+filter(FilterO, E) ->
-+    {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} =
-+	FilterO,
-+    {Orientation, From, To, Packet} = E,
-+
-+    {xmlel, Stanza_str, _Attrs, _Els} = Packet,
-+    Stanza = list_to_atom(binary_to_list(Stanza_str)),
-+
-+    Hosts_all = ejabberd_config:get_global_option(hosts, fun(A) -> A end),
-+    {Host_local, Host_remote} = case Orientation of
-+				    send -> {From#jid.lserver, To#jid.lserver};
-+				    recv -> {To#jid.lserver, From#jid.lserver}
-+				end,
-+    Direction = case Host_remote of
-+		    Host_local -> internal;
-+		    _ -> 
-+			case lists:member(Host_remote, Hosts_all) of
-+			    true -> vhosts;
-+			    false -> external
-+			end
-+		end,
-+
-+    {lists:all(fun(O) -> O end, 
-+	       [lists:member(Orientation, OrientationO),
-+		lists:member(Stanza, StanzaO),
-+		lists:member(Direction, DirectionO)]),
-+     {Orientation, Stanza, Direction}}. 
-+
-+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+     Gregorian_day, Timezone, ShowIP, FilterO) ->
-+    receive
-+	{addlog, E} ->
-+	    {IoDevice3, Filename3, Gregorian_day3, PacketC3} =
-+		case filter(FilterO, E) of
-+		    {true, OSD} ->
-+			Div = calc_div(PacketC, CheckRKP),
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2} =
-+			    case Div==round(Div) of
-+				true ->
-+				    manage_rotate(Host, IoDevice, Filename,
-+						  Logdir, RotateO, PacketC,
-+						  Gregorian_day, Timezone);
-+				false ->
-+				    {IoDevice, Filename, Gregorian_day,
-+				     PacketC+1}
-+			    end,
-+			add_log(IoDevice2, Timezone, ShowIP, E, OSD),
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2};
-+		    _ ->
-+			{IoDevice, Filename, Gregorian_day, PacketC}
-+		end,
-+	    loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO,
-+		 PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO);
-+	stop ->
-+	    close_file(IoDevice),
-+	    ok;
-+	_ ->
-+	    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+		 Gregorian_day, Timezone, ShowIP, FilterO)
-+    end.
-+
-+send_packet(P, _C2SState, FromJID, ToJID) ->
-+    Host = FromJID#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {send, FromJID, ToJID, P}},
-+    P.
-+
-+receive_packet(P, _C2SState, _JID, From, To) ->
-+    Host = To#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {recv, From, To, P}},
-+    P.
-+
-+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) ->
-+    %%{Orientation, Stanza, Direction} = OSD, 
-+    LocalJID = case Orientation of
-+		   send -> From;
-+		   recv -> To
-+	       end,
-+    LocalIPS = case ShowIP of
-+		   true ->
-+		       case ejabberd_sm:get_user_ip(
-+			      LocalJID#jid.user,
-+			      LocalJID#jid.server,
-+			      LocalJID#jid.resource) of
-+			   {UserIP, _Port} ->
-+			       io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]);
-+			   undefined -> "lip=\"undefined\" "
-+		       end;
-+		   false -> ""
-+	       end,
-+    TimestampISO = get_now_iso(Timezone),
-+    io:fwrite(Io, "<packet or=\"~p\" ljid=\"~s\" ~sts=\"~s\">~s</packet>~n",
-+	      [Orientation, jlib:jid_to_string(LocalJID), LocalIPS,
-+	       TimestampISO, binary_to_list(xml:element_to_binary(Packet))]).
-+
-+%% -------------------
-+%% File
-+%% -------------------
-+
-+open_file(Logdir, Host, Timezone) ->
-+    TimeStamp = get_now_iso(Timezone),
-+    Year = string:substr(TimeStamp, 1, 4),
-+    Month = string:substr(TimeStamp, 5, 2),
-+    Day = string:substr(TimeStamp, 7, 2),
-+    Hour = string:substr(TimeStamp, 10, 2),
-+    Min = string:substr(TimeStamp, 13, 2),
-+    Sec = string:substr(TimeStamp, 16, 2),
-+    S = "-",
-+    Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec,
-+			     ".xml"]),
-+    Filename = filename:join([Logdir, Logname]),
-+
-+    Gregorian_day = get_gregorian_day(),
-+
-+    %% Open file, create if it does not exist, create parent dirs if needed
-+    case file:read_file_info(Filename) of
-+	{ok, _} ->
-+	    {ok, IoDevice} = file:open(Filename, [append]);
-+	{error, enoent} ->
-+	    make_dir_rec(Logdir),
-+	    {ok, IoDevice} = file:open(Filename, [append]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml version=\"1.0\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml-stylesheet href=\"xmpp.xsl\" type=\"text/xsl\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<log>"])
-+    end,
-+    {IoDevice, Filename, Gregorian_day}.
-+
-+close_file(IoDevice) ->
-+    io:fwrite(IoDevice, "~s~n", ["</log>"]),
-+    file:close(IoDevice).
-+
-+rotate_log(IoDevice, Logdir, Host, Timezone) ->
-+    close_file(IoDevice),
-+    open_file(Logdir, Host, Timezone).
-+
-+make_dir_rec(Dir) ->
-+    case file:read_file_info(Dir) of
-+	{ok, _} ->
-+	    ok;
-+	{error, enoent} ->
-+	    DirS = filename:split(Dir),
-+	    DirR = lists:sublist(DirS, length(DirS)-1),
-+	    make_dir_rec(filename:join(DirR)),
-+	    file:make_dir(Dir)
-+    end.
-+
-+%% -------------------
-+%% Utils
-+%% -------------------
-+
-+get_gregorian_day() -> calendar:date_to_gregorian_days(date()).
-+
-+get_now_iso(Timezone) ->
-+    TimeStamp = case Timezone of
-+		    local -> calendar:now_to_local_time(now());
-+		    universal -> calendar:now_to_universal_time(now())
-+		end,
-+    binary_to_list(jlib:timestamp_to_iso(TimeStamp)).
-+
-+calc_div(A, B) when is_integer(A) and is_integer(B) and (B /= 0) ->
-+    A/B;
-+calc_div(_A, _B) ->
-+    0.5. %% This ensures that no rotation is performed
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
deleted file mode 100644
index af3251445..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-# Calculate format=diff merge(net-im/ejabberd)>=16.02&&merge(net-im/ejabberd)<16.04
-diff --git a/src/mod_logxml.erl b/src/mod_logxml.erl
-new file mode 100644
-index 0000000..ac822c1
---- /dev/null
-+++ b/src/mod_logxml.erl
-@@ -0,0 +1,271 @@
-+%%%----------------------------------------------------------------------
-+%%% File    : mod_logxml.erl
-+%%% Author  : Badlop
-+%%% Purpose : Log XMPP packets to XML file
-+%%% Created : 
-+%%% Id      : 
-+%%%----------------------------------------------------------------------
-+
-+-module(mod_logxml).
-+-author('badlop@ono.com').
-+
-+-behaviour(gen_mod).
-+
-+-export([start/2, init/7, stop/1,
-+	 send_packet/4, receive_packet/5]).
-+
-+-include("ejabberd.hrl").
-+-include("jlib.hrl").
-+
-+-define(PROCNAME, ejabberd_mod_logxml).
-+
-+%% -------------------
-+%% Module control
-+%% -------------------
-+
-+start(Host, Opts) ->
-+    Logdir = gen_mod:get_opt(logdir, Opts, fun(A) -> A end, "/tmp/jabberlogs/"),
-+
-+    Rd = gen_mod:get_opt(rotate_days, Opts, fun(A) -> A end, 1),
-+    Rf = case gen_mod:get_opt(rotate_megs, Opts, fun(A) -> A end, 10) of
-+	     no -> no;
-+	     Rf1 -> Rf1*1024*1024
-+	 end,
-+    Rp = case gen_mod:get_opt(rotate_kpackets, Opts, fun(A) -> A end, 10) of
-+	     no -> no;
-+	     Rp1 -> Rp1*1000
-+	 end,
-+    RotateO = {Rd, Rf, Rp},
-+    CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, fun(A) -> A end, 1),
-+
-+    Timezone = gen_mod:get_opt(timezone, Opts, fun(A) -> A end, local),
-+
-+    Orientation = gen_mod:get_opt(orientation, Opts, fun(A) -> A end, [send, recv]),
-+    Stanza = gen_mod:get_opt(stanza, Opts, fun(A) -> A end, [iq, message, presence, other]),
-+    Direction = gen_mod:get_opt(direction, Opts, fun(A) -> A end, [internal, vhosts, external]),
-+    FilterO = {
-+      {orientation, Orientation},
-+      {stanza, Stanza},
-+      {direction, Direction}},
-+    ShowIP = gen_mod:get_opt(show_ip, Opts, fun(A) -> A end, false),
-+
-+    ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-+	     spawn(?MODULE, init, [binary_to_list(Host), Logdir, RotateO, CheckRKP,
-+				   Timezone, ShowIP, FilterO])).
-+
-+stop(Host) ->
-+    ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! stop,
-+    {wait, Proc}.
-+
-+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) ->
-+    {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone),
-+    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day,
-+	 Timezone, ShowIP, FilterO).
-+
-+%% -------------------
-+%% Main
-+%% -------------------
-+
-+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC,
-+	      Gregorian_day_log, Timezone) ->
-+    {RO_days, RO_size, RO_packets} = RotateO,
-+
-+    Rotate1 = case RO_packets of
-+		  no -> false;
-+		  PacketC -> true;
-+		  _ -> false
-+	      end,
-+
-+    Filesize = filelib:file_size(Filename),
-+    Rotate2 = if 
-+		  RO_size == no -> false;
-+		  Filesize >= RO_size -> true;
-+		  true -> false
-+	      end,
-+
-+    Gregorian_day_today = get_gregorian_day(),
-+    Rotate3 = if
-+		  RO_days == no -> false;
-+		  (Gregorian_day_today - Gregorian_day_log) >= RO_days -> 
-+		      true;
-+		  true -> false
-+	      end,
-+
-+    case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of
-+	true -> 
-+	    {IoDevice2, Filename2, Gregorian_day2} =
-+		rotate_log(IoDevice, Logdir, Host, Timezone),
-+	    {IoDevice2, Filename2, Gregorian_day2, 0};
-+	false -> 
-+	    {IoDevice, Filename, Gregorian_day_log, PacketC+1}
-+    end.
-+
-+filter(FilterO, E) ->
-+    {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} =
-+	FilterO,
-+    {Orientation, From, To, Packet} = E,
-+
-+    {xmlel, Stanza_str, _Attrs, _Els} = Packet,
-+    Stanza = list_to_atom(binary_to_list(Stanza_str)),
-+
-+    Hosts_all = ejabberd_config:get_global_option(hosts, fun(A) -> A end),
-+    {Host_local, Host_remote} = case Orientation of
-+				    send -> {From#jid.lserver, To#jid.lserver};
-+				    recv -> {To#jid.lserver, From#jid.lserver}
-+				end,
-+    Direction = case Host_remote of
-+		    Host_local -> internal;
-+		    _ -> 
-+			case lists:member(Host_remote, Hosts_all) of
-+			    true -> vhosts;
-+			    false -> external
-+			end
-+		end,
-+
-+    {lists:all(fun(O) -> O end, 
-+	       [lists:member(Orientation, OrientationO),
-+		lists:member(Stanza, StanzaO),
-+		lists:member(Direction, DirectionO)]),
-+     {Orientation, Stanza, Direction}}. 
-+
-+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+     Gregorian_day, Timezone, ShowIP, FilterO) ->
-+    receive
-+	{addlog, E} ->
-+	    {IoDevice3, Filename3, Gregorian_day3, PacketC3} =
-+		case filter(FilterO, E) of
-+		    {true, OSD} ->
-+			Div = calc_div(PacketC, CheckRKP),
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2} =
-+			    case Div==round(Div) of
-+				true ->
-+				    manage_rotate(Host, IoDevice, Filename,
-+						  Logdir, RotateO, PacketC,
-+						  Gregorian_day, Timezone);
-+				false ->
-+				    {IoDevice, Filename, Gregorian_day,
-+				     PacketC+1}
-+			    end,
-+			add_log(IoDevice2, Timezone, ShowIP, E, OSD),
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2};
-+		    _ ->
-+			{IoDevice, Filename, Gregorian_day, PacketC}
-+		end,
-+	    loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO,
-+		 PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO);
-+	stop ->
-+	    close_file(IoDevice),
-+	    ok;
-+	_ ->
-+	    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+		 Gregorian_day, Timezone, ShowIP, FilterO)
-+    end.
-+
-+send_packet(P, _C2SState, FromJID, ToJID) ->
-+    Host = FromJID#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {send, FromJID, ToJID, P}},
-+    P.
-+
-+receive_packet(P, _C2SState, _JID, From, To) ->
-+    Host = To#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {recv, From, To, P}},
-+    P.
-+
-+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) ->
-+    %%{Orientation, Stanza, Direction} = OSD, 
-+    LocalJID = case Orientation of
-+		   send -> From;
-+		   recv -> To
-+	       end,
-+    LocalIPS = case ShowIP of
-+		   true ->
-+		       case ejabberd_sm:get_user_ip(
-+			      LocalJID#jid.user,
-+			      LocalJID#jid.server,
-+			      LocalJID#jid.resource) of
-+			   {UserIP, _Port} ->
-+			       io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]);
-+			   undefined -> "lip=\"undefined\" "
-+		       end;
-+		   false -> ""
-+	       end,
-+    TimestampISO = get_now_iso(Timezone),
-+    io:fwrite(Io, "<packet or=\"~p\" ljid=\"~s\" ~sts=\"~s\">~s</packet>~n",
-+	      [Orientation, jlib:jid_to_string(LocalJID), LocalIPS,
-+	       TimestampISO, binary_to_list(fxml:element_to_binary(Packet))]).
-+
-+%% -------------------
-+%% File
-+%% -------------------
-+
-+open_file(Logdir, Host, Timezone) ->
-+    TimeStamp = get_now_iso(Timezone),
-+    Year = string:substr(TimeStamp, 1, 4),
-+    Month = string:substr(TimeStamp, 5, 2),
-+    Day = string:substr(TimeStamp, 7, 2),
-+    Hour = string:substr(TimeStamp, 10, 2),
-+    Min = string:substr(TimeStamp, 13, 2),
-+    Sec = string:substr(TimeStamp, 16, 2),
-+    S = "-",
-+    Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec,
-+			     ".xml"]),
-+    Filename = filename:join([Logdir, Logname]),
-+
-+    Gregorian_day = get_gregorian_day(),
-+
-+    %% Open file, create if it does not exist, create parent dirs if needed
-+    case file:read_file_info(Filename) of
-+	{ok, _} ->
-+	    {ok, IoDevice} = file:open(Filename, [append]);
-+	{error, enoent} ->
-+	    make_dir_rec(Logdir),
-+	    {ok, IoDevice} = file:open(Filename, [append]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml version=\"1.0\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml-stylesheet href=\"xmpp.xsl\" type=\"text/xsl\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<log>"])
-+    end,
-+    {IoDevice, Filename, Gregorian_day}.
-+
-+close_file(IoDevice) ->
-+    io:fwrite(IoDevice, "~s~n", ["</log>"]),
-+    file:close(IoDevice).
-+
-+rotate_log(IoDevice, Logdir, Host, Timezone) ->
-+    close_file(IoDevice),
-+    open_file(Logdir, Host, Timezone).
-+
-+make_dir_rec(Dir) ->
-+    case file:read_file_info(Dir) of
-+	{ok, _} ->
-+	    ok;
-+	{error, enoent} ->
-+	    DirS = filename:split(Dir),
-+	    DirR = lists:sublist(DirS, length(DirS)-1),
-+	    make_dir_rec(filename:join(DirR)),
-+	    file:make_dir(Dir)
-+    end.
-+
-+%% -------------------
-+%% Utils
-+%% -------------------
-+
-+get_gregorian_day() -> calendar:date_to_gregorian_days(date()).
-+
-+get_now_iso(Timezone) ->
-+    TimeStamp = case Timezone of
-+		    local -> calendar:now_to_local_time(now());
-+		    universal -> calendar:now_to_universal_time(now())
-+		end,
-+    binary_to_list(jlib:timestamp_to_legacy(TimeStamp)).
-+
-+calc_div(A, B) when is_integer(A) and is_integer(B) and (B /= 0) ->
-+    A/B;
-+calc_div(_A, _B) ->
-+    0.5. %% This ensures that no rotation is performed
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
deleted file mode 100644
index 897173bd9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-# Calculate format=diff merge(net-im/ejabberd)>=16.04
-diff --git a/src/mod_logxml.erl b/src/mod_logxml.erl
-new file mode 100644
-index 0000000..ac822c1
---- /dev/null
-+++ b/src/mod_logxml.erl
-@@ -0,0 +1,271 @@
-+%%%----------------------------------------------------------------------
-+%%% File    : mod_logxml.erl
-+%%% Author  : Badlop
-+%%% Purpose : Log XMPP packets to XML file
-+%%% Created : 
-+%%% Id      : 
-+%%%----------------------------------------------------------------------
-+
-+-module(mod_logxml).
-+-author('badlop@ono.com').
-+
-+-behaviour(gen_mod).
-+
-+-export([start/2, init/7, stop/1,
-+	 send_packet/4, receive_packet/5]).
-+
-+-include("ejabberd.hrl").
-+-include("jlib.hrl").
-+
-+-define(PROCNAME, ejabberd_mod_logxml).
-+
-+%% -------------------
-+%% Module control
-+%% -------------------
-+
-+start(Host, Opts) ->
-+    Logdir = gen_mod:get_opt(logdir, Opts, fun(A) -> A end, "/tmp/jabberlogs/"),
-+
-+    Rd = gen_mod:get_opt(rotate_days, Opts, fun(A) -> A end, 1),
-+    Rf = case gen_mod:get_opt(rotate_megs, Opts, fun(A) -> A end, 10) of
-+	     no -> no;
-+	     Rf1 -> Rf1*1024*1024
-+	 end,
-+    Rp = case gen_mod:get_opt(rotate_kpackets, Opts, fun(A) -> A end, 10) of
-+	     no -> no;
-+	     Rp1 -> Rp1*1000
-+	 end,
-+    RotateO = {Rd, Rf, Rp},
-+    CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, fun(A) -> A end, 1),
-+
-+    Timezone = gen_mod:get_opt(timezone, Opts, fun(A) -> A end, local),
-+
-+    Orientation = gen_mod:get_opt(orientation, Opts, fun(A) -> A end, [send, recv]),
-+    Stanza = gen_mod:get_opt(stanza, Opts, fun(A) -> A end, [iq, message, presence, other]),
-+    Direction = gen_mod:get_opt(direction, Opts, fun(A) -> A end, [internal, vhosts, external]),
-+    FilterO = {
-+      {orientation, Orientation},
-+      {stanza, Stanza},
-+      {direction, Direction}},
-+    ShowIP = gen_mod:get_opt(show_ip, Opts, fun(A) -> A end, false),
-+
-+    ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-+	     spawn(?MODULE, init, [binary_to_list(Host), Logdir, RotateO, CheckRKP,
-+				   Timezone, ShowIP, FilterO])).
-+
-+stop(Host) ->
-+    ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! stop,
-+    {wait, Proc}.
-+
-+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) ->
-+    {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone),
-+    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day,
-+	 Timezone, ShowIP, FilterO).
-+
-+%% -------------------
-+%% Main
-+%% -------------------
-+
-+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC,
-+	      Gregorian_day_log, Timezone) ->
-+    {RO_days, RO_size, RO_packets} = RotateO,
-+
-+    Rotate1 = case RO_packets of
-+		  no -> false;
-+		  PacketC -> true;
-+		  _ -> false
-+	      end,
-+
-+    Filesize = filelib:file_size(Filename),
-+    Rotate2 = if 
-+		  RO_size == no -> false;
-+		  Filesize >= RO_size -> true;
-+		  true -> false
-+	      end,
-+
-+    Gregorian_day_today = get_gregorian_day(),
-+    Rotate3 = if
-+		  RO_days == no -> false;
-+		  (Gregorian_day_today - Gregorian_day_log) >= RO_days -> 
-+		      true;
-+		  true -> false
-+	      end,
-+
-+    case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of
-+	true -> 
-+	    {IoDevice2, Filename2, Gregorian_day2} =
-+		rotate_log(IoDevice, Logdir, Host, Timezone),
-+	    {IoDevice2, Filename2, Gregorian_day2, 0};
-+	false -> 
-+	    {IoDevice, Filename, Gregorian_day_log, PacketC+1}
-+    end.
-+
-+filter(FilterO, E) ->
-+    {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} =
-+	FilterO,
-+    {Orientation, From, To, Packet} = E,
-+
-+    {xmlel, Stanza_str, _Attrs, _Els} = Packet,
-+    Stanza = list_to_atom(binary_to_list(Stanza_str)),
-+
-+    Hosts_all = ejabberd_config:get_global_option(hosts, fun(A) -> A end),
-+    {Host_local, Host_remote} = case Orientation of
-+				    send -> {From#jid.lserver, To#jid.lserver};
-+				    recv -> {To#jid.lserver, From#jid.lserver}
-+				end,
-+    Direction = case Host_remote of
-+		    Host_local -> internal;
-+		    _ -> 
-+			case lists:member(Host_remote, Hosts_all) of
-+			    true -> vhosts;
-+			    false -> external
-+			end
-+		end,
-+
-+    {lists:all(fun(O) -> O end, 
-+	       [lists:member(Orientation, OrientationO),
-+		lists:member(Stanza, StanzaO),
-+		lists:member(Direction, DirectionO)]),
-+     {Orientation, Stanza, Direction}}. 
-+
-+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+     Gregorian_day, Timezone, ShowIP, FilterO) ->
-+    receive
-+	{addlog, E} ->
-+	    {IoDevice3, Filename3, Gregorian_day3, PacketC3} =
-+		case filter(FilterO, E) of
-+		    {true, OSD} ->
-+			Div = calc_div(PacketC, CheckRKP),
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2} =
-+			    case Div==round(Div) of
-+				true ->
-+				    manage_rotate(Host, IoDevice, Filename,
-+						  Logdir, RotateO, PacketC,
-+						  Gregorian_day, Timezone);
-+				false ->
-+				    {IoDevice, Filename, Gregorian_day,
-+				     PacketC+1}
-+			    end,
-+			add_log(IoDevice2, Timezone, ShowIP, E, OSD),
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2};
-+		    _ ->
-+			{IoDevice, Filename, Gregorian_day, PacketC}
-+		end,
-+	    loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO,
-+		 PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO);
-+	stop ->
-+	    close_file(IoDevice),
-+	    ok;
-+	_ ->
-+	    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+		 Gregorian_day, Timezone, ShowIP, FilterO)
-+    end.
-+
-+send_packet(P, _C2SState, FromJID, ToJID) ->
-+    Host = FromJID#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {send, FromJID, ToJID, P}},
-+    P.
-+
-+receive_packet(P, _C2SState, _JID, From, To) ->
-+    Host = To#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {recv, From, To, P}},
-+    P.
-+
-+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) ->
-+    %%{Orientation, Stanza, Direction} = OSD, 
-+    LocalJID = case Orientation of
-+		   send -> From;
-+		   recv -> To
-+	       end,
-+    LocalIPS = case ShowIP of
-+		   true ->
-+		       case ejabberd_sm:get_user_ip(
-+			      LocalJID#jid.user,
-+			      LocalJID#jid.server,
-+			      LocalJID#jid.resource) of
-+			   {UserIP, _Port} ->
-+			       io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]);
-+			   undefined -> "lip=\"undefined\" "
-+		       end;
-+		   false -> ""
-+	       end,
-+    TimestampISO = get_now_iso(Timezone),
-+    io:fwrite(Io, "<packet or=\"~p\" ljid=\"~s\" ~sts=\"~s\">~s</packet>~n",
-+	      [Orientation, jlib:jid_to_string(LocalJID), LocalIPS,
-+	       TimestampISO, binary_to_list(fxml:element_to_binary(Packet))]).
-+
-+%% -------------------
-+%% File
-+%% -------------------
-+
-+open_file(Logdir, Host, Timezone) ->
-+    TimeStamp = get_now_iso(Timezone),
-+    Year = string:substr(TimeStamp, 1, 4),
-+    Month = string:substr(TimeStamp, 5, 2),
-+    Day = string:substr(TimeStamp, 7, 2),
-+    Hour = string:substr(TimeStamp, 10, 2),
-+    Min = string:substr(TimeStamp, 13, 2),
-+    Sec = string:substr(TimeStamp, 16, 2),
-+    S = "-",
-+    Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec,
-+			     ".xml"]),
-+    Filename = filename:join([Logdir, Logname]),
-+
-+    Gregorian_day = get_gregorian_day(),
-+
-+    %% Open file, create if it does not exist, create parent dirs if needed
-+    case file:read_file_info(Filename) of
-+	{ok, _} ->
-+	    {ok, IoDevice} = file:open(Filename, [append]);
-+	{error, enoent} ->
-+	    make_dir_rec(Logdir),
-+	    {ok, IoDevice} = file:open(Filename, [append]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml version=\"1.0\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml-stylesheet href=\"xmpp.xsl\" type=\"text/xsl\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<log>"])
-+    end,
-+    {IoDevice, Filename, Gregorian_day}.
-+
-+close_file(IoDevice) ->
-+    io:fwrite(IoDevice, "~s~n", ["</log>"]),
-+    file:close(IoDevice).
-+
-+rotate_log(IoDevice, Logdir, Host, Timezone) ->
-+    close_file(IoDevice),
-+    open_file(Logdir, Host, Timezone).
-+
-+make_dir_rec(Dir) ->
-+    case file:read_file_info(Dir) of
-+	{ok, _} ->
-+	    ok;
-+	{error, enoent} ->
-+	    DirS = filename:split(Dir),
-+	    DirR = lists:sublist(DirS, length(DirS)-1),
-+	    make_dir_rec(filename:join(DirR)),
-+	    file:make_dir(Dir)
-+    end.
-+
-+%% -------------------
-+%% Utils
-+%% -------------------
-+
-+get_gregorian_day() -> calendar:date_to_gregorian_days(date()).
-+
-+get_now_iso(Timezone) ->
-+    TimeStamp = case Timezone of
-+		    local -> calendar:now_to_local_time(now());
-+		    universal -> calendar:now_to_universal_time(now())
-+		end,
-+    binary_to_list(jlib:timestamp_to_legacy(TimeStamp)).
-+
-+calc_div(A, B) when is_integer(A) and is_integer(B) and (B /= 0) ->
-+    A/B;
-+calc_div(_A, _B) ->
-+    0.5. %% This ensures that no rotation is performed
-diff --git a/src/gen_mod.erl b/src/gen_mod.erl
-index efbfc08..8a432b4 100644
---- a/src/gen_mod.erl
-+++ b/src/gen_mod.erl
-@@ -301,7 +301,7 @@ validate_opts(Module, Opts) ->
- db_type(Opts, Module) when is_list(Opts) ->
-     db_type(global, Opts, Module);
- db_type(Host, Module) when is_atom(Module) ->
--    case Module:mod_opt_type(db_type) of
-+    case catch Module:mod_opt_type(db_type) of
- 	F when is_function(F) ->
- 	    case get_module_opt(Host, Module, db_type, F) of
- 		undefined -> ejabberd_config:default_db(Host, Module);
-@@ -314,7 +314,7 @@ db_type(Host, Module) when is_atom(Module) ->
- -spec db_type(binary(), opts(), module()) -> db_type().
- 
- db_type(Host, Opts, Module) ->
--    case Module:mod_opt_type(db_type) of
-+    case catch Module:mod_opt_type(db_type) of
- 	F when is_function(F) ->
- 	    case get_opt(db_type, Opts, F) of
- 		undefined -> ejabberd_config:default_db(Host, Module);
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
deleted file mode 100644
index 1d925a5fe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-# Calculate format=diff merge(net-im/ejabberd)>=2&&merge(net-im/ejabberd)<3
-diff -uNr ejabberd-2.0.2-beta1.ORIG/src/mod_logxml.erl ejabberd-2.0.2-beta1/src/mod_logxml.erl
---- mod_logxml.erl
-+++ mod_logxml.erl
-@@ -0,0 +1,261 @@
-+%%%----------------------------------------------------------------------
-+%%% File    : mod_logxml.erl
-+%%% Author  : Badlop
-+%%% Purpose : Log XMPP packets to XML file
-+%%% Created : 
-+%%% Id      : 
-+%%%----------------------------------------------------------------------
-+
-+-module(mod_logxml).
-+-author('badlop@ono.com').
-+
-+-behaviour(gen_mod).
-+
-+-export([start/2, init/7, stop/1,
-+	 send_packet/3, receive_packet/4]).
-+
-+-include("ejabberd.hrl").
-+-include("jlib.hrl").
-+
-+-define(PROCNAME, ejabberd_mod_logxml).
-+
-+%% -------------------
-+%% Module control
-+%% -------------------
-+
-+start(Host, Opts) ->
-+    Logdir = gen_mod:get_opt(logdir, Opts, "/tmp/jabberlogs/"),
-+
-+    Rd = gen_mod:get_opt(rotate_days, Opts, 1),
-+    Rf = case gen_mod:get_opt(rotate_megs, Opts, 10) of
-+	     no -> no;
-+	     Rf1 -> Rf1*1024*1024
-+	 end,
-+    Rp = case gen_mod:get_opt(rotate_kpackets, Opts, 10) of
-+	     no -> no;
-+	     Rp1 -> Rp1*1000
-+	 end,
-+    RotateO = {Rd, Rf, Rp},
-+    CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, 1),
-+
-+    Timezone = gen_mod:get_opt(timezone, Opts, local),
-+
-+    Orientation = gen_mod:get_opt(orientation, Opts, [send, recv]),
-+    Stanza = gen_mod:get_opt(stanza, Opts, [iq, message, presence, other]),
-+    Direction = gen_mod:get_opt(direction, Opts, [internal, vhosts, external]),
-+    FilterO = {
-+      {orientation, Orientation},
-+      {stanza, Stanza},
-+      {direction, Direction}},
-+    ShowIP = gen_mod:get_opt(show_ip, Opts, false),
-+
-+    ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-+	     spawn(?MODULE, init, [Host, Logdir, RotateO, CheckRKP,
-+				   Timezone, ShowIP, FilterO])).
-+
-+stop(Host) ->
-+    ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90),
-+    ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90),
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! stop,
-+    {wait, Proc}.
-+
-+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) ->
-+    {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone),
-+    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day,
-+	 Timezone, ShowIP, FilterO).
-+
-+%% -------------------
-+%% Main
-+%% -------------------
-+
-+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC,
-+	      Gregorian_day_log, Timezone) ->
-+    {RO_days, RO_size, RO_packets} = RotateO,
-+
-+    Rotate1 = case RO_packets of
-+		  no -> false;
-+		  PacketC -> true;
-+		  _ -> false
-+	      end,
-+
-+    Filesize = filelib:file_size(Filename),
-+    Rotate2 = if 
-+		  RO_size == no -> false;
-+		  Filesize >= RO_size -> true;
-+		  true -> false
-+	      end,
-+
-+    Gregorian_day_today = get_gregorian_day(),
-+    Rotate3 = if
-+		  RO_days == no -> false;
-+		  (Gregorian_day_today - Gregorian_day_log) >= RO_days -> 
-+		      true;
-+		  true -> false
-+	      end,
-+
-+    case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of
-+	true -> 
-+	    {IoDevice2, Filename2, Gregorian_day2} =
-+		rotate_log(IoDevice, Logdir, Host, Timezone),
-+	    {IoDevice2, Filename2, Gregorian_day2, 0};
-+	false -> 
-+	    {IoDevice, Filename, Gregorian_day_log, PacketC+1}
-+    end.
-+
-+filter(FilterO, E) ->
-+    {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} =
-+	FilterO,
-+    {Orientation, From, To, Packet} = E,
-+
-+    {xmlelement, Stanza_str, _Attrs, _Els} = Packet,
-+    Stanza = list_to_atom(Stanza_str),
-+
-+    Hosts_all = ejabberd_config:get_global_option(hosts),
-+    {Host_local, Host_remote} = case Orientation of
-+				    send -> {From#jid.lserver, To#jid.lserver};
-+				    recv -> {To#jid.lserver, From#jid.lserver}
-+				end,
-+    Direction = case Host_remote of
-+		    Host_local -> internal;
-+		    _ -> 
-+			case lists:member(Host_remote, Hosts_all) of
-+			    true -> vhosts;
-+			    false -> external
-+			end
-+		end,
-+
-+    {lists:all(fun(O) -> O end, 
-+	       [lists:member(Orientation, OrientationO),
-+		lists:member(Stanza, StanzaO),
-+		lists:member(Direction, DirectionO)]),
-+     {Orientation, Stanza, Direction}}. 
-+
-+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+     Gregorian_day, Timezone, ShowIP, FilterO) ->
-+    receive
-+	{addlog, E} ->
-+	    {IoDevice3, Filename3, Gregorian_day3, PacketC3} =
-+		case filter(FilterO, E) of
-+		    {true, OSD} ->
-+			Div = PacketC/CheckRKP,
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2} =
-+			    case Div==round(Div) of
-+				true ->
-+				    manage_rotate(Host, IoDevice, Filename,
-+						  Logdir, RotateO, PacketC,
-+						  Gregorian_day, Timezone);
-+				false ->
-+				    {IoDevice, Filename, Gregorian_day,
-+				     PacketC+1}
-+			    end,
-+			add_log(IoDevice2, Timezone, ShowIP, E, OSD),
-+			{IoDevice2, Filename2, Gregorian_day2, PacketC2};
-+		    _ ->
-+			{IoDevice, Filename, Gregorian_day, PacketC}
-+		end,
-+	    loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO,
-+		 PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO);
-+	stop ->
-+	    close_file(IoDevice),
-+	    ok;
-+	_ ->
-+	    loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
-+		 Gregorian_day, Timezone, ShowIP, FilterO)
-+    end.
-+
-+send_packet(FromJID, ToJID, P) ->
-+    Host = FromJID#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {send, FromJID, ToJID, P}}.
-+
-+receive_packet(_JID, From, To, P) ->
-+    Host = To#jid.lserver,
-+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-+    Proc ! {addlog, {recv, From, To, P}}.
-+
-+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) ->
-+    %%{Orientation, Stanza, Direction} = OSD, 
-+    LocalJID = case Orientation of
-+		   send -> From;
-+		   recv -> To
-+	       end,
-+    LocalIPS = case ShowIP of
-+		   true -> 
-+		       {UserIP, _Port} = ejabberd_sm:get_user_ip(
-+					   LocalJID#jid.user,
-+					   LocalJID#jid.server,
-+					   LocalJID#jid.resource),
-+		       io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]);
-+		   false -> ""
-+	       end,
-+    TimestampISO = get_now_iso(Timezone),
-+    io:fwrite(Io, "<packet or=\"~p\" ljid=\"~s\" ~sts=\"~s\">~s</packet>~n",
-+	      [Orientation, jlib:jid_to_string(LocalJID), LocalIPS,
-+	       TimestampISO, xml:element_to_string(Packet)]).
-+
-+%% -------------------
-+%% File
-+%% -------------------
-+
-+open_file(Logdir, Host, Timezone) ->
-+    TimeStamp = get_now_iso(Timezone),
-+    Year = string:substr(TimeStamp, 1, 4),
-+    Month = string:substr(TimeStamp, 5, 2),
-+    Day = string:substr(TimeStamp, 7, 2),
-+    Hour = string:substr(TimeStamp, 10, 2),
-+    Min = string:substr(TimeStamp, 13, 2),
-+    Sec = string:substr(TimeStamp, 16, 2),
-+    S = "-",
-+    Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec,
-+			     ".xml"]),
-+    Filename = filename:join([Logdir, Logname]),
-+
-+    Gregorian_day = get_gregorian_day(),
-+
-+    %% Open file, create if it does not exist, create parent dirs if needed
-+    case file:read_file_info(Filename) of
-+	{ok, _} ->
-+	    {ok, IoDevice} = file:open(Filename, [append]);
-+	{error, enoent} ->
-+	    make_dir_rec(Logdir),
-+	    {ok, IoDevice} = file:open(Filename, [append]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml version=\"1.0\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<?xml-stylesheet href=\"xmpp.xsl\" type=\"text/xsl\"?>"]),
-+	    io:fwrite(IoDevice, "~s~n", ["<log>"])
-+    end,
-+    {IoDevice, Filename, Gregorian_day}.
-+
-+close_file(IoDevice) ->
-+    io:fwrite(IoDevice, "~s~n", ["</log>"]),
-+    file:close(IoDevice).
-+
-+rotate_log(IoDevice, Logdir, Host, Timezone) ->
-+    close_file(IoDevice),
-+    open_file(Logdir, Host, Timezone).
-+
-+make_dir_rec(Dir) ->
-+    case file:read_file_info(Dir) of
-+	{ok, _} ->
-+	    ok;
-+	{error, enoent} ->
-+	    DirS = filename:split(Dir),
-+	    DirR = lists:sublist(DirS, length(DirS)-1),
-+	    make_dir_rec(filename:join(DirR)),
-+	    file:make_dir(Dir)
-+    end.
-+
-+%% -------------------
-+%% Utils
-+%% -------------------
-+
-+get_gregorian_day() -> calendar:date_to_gregorian_days(date()).
-+
-+get_now_iso(Timezone) ->
-+    TimeStamp = case Timezone of
-+		    local -> calendar:now_to_local_time(now());
-+		    universal -> calendar:now_to_universal_time(now())
-+		end,
-+    jlib:timestamp_to_iso(TimeStamp).
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/libproxy/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/libproxy/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/libproxy/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
deleted file mode 100644
index ecace1d29..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate format=diff
-diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk
-index 017d428..7900398 100644
---- a/libproxy/cmake/modules.cmk
-+++ b/libproxy/cmake/modules.cmk
-@@ -16,7 +16,6 @@ include(cmake/modules/config_macosx.cmk)
- include(cmake/modules/network_networkmanager.cmk)
- include(cmake/modules/pacrunner_mozjs.cmk)
- include(cmake/modules/pacrunner_natus.cmk)
--include(cmake/modules/pacrunner_webkit.cmk)
- 
- # Build the pacrunner into libproxy unless we are building for multiple engines
- set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building more than one PR")
-@@ -41,6 +40,5 @@ px_module(ignore_ip                1                 1)
- px_module(network_networkmanager   "${NM_FOUND}"     0       ${NM_LIBRARIES})
- px_module(pacrunner_mozjs          "${MOZJS_FOUND}"  ${BIPR} ${MOZJS_LIBRARIES})
- px_module(pacrunner_natus          "${NATUS_FOUND}"  ${BIPR} ${NATUS_LIBRARIES})
--px_module(pacrunner_webkit         "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES})
- px_module(wpad_dns_alias           1                 1)
- message("")
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/openconnect/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/openconnect/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/openconnect/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
deleted file mode 100644
index 4e310cef8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# Calculate format=diff
-diff --git a/Makefile b/Makefile
-index b389275..6050828 100644
---- a/Makefile
-+++ b/Makefile
-@@ -452,9 +452,9 @@ KRB5_CONFIG =
- LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64
- LDFLAGS = -Wl,--as-needed
- LIBICONV = 
--LIBLZ4_CFLAGS = -I/usr/local/include 
--LIBLZ4_LIBS = -L/usr/local/lib -llz4 
--LIBLZ4_PC = liblz4
-+LIBLZ4_CFLAGS =
-+LIBLZ4_LIBS =
-+LIBLZ4_PC =
- LIBOBJS = 
- LIBP11_CFLAGS = 
- LIBP11_LIBS = 
-diff --git a/config.h b/config.h
-index eedf4ef..210aea8 100644
---- a/config.h
-+++ b/config.h
-@@ -128,7 +128,7 @@
- /* #undef HAVE_LIBSTOKEN */
- 
- /* LZ4 was found */
--#define HAVE_LZ4 /**/
-+/* #undef HAVE_LZ4 */
- 
- /* Define to 1 if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
-diff --git a/po/Makefile b/po/Makefile
-index 13c74ed..4ea8c04 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -181,9 +181,9 @@ KRB5_CONFIG =
- LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64
- LDFLAGS = -Wl,--as-needed
- LIBICONV = 
--LIBLZ4_CFLAGS = -I/usr/local/include 
--LIBLZ4_LIBS = -L/usr/local/lib -llz4 
--LIBLZ4_PC = liblz4
-+LIBLZ4_CFLAGS =
-+LIBLZ4_LIBS =
-+LIBLZ4_PC =
- LIBOBJS = 
- LIBP11_CFLAGS = 
- LIBP11_LIBS = 
-diff --git a/www/Makefile b/www/Makefile
-index b4a810c..dd255db 100644
---- a/www/Makefile
-+++ b/www/Makefile
-@@ -271,9 +271,9 @@ KRB5_CONFIG =
- LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64
- LDFLAGS = -Wl,--as-needed
- LIBICONV = 
--LIBLZ4_CFLAGS = -I/usr/local/include 
--LIBLZ4_LIBS = -L/usr/local/lib -llz4 
--LIBLZ4_PC = liblz4
-+LIBLZ4_CFLAGS =
-+LIBLZ4_LIBS =
-+LIBLZ4_PC =
- LIBOBJS = 
- LIBP11_CFLAGS = 
- LIBP11_LIBS = 
-diff --git a/www/images/Makefile b/www/images/Makefile
-index 2dd6f7d..797de77 100644
---- a/www/images/Makefile
-+++ b/www/images/Makefile
-@@ -210,9 +210,9 @@ KRB5_CONFIG =
- LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64
- LDFLAGS = -Wl,--as-needed
- LIBICONV = 
--LIBLZ4_CFLAGS = -I/usr/local/include 
--LIBLZ4_LIBS = -L/usr/local/lib -llz4 
--LIBLZ4_PC = liblz4
-+LIBLZ4_CFLAGS =
-+LIBLZ4_LIBS =
-+LIBLZ4_PC =
- LIBOBJS = 
- LIBP11_CFLAGS = 
- LIBP11_LIBS = 
-diff --git a/www/inc/Makefile b/www/inc/Makefile
-index fb578a7..78272a1 100644
---- a/www/inc/Makefile
-+++ b/www/inc/Makefile
-@@ -210,9 +210,9 @@ KRB5_CONFIG =
- LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64
- LDFLAGS = -Wl,--as-needed
- LIBICONV = 
--LIBLZ4_CFLAGS = -I/usr/local/include 
--LIBLZ4_LIBS = -L/usr/local/lib -llz4 
--LIBLZ4_PC = liblz4
-+LIBLZ4_CFLAGS =
-+LIBLZ4_LIBS =
-+LIBLZ4_PC =
- LIBOBJS = 
- LIBP11_CFLAGS = 
- LIBP11_LIBS = 
-diff --git a/www/styles/Makefile b/www/styles/Makefile
-index 4b9b0d2..7481564 100644
---- a/www/styles/Makefile
-+++ b/www/styles/Makefile
-@@ -210,9 +210,9 @@ KRB5_CONFIG =
- LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64
- LDFLAGS = -Wl,--as-needed
- LIBICONV = 
--LIBLZ4_CFLAGS = -I/usr/local/include 
--LIBLZ4_LIBS = -L/usr/local/lib -llz4 
--LIBLZ4_PC = liblz4
-+LIBLZ4_CFLAGS =
-+LIBLZ4_LIBS =
-+LIBLZ4_PC =
- LIBOBJS = 
- LIBP11_CFLAGS = 
- LIBP11_LIBS = 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/cnijfilter/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
deleted file mode 100644
index 72e04e867..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=3.20
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/cnijfilter/libpng15.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
deleted file mode 100644
index 069e2275d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff
-diff --git a/cnijfilter/src/bjfimage.c b/cnijfilter/src/bjfimage.c
-index 4006f9d..111b4a2 100755
---- a/cnijfilter/src/bjfimage.c
-+++ b/cnijfilter/src/bjfimage.c
-@@ -1574,7 +1574,7 @@ static short png_image_init( LPBJF_IMAGEINFO lpbjfimage )
- 		goto onErr;
- 	}
- 
--	if (setjmp (png_p->jmpbuf))
-+	if (setjmp (png_jmpbuf(png_p)))
- 	{
- 		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
- 		goto onErr;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
deleted file mode 100644
index 61af2b51e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.10&&pkg(sys-kernel/calculate-sources)<3.11&&merge(net-wireless/broadcom-sta)>=6.30.223.30&&merge(net-wireless/broadcom-sta)<6.30.223.31
-diff -ru build.3.9/src/wl/sys/wl_linux.c build/src/wl/sys/wl_linux.c
---- build.3.9/src/wl/sys/wl_linux.c	2013-06-18 13:48:04.109167642 +0000
-+++ build/src/wl/sys/wl_linux.c	2013-06-18 14:24:33.448198331 +0000
-@@ -3236,7 +3236,7 @@
- void
- wl_tkip_printstats(wl_info_t *wl, bool group_key)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	char debug_buf[512];
- 	int idx;
- 	if (wl->tkipmodops) {
-@@ -3409,6 +3409,7 @@
- 	return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- static int
- wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
- {
-@@ -3463,19 +3464,90 @@
- 	return length;
- }
- 
-+#else
-+
-+static int
-+wl_proc_read(struct seq_file *seq, void *offset)
-+{
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+	int bcmerror, to_user;
-+
-+	WL_LOCK(wl);
-+	bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
-+	WL_UNLOCK(wl);
-+
-+	seq_printf(seq, "%d\n", to_user);
-+	return bcmerror;
-+}
-+
-+static ssize_t wl_proc_write(struct file *file, const char __user *buff,
-+			     size_t length, loff_t *ppos)
-+{
-+	struct seq_file *seq = file->private_data;
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+	int bcmerror, from_user = 0;
-+
-+	if (length != 1) {
-+		WL_ERROR(("%s: Invalid data length\n", __FUNCTION__));
-+		return -EIO;
-+	}
-+
-+	if (copy_from_user(&from_user, buff, 1)) {
-+		WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
-+		return -EFAULT;
-+	}
-+
-+	if (from_user >= 0x30)
-+		from_user -= 0x30;
-+
-+	WL_LOCK(wl);
-+	bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL);
-+	WL_UNLOCK(wl);
-+
-+	if (bcmerror < 0) {
-+		WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
-+		return -EIO;
-+	}
-+	*ppos += length;
-+	return length;
-+}
-+
-+static int wl_proc_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, wl_proc_read, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations wl_proc_fops = {
-+	.owner = THIS_MODULE,
-+	.open = wl_proc_open,
-+	.read = seq_read,
-+	.write = wl_proc_write,
-+	.llseek = seq_lseek,
-+	.release = single_release,
-+};
-+#endif
-+
- static int
- wl_reg_proc_entry(wl_info_t *wl)
- {
- 	char tmp[32];
- 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
--	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
-+	wl->proc_entry = create_proc_entry(tmp, 0644, NULL);
-+	if (wl->proc_entry) {
-+		wl->proc_entry->read_proc = wl_proc_read;
-+		wl->proc_entry->write_proc = wl_proc_write;
-+		wl->proc_entry->data = wl;
-+	} 
-+#else
-+	wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);
-+#endif
-+	if (!wl->proc_entry) {
- 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
- 		ASSERT(0);
- 		return -1;
- 	}
--	wl->proc_entry->read_proc = wl_proc_read;
--	wl->proc_entry->write_proc = wl_proc_write;
--	wl->proc_entry->data = wl;
- 	return 0;
- }
- #ifdef WLOFFLD
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
deleted file mode 100644
index 80a50f2d1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=4.3&&pkg(sys-kernel/calculate-sources)<4.5&&merge(net-wireless/broadcom-sta)>=6.30.223.271&&merge(net-wireless/broadcom-sta)<6.30.223.272&&os_arch_machine==i686
-diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
-index f879398..c098234 100644
---- a/src/shared/linux_osl.c
-+++ b/src/shared/linux_osl.c
-@@ -932,7 +932,7 @@ osl_getcycles(void)
- 	uint cycles;
- 
- #if defined(__i386__)
--	cycles = (u32)native_read_tsc();
-+	cycles = (u32)rdtsc();
- #else
- 	cycles = 0;
- #endif 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
deleted file mode 100644
index 356666be1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=2.4
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
deleted file mode 100644
index 59430aa2f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=src link=../src symbolic
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
deleted file mode 100644
index d897cc5fb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Calculate format=diff
-diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
-index 12e5f2c..584fc66 100644
---- src/eap_peer/Makefile
-+++ src/eap_peer/Makefile
-@@ -37,13 +37,15 @@ OBJS_both += ../utils/wpa_debug.o
- OBJS_both += ../utils/base64.o
- OBJS_both += ../utils/wpabuf.o
- OBJS_both += ../utils/eloop.o
--OBJS_both += ../crypto/md5.o
- ifneq ($(CONFIG_TLS), openssl)
- OBJS_both += ../crypto/sha1.o
-+OBJS_both += ../crypto/md5.o
- endif
- OBJS_both += ../crypto/sha1-tlsprf.o
- OBJS_both += ../crypto/aes-encblock.o
-+ifneq ($(CONFIG_TLS), openssl)
- OBJS_both += ../crypto/aes-wrap.o
-+endif
- OBJS_both += ../crypto/aes-ctr.o
- OBJS_both += ../crypto/aes-eax.o
- OBJS_both += ../crypto/aes-omac1.o
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove b/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
deleted file mode 100644
index f81b4d243..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=src append=remove force
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
deleted file mode 100644
index 9b87533d5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=2.32.1
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
deleted file mode 100644
index 5e4696c36..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Calculate format=diff
-<pre>
---- src/palimpsest/gdu-section-drive.c	2010-03-14 22:50:51.000000000 +0300
-+++ src/palimpsest/gdu-section-drive1.c	2011-10-22 04:40:33.000000000 +0400
-@@ -429,6 +429,10 @@
-         launch_context = NULL;
- 
-         app_info = G_APP_INFO (g_desktop_app_info_new ("brasero.desktop"));
-+        if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xcdroast.desktop"));
-+        if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("gnomebaker.desktop"));
-+        if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("graveman.desktop"));
-+        if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xfburn.desktop"));
-         if (app_info == NULL) {
-                 /* TODO: Use PackageKit to install Brasero */
-                 dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section)))),
-@@ -436,7 +440,7 @@
-                                                              GTK_MESSAGE_ERROR,
-                                                              GTK_BUTTONS_OK,
-                                                              "<b><big><big>%s</big></big></b>\n\n%s",
--                                                             _("Error launching Brasero"),
-+                                                             _("Error launching CD/DVD burning program"),
-                                                              _("The application is not installed"));
-                 gtk_widget_show_all (dialog);
-                 gtk_dialog_run (GTK_DIALOG (dialog));
-@@ -456,7 +460,7 @@
-                                                              GTK_MESSAGE_ERROR,
-                                                              GTK_BUTTONS_OK,
-                                                              "<b><big><big>%s</big></big></b>\n\n%s",
--                                                             _("Error launching Brasero"),
-+                                                             _("Error launching CD/DVD burning program"),
-                                                              error->message);
-                 g_error_free (error);
-                 gtk_widget_show_all (dialog);	
-</pre>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/openrc/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/openrc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/openrc/branding.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/openrc/branding.patch
deleted file mode 100644
index 4c2dbf91e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/openrc/branding.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=diff
-diff --git a/src/rc/Makefile b/src/rc/Makefile
-index 9d33192..4999edf 100644
---- a/src/rc/Makefile
-+++ b/src/rc/Makefile
-@@ -50,9 +50,7 @@ ${SRCS}: version.h
- .PHONY:	version.h.tmp
- version.h.tmp:
- 	echo "#define VERSION \"${VERSION}${GITVER}\"" >$@
--	if test -n "${BRANDING}"; then \
--		echo "#define BRANDING \"${BRANDING}\"" >> $@; \
--	fi
-+	echo "#define BRANDING \"Calculate Linux\"" >> $@; \
- 
- version.h: version.h.tmp
- 	cmp -s $@.tmp $@ && rm $@.tmp || mv $@.tmp $@
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/portage/.calculate_directory
deleted file mode 100644
index f1f1f61ed..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/portage/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=2.2.20.1&&merge()<=2.2.23
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
deleted file mode 100644
index accbf7d09..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff
-diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py
-index a7f2d44..91d24e0 100644
---- a/pym/_emerge/BinpkgFetcher.py
-+++ b/pym/_emerge/BinpkgFetcher.py
-@@ -133,7 +133,7 @@ class BinpkgFetcher(SpawnProcess):
- 			if bintree._remote_has_index:
- 				remote_mtime = bintree._remotepkgs[
- 					bintree.dbapi._instance_key(
--					self.pkg.cpv)].get("MTIME")
-+					self.pkg.cpv)].get("_mtime_")
- 				if remote_mtime is not None:
- 					try:
- 						remote_mtime = long(remote_mtime)
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
deleted file mode 100644
index 0f51ae34e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-boot/grub)<2.00_p5000
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
deleted file mode 100644
index ffc1c8d0d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-# Calculate format=diff merge(sys-boot/grub)>=2.00
-Add CHROOT_PATH ability. Add sync before grub_setup.
-diff --git util/grub-install.in util/grub-install.in
-index e19f1cd..aa978c8 100644
---- util/grub-install.in
-+++ util/grub-install.in
-@@ -737,6 +737,8 @@ fi
- 
- # Perform the grub_modinfo_platform-dependent install
- if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ] ; then
-+    # sync filesystem before grub_setup
-+    sync
-     # Now perform the installation.
-     "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \
- 	--device-map="${device_map}" "${install_device}" || exit 1
-diff --git util/grub-mkconfig.in util/grub-mkconfig.in
-index 516be86..9f19817 100644
---- util/grub-mkconfig.in
-+++ util/grub-mkconfig.in
-@@ -129,19 +129,19 @@ else
- fi
- 
- # Device containing our userland.  Typically used for root= parameter.
--GRUB_DEVICE="`${grub_probe} --target=device /`"
-+GRUB_DEVICE="`${grub_probe} --target=device /${CHROOT_PATH#/}`"
- GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
- 
- # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.
--GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
-+GRUB_DEVICE_BOOT="`${grub_probe} --target=device ${CHROOT_PATH%/}/boot`"
- GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
- 
- # Filesystem for the device containing our userland.  Used for stuff like
- # choosing Hurd filesystem module.
- GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
- 
--if test -f ${sysconfdir}/default/grub ; then
--  . ${sysconfdir}/default/grub
-+if test -f ${CHROOT_PATH}${sysconfdir}/default/grub ; then
-+  . ${CHROOT_PATH}${sysconfdir}/default/grub
- fi
- 
- # XXX: should this be deprecated at some point?
-diff --git util/grub.d/00_header.in util/grub.d/00_header.in
-index 765bfdc..2622638 100644
---- util/grub.d/00_header.in
-+++ util/grub.d/00_header.in
-@@ -137,7 +137,7 @@ fi
- if [ "x$gfxterm" = x1 ]; then
-     if [ -n "$GRUB_FONT" ] ; then
-        # Make the font accessible
--       prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT}"`
-+       prepare_grub_to_access_device `${grub_probe} --target=device "${CHROOT_PATH%/}${GRUB_FONT}"`
-     cat << EOF
- if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then
- EOF
-@@ -160,7 +160,7 @@ if [ x\$feature_default_font_path = xy ] ; then
- else
- EOF
-                 # Make the font accessible
--		prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"`
-+		prepare_grub_to_access_device `${grub_probe} --target=device "${CHROOT_PATH%/}${font_path}"`
-     cat << EOF
-     font="`make_system_path_relative_to_its_root "${font_path}"`"
- fi
-@@ -221,7 +221,7 @@ if [ "x$gfxterm" = x1 ]; then
- 	&& is_path_readable_by_grub "$GRUB_THEME"; then
- 	gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&2
- 
--	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
-+	prepare_grub_to_access_device `${grub_probe} --target=device "${CHROOT_PATH%/}$GRUB_THEME"`
- 	cat << EOF
- insmod gfxmenu
- EOF
-@@ -253,8 +253,8 @@ EOF
- set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
- export theme
- EOF
--    elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
--	    && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
-+    elif [ "x${CHROOT_PATH}$GRUB_BACKGROUND" != x ] && [ -f "${CHROOT_PATH%/}$GRUB_BACKGROUND" ] \
-+	    && is_path_readable_by_grub "${CHROOT_PATH%/}$GRUB_BACKGROUND"; then
- 	gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2
- 	case "$GRUB_BACKGROUND" in 
- 	    *.png)         reader=png ;;
-@@ -262,7 +262,7 @@ EOF
- 	    *.jpg|*.jpeg)  reader=jpeg ;;
- 	    *)             gettext "Unsupported image format" >&2; echo >&2; exit 1 ;;
- 	esac
--	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
-+	prepare_grub_to_access_device `${grub_probe} --target=device "${CHROOT_PATH%/}$GRUB_BACKGROUND"`
- 	cat << EOF
- insmod $reader
- background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
-diff --git util/grub.d/10_linux.in util/grub.d/10_linux.in
-index 14402e8..7cca45d 100644
---- util/grub.d/10_linux.in
-+++ util/grub.d/10_linux.in
-@@ -31,7 +31,7 @@ CLASS="--class gnu-linux --class gnu --class os"
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
- fi
- 
-@@ -153,12 +153,18 @@ EOF
- machine=`uname -m`
- case "x$machine" in
-     xi?86 | xx86_64)
--	list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
--                  if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-+	list=`for i in ${CHROOT_PATH%/}/boot/vmlinuz-* \
-+                 ${CHROOT_PATH%/}/vmlinuz-* \
-+                 ${CHROOT_PATH%/}/boot/kernel-* ; do
-+                  if grub_file_is_not_garbage "$i" && ! [[ -L $i ]] ; then echo -n "$i " ; fi
-               done` ;;
-     *) 
--	list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
--                  if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-+	list=`for i in ${CHROOT_PATH%/}/boot/vmlinuz-* \
-+                 ${CHROOT_PATH%/}/boot/vmlinux-* \
-+                 ${CHROOT_PATH%/}/vmlinuz-* \
-+                 ${CHROOT_PATH%/}/vmlinux-* \
-+                 ${CHROOT_PATH%/}/boot/kernel-* ; do
-+                  if grub_file_is_not_garbage "$i" && ! [[ -L $i ]] ; then echo -n "$i " ; fi
- 	     done` ;;
- esac
- 
-@@ -186,6 +192,7 @@ while [ "x$list" != "x" ] ; do
-   basename=`basename $linux`
-   dirname=`dirname $linux`
-   rel_dirname=`make_system_path_relative_to_its_root $dirname`
-+  rel_dirname=${rel_dirname#/workspace}
-   version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
-   alt_version=`echo $version | sed -e "s,\.old$,,g"`
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-@@ -197,6 +204,8 @@ while [ "x$list" != "x" ] ; do
- 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
- 	   "initramfs-genkernel-${version}" \
- 	   "initramfs-genkernel-${alt_version}" \
-+	   "initramfs-${version}" \
-+	   "initramfs-${version}-install" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-     if test -e "${dirname}/${i}" ; then
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
deleted file mode 100644
index d9d58b2d8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-# Calculate format=diff merge(sys-boot/grub)>=2.00
-Fix detect filesystem for lvm.
-
-Fix readable_by_grub, prepare_grub_access_device for LVM. Fix
-grub-install.
-
-Sometimes program cann't determine fs for device by path /dev/mapper.
-For resolve the problem filesystem for that devices determined by device
-to which they point. (readlink -f)
-diff --git util/grub-install.in util/grub-install.in
-index aa978c8..f85d257 100644
---- util/grub-install.in
-+++ util/grub-install.in
-@@ -571,6 +571,11 @@ fi
- 
- # Create the core image. First, auto-detect the filesystem module.
- fs_module="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=fs --device `"
-+# sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
-+if test "x$fs_module" = x ; then
-+    grub_device_fs=$(readlink -f ${grub_device})
-+    fs_module="`"$grub_probe" --device-map="${device_map}" --target=fs --device "${grub_device_fs}"`"
-+fi
- if test "x$fs_module" = x ; then
-     gettext_printf "Auto-detection of a filesystem of %s failed.\n" "${grub_device}" 1>&2
-     gettext "Try with --recheck." 1>&2
-diff --git util/grub-mkconfig_lib.in util/grub-mkconfig_lib.in
-index 76133b4..04241d9 100644
---- util/grub-mkconfig_lib.in
-+++ util/grub-mkconfig_lib.in
-@@ -60,7 +60,11 @@ is_path_readable_by_grub ()
- 
-   # abort if file is in a filesystem we can't read
-   if "${grub_probe}" -t fs "$path" > /dev/null 2>&1 ; then : ; else
--    return 1
-+    # sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
-+    fsdevice=`readlink -f $(${grub_probe} -t device "$path" 2>/dev/null)`
-+    if "${grub_probe}" -t fs -d "${fsdevice}" > /dev/null 2>&1 ; then : ; else
-+      return 1
-+    fi
-   fi
- 
-   # ... or if we can't figure out the abstraction module, for example if
-@@ -135,7 +139,13 @@ prepare_grub_to_access_device ()
-     echo "insmod ${module}"
-   done
- 
--  fs="`"${grub_probe}" --device "${device}" --target=fs`"
-+  # sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
-+  if "${grub_probe}" --device "${device}" --target=fs >/dev/null 2>/dev/null; then
-+    device_fs="${device}"
-+  else
-+    device_fs=`readlink -f "${device}"`
-+  fi
-+  fs="`"${grub_probe}" --device "${device_fs}" --target=fs`"
-   for module in ${fs} ; do
-     echo "insmod ${module}"
-   done
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
deleted file mode 100644
index 0f39ee61a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=diff merge(sys-boot/grub)>=2.00
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 2622638..2a4726b 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -100,13 +100,13 @@ cat <<EOF
-   if [ x\$feature_all_video_module = xy ]; then
-     insmod all_video
-   else
--    insmod efi_gop
--    insmod efi_uga
--    insmod ieee1275_fb
--    insmod vbe
--    insmod vga
--    insmod video_bochs
--    insmod video_cirrus
-+    for vm in efi_gop efi_uga ieee1275_fb vbe vga video_bochs video_cirrus
-+    do
-+      if [ -f \${prefix}/\${vm}.mod ]
-+      then
-+        insmod \$vm
-+      fi
-+    done
-   fi
- EOF
- fi
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
deleted file mode 100644
index fd4151fc9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-boot/grub)>=2.00_p5000&&merge(sys-boot/grub)<2.01
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
deleted file mode 100644
index 9a15398a4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate format=diff merge(sys-boot/grub)>=2.00
-diff --git util/grub.d/10_linux.in util/grub.d/10_linux.in
-index 14402e8..7cca45d 100644
---- util/grub.d/10_linux.in
-+++ util/grub.d/10_linux.in
-@@ -31,7 +31,7 @@ CLASS="--class gnu-linux --class gnu --class os"
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
- fi
- 
-@@ -197,6 +204,8 @@ while [ "x$list" != "x" ] ; do
- 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
- 	   "initramfs-genkernel-${version}" \
- 	   "initramfs-genkernel-${alt_version}" \
-+	   "initramfs-${version}" \
-+	   "initramfs-${version}-install" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-     if test -e "${dirname}/${i}" ; then
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
deleted file mode 100644
index 0f39ee61a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=diff merge(sys-boot/grub)>=2.00
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 2622638..2a4726b 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -100,13 +100,13 @@ cat <<EOF
-   if [ x\$feature_all_video_module = xy ]; then
-     insmod all_video
-   else
--    insmod efi_gop
--    insmod efi_uga
--    insmod ieee1275_fb
--    insmod vbe
--    insmod vga
--    insmod video_bochs
--    insmod video_cirrus
-+    for vm in efi_gop efi_uga ieee1275_fb vbe vga video_bochs video_cirrus
-+    do
-+      if [ -f \${prefix}/\${vm}.mod ]
-+      then
-+        insmod \$vm
-+      fi
-+    done
-   fi
- EOF
- fi
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
deleted file mode 100644
index 1f7a0e9c3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-boot/grub)>=2.01
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
deleted file mode 100644
index e8ede7c8f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff merge(sys-boot/grub)>=2.00
-diff --git util/grub.d/10_linux.in util/grub.d/10_linux.in
-index 14402e8..7cca45d 100644
---- util/grub.d/10_linux.in
-+++ util/grub.d/10_linux.in
-@@ -31,7 +31,7 @@ CLASS="--class gnu-linux --class gnu --class os"
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
deleted file mode 100644
index 0f39ee61a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=diff merge(sys-boot/grub)>=2.00
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 2622638..2a4726b 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -100,13 +100,13 @@ cat <<EOF
-   if [ x\$feature_all_video_module = xy ]; then
-     insmod all_video
-   else
--    insmod efi_gop
--    insmod efi_uga
--    insmod ieee1275_fb
--    insmod vbe
--    insmod vga
--    insmod video_bochs
--    insmod video_cirrus
-+    for vm in efi_gop efi_uga ieee1275_fb vbe vga video_bochs video_cirrus
-+    do
-+      if [ -f \${prefix}/\${vm}.mod ]
-+      then
-+        insmod \$vm
-+      fi
-+    done
-   fi
- EOF
- fi
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/40grub2 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/40grub2
deleted file mode 100644
index 2b19249c4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/40grub2
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate multiline format=patch path=/linux-boot-probes/mounted/common
-<reg>^(.*)&lt; ("\$mpoint/boot/grub/grub.cfg")</reg>
-<text>sed -r '/BEGIN.*os-prober/,/END.*os-prober/d' \2 | \1</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/chroot.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/chroot.patch
deleted file mode 100644
index 1ce57a786..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/chroot.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# Calculate format=diff pkg(sys-boot/os-prober)<=1.53
-diff --git linux-boot-prober linux-boot-prober
-index e32dc84..b522567 100755
---- linux-boot-prober
-+++ linux-boot-prober
-@@ -33,7 +33,7 @@ if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map"; then
- else
- 	mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 2)
- 	mpoint="$(unescape_mount "$mpoint")"
--	if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
-+	if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/$(echo ${CHROOT_PATH%/} | cut -d/ -f 2-)" ]; then
- 		type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
- 		if ! grep -q " $mpoint/boot " "$OS_PROBER_TMP/mounted-map"; then
- 			linux_mount_boot "$partition" "$mpoint"
-diff --git linux-boot-probes/mounted/common/90fallback linux-boot-probes/mounted/common/90fallback
-index 9ff78e1..9a5cf1a 100755
---- linux-boot-probes/mounted/common/90fallback
-+++ linux-boot-probes/mounted/common/90fallback
-@@ -34,8 +34,10 @@ for kernpat in /vmlinuz /vmlinux /boot/vmlinuz /boot/vmlinux "/boot/vmlinuz*" \
- 			initrdname3=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
- 			# And Gentoo's also
- 			initrdname4=$(echo "$kernfile" | sed "s/kernel/initramfs\*/")
-+			# And Calculate's also
-+			initrdname5=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/-install/')
- 			foundinitrd=0
--			for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
-+			for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" "$initrdname5" 2>/dev/null); do
- 				if [ "$initrd" != "$kernfile" ] && [ -f "$initrd" ] && [ ! -L "$initrd" ]; then
- 					initrd=$(echo "$initrd" | sed "s!^$mpoint!!")
- 					result "$partition:$kernbootpart::$kernbasefile:$initrd:root=$mappedpartition"
-diff --git os-prober os-prober
-index fc4de2c..55dc20b 100755
---- os-prober
-+++ os-prober
-@@ -147,7 +147,7 @@ for partition in $(partitions); do
- 	else
- 		mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 2)
- 		mpoint="$(unescape_mount "$mpoint")"
--		if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
-+		if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/$(echo ${CHROOT_PATH%/} | cut -d/ -f 2-)" ]; then
- 			type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
- 			for test in /usr/lib/os-probes/mounted/*; do
- 				if [ -f "$test" ] && [ -x "$test" ]; then
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
deleted file mode 100644
index be6726a43..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=diff
-diff --git common.sh common.sh
-index 30e245e..c295a15 100644
---- common.sh
-+++ common.sh
-@@ -147,12 +147,7 @@ unescape_mount () {
- }
- 
- ro_partition () {
--	if type blockdev >/dev/null 2>&1 && \
--	   [ "$(blockdev --getro "$1")" = 0 ] && \
--	   blockdev --setro "$1"; then
--		cleanup_ro_partitions="${cleanup_ro_partitions:+$cleanup_ro_partitions }$1"
--		trap cleanup EXIT HUP INT QUIT TERM
--	fi
-+	:
- }
- 
- find_label () {
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/01_fix_quit.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/01_fix_quit.patch
deleted file mode 100644
index 3eaefbb70..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/01_fix_quit.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# Calculate format=diff
-diff --git plymouth.c plymouth.c
-index e657e82..bb97f56 100644
---- plymouth.c
-+++ plymouth.c
-@@ -85,7 +85,8 @@ int commandf(const char* cmd, ...)
- 
- bool ply_message(const char* hook, const char* name)
- {
--    return (commandf("/bin/plymouth message --text=\"%s %s\"", hook, name) == 0);
-+    return true;
-+    //return (commandf("/bin/plymouth message --text=\"%s %s\"", hook, name) == 0);
- }
- 
- 
-@@ -94,6 +95,11 @@ bool ply_ping()
-     return (system("/bin/plymouth --ping") == 0);
- }
- 
-+void restart_console_font()
-+{
-+    if(RC_SERVICE_STARTED == rc_service_state("consolefont"))
-+        command("/etc/init.d/consolefont restart");
-+}
- 
- bool ply_quit(int mode)
- {
-@@ -127,9 +133,9 @@ bool ply_start(int mode)
- #define PLYD "/sbin/plymouthd --attach-to-session --pid-file=" PID_FILE \
-     " --mode="
-         if(mode == PLY_MODE_BOOT)
--            rv = command(PLYD "boot");
-+            rv = command(PLYD "boot --tty=/dev/tty1");
-         else if(mode == PLY_MODE_SHUTDOWN)
--            rv = command(PLYD "shutdown");
-+            rv = command(PLYD "shutdown --tty=/dev/tty1");
-         else
-             assert(0 && "Unknown mode");
- #undef PLYD
-@@ -145,7 +151,8 @@ bool ply_start(int mode)
- 
- bool ply_update_status(int hook, const char* name)
- {
--    return (commandf("/bin/plymouth update --status=%d-%s", hook, name) == 0);
-+    return true;
-+    //return (commandf("/bin/plymouth update --status=%d-%s", hook, name) == 0);
- }
- 
- 
-@@ -215,6 +222,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
-             if(!ply_start(PLY_MODE_SHUTDOWN)
-                     || !ply_update_rootfs_rw())
-                 rv = 1;
-+    	    command("/usr/bin/chvt 1");
-         }
-         break;
- 
-@@ -235,16 +243,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
-             DBG("ply_quit(PLY_MODE_BOOT)");
-             if(!ply_quit(PLY_MODE_BOOT))
-                 rv = 1;
--        }
--        break;
--
--    case RC_HOOK_SERVICE_STOP_IN:
--        /* Quit Plymouth when we're going to lost write access to /var/... */
--        if(strcmp(name, "localmount") == 0 &&
--                strcmp(runlevel, RC_LEVEL_SHUTDOWN) == 0) {
--            DBG("ply_quit(PLY_MODE_SHUTDOWN)");
--            if(!ply_quit(PLY_MODE_SHUTDOWN))
--                rv = 1;
-+	    restart_console_font();
-         }
-         break;
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/02_clear_tty7.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/02_clear_tty7.patch
deleted file mode 100644
index 5b46ce82e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/02_clear_tty7.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-# Calculate format=diff
-diff --git a/Makefile b/Makefile
-index 0ba94f9..cebdbd7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,7 +7,7 @@ PKG          := $(PKG_NAME)-$(PKG_VERSION)
- BZIP2        := bzip2 -f -9
- GZIP         := gzip -f -9
- CFLAGS 	     += -fPIC -Wall
--LDLIBS       := -leinfo -lrc
-+LDLIBS       := -leinfo -lrc -lncurses
- LDFLAGS      += -fPIC -shared
- 
- INSTALL      := install -D
-diff --git a/plymouth.c b/plymouth.c
-index bb97f56..e821c67 100644
---- a/plymouth.c
-+++ b/plymouth.c
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <term.h>
- 
- 
- #ifdef DEBUG
-@@ -90,6 +91,25 @@ bool ply_message(const char* hook, const char* name)
- }
- 
- 
-+void clear_tty(char *tty) {
-+    FILE *f = fopen(tty,"w");
-+    if(f) {
-+        int result;
-+        char *clear_screen_token = "\x1b[3J";
-+        char *hide_cursor_token = NULL;
-+        int fd = fileno(f);
-+
-+        fwrite(clear_screen_token, strlen(clear_screen_token), 1, f);
-+        setupterm(NULL, fd, &result);
-+        if(result > 0) {
-+            hide_cursor_token = tigetstr("civis");
-+            fwrite(hide_cursor_token, strlen(hide_cursor_token), 1, f);
-+        }
-+        fclose(f);
-+    }
-+}
-+
-+
- bool ply_ping()
- {
-     return (system("/bin/plymouth --ping") == 0);
-@@ -244,6 +264,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
-             if(!ply_quit(PLY_MODE_BOOT))
-                 rv = 1;
- 	    restart_console_font();
-+	    clear_tty("/dev/tty7");
-         }
-         break;
- 
-diff --git a/plymouth.o b/plymouth.o
-index ac94929..fb0dbf4 100644
-Binary files a/plymouth.o and b/plymouth.o differ
-diff --git a/plymouth.so b/plymouth.so
-index b8b7832..512153f 100755
-Binary files a/plymouth.so and b/plymouth.so differ
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/03_safe_boot.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/03_safe_boot.patch
deleted file mode 100644
index 97314aa13..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-boot/plymouth-openrc-plugin/03_safe_boot.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# Calculate format=diff
-diff --git plymouth.c plymouth.c
-index e821c67..924893c 100644
---- plymouth.c
-+++ plymouth.c
-@@ -26,7 +26,10 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <term.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
- 
-+#define MAX_COMMAND_LINE_SIZE 512
- 
- #ifdef DEBUG
- #    define DBG(x) einfo("[plymouth-plugin] " x)
-@@ -190,10 +193,34 @@ bool ply_update_rootfs_rw()
-     return (command("/bin/plymouth update-root-fs --read-write") == 0);
- }
- 
-+bool check_safemode() {
-+    int fd;
-+    char kernel_command_line[MAX_COMMAND_LINE_SIZE] = {0};
-+    fd = open ("/proc/cmdline", O_RDONLY);
-+    if (fd == -1) {
-+        return false;
-+    }
-+    if (read (fd, kernel_command_line, sizeof (kernel_command_line)) < 0) {
-+        close (fd);
-+        return false;
-+    }
-+    close (fd);
-+    char *p = strtok(kernel_command_line," ");
-+    while( p ) {
-+        if(strstr(p, "BOOT_IMAGE=") && strstr(p,"SafeMode")) {
-+           return true;
-+        }
-+        p = strtok(NULL," ");
-+    }
-+    return false;
-+}
- 
- int rc_plugin_hook(RC_HOOK hook, const char *name)
- {
-     int rv = 0;
-+    if(check_safemode()) {
-+        return 0;
-+    }
-     char* runlevel = rc_runlevel_get();
-     const char* bootlevel = getenv("RC_BOOTLEVEL");
-     const char* defaultlevel = getenv("RC_DEFAULTLEVEL");
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/.calculate_directory
deleted file mode 100644
index 1165b56a4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-kernel/calculate-sources)>=4.1&&merge(sys-kernel/calculate-sources)<4.2&&pkg(sys-apps/calculate-utils)>=3.3.0.16
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch
deleted file mode 100644
index d6df9e9fb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From ba1f3efda7e8670fc74715ba9eed93bc1172672d Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Tue, 7 Apr 2015 13:39:12 +0200
-Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r8-4.1
-
-Update Kconfig.iosched and do the related Makefile changes to include
-kernel configuration options for BFQ. Also add the bfqio controller
-to the cgroups subsystem.
-
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
----
- block/Kconfig.iosched         | 32 ++++++++++++++++++++++++++++++++
- block/Makefile                |  1 +
- include/linux/cgroup_subsys.h |  4 ++++
- 3 files changed, 37 insertions(+)
-
-diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
-index 421bef9..0ee5f0f 100644
---- a/block/Kconfig.iosched
-+++ b/block/Kconfig.iosched
-@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
- 	---help---
- 	  Enable group IO scheduling in CFQ.
- 
-+config IOSCHED_BFQ
-+	tristate "BFQ I/O scheduler"
-+	default n
-+	---help---
-+	  The BFQ I/O scheduler tries to distribute bandwidth among
-+	  all processes according to their weights.
-+	  It aims at distributing the bandwidth as desired, independently of
-+	  the disk parameters and with any workload. It also tries to
-+	  guarantee low latency to interactive and soft real-time
-+	  applications. If compiled built-in (saying Y here), BFQ can
-+	  be configured to support hierarchical scheduling.
-+
-+config CGROUP_BFQIO
-+	bool "BFQ hierarchical scheduling support"
-+	depends on CGROUPS && IOSCHED_BFQ=y
-+	default n
-+	---help---
-+	  Enable hierarchical scheduling in BFQ, using the cgroups
-+	  filesystem interface.  The name of the subsystem will be
-+	  bfqio.
-+
- choice
- 	prompt "Default I/O scheduler"
- 	default DEFAULT_CFQ
-@@ -52,6 +73,16 @@ choice
- 	config DEFAULT_CFQ
- 		bool "CFQ" if IOSCHED_CFQ=y
- 
-+	config DEFAULT_BFQ
-+		bool "BFQ" if IOSCHED_BFQ=y
-+		help
-+		  Selects BFQ as the default I/O scheduler which will be
-+		  used by default for all block devices.
-+		  The BFQ I/O scheduler aims at distributing the bandwidth
-+		  as desired, independently of the disk parameters and with
-+		  any workload. It also tries to guarantee low latency to
-+		  interactive and soft real-time applications.
-+
- 	config DEFAULT_NOOP
- 		bool "No-op"
- 
-@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
- 	string
- 	default "deadline" if DEFAULT_DEADLINE
- 	default "cfq" if DEFAULT_CFQ
-+	default "bfq" if DEFAULT_BFQ
- 	default "noop" if DEFAULT_NOOP
- 
- endmenu
-diff --git a/block/Makefile b/block/Makefile
-index 00ecc97..1ed86d5 100644
---- a/block/Makefile
-+++ b/block/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING)	+= blk-throttle.o
- obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
- obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
- obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
-+obj-$(CONFIG_IOSCHED_BFQ)	+= bfq-iosched.o
- 
- obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
- obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
-diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
-index e4a96fb..267d681 100644
---- a/include/linux/cgroup_subsys.h
-+++ b/include/linux/cgroup_subsys.h
-@@ -35,6 +35,10 @@ SUBSYS(freezer)
- SUBSYS(net_cls)
- #endif
- 
-+#if IS_ENABLED(CONFIG_CGROUP_BFQIO)
-+SUBSYS(bfqio)
-+#endif
-+
- #if IS_ENABLED(CONFIG_CGROUP_PERF)
- SUBSYS(perf_event)
- #endif
--- 
-2.1.4
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0002-block-introduce-the-BFQ-v7r8-I-O-sched-for-4.1.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0002-block-introduce-the-BFQ-v7r8-I-O-sched-for-4.1.patch
deleted file mode 100644
index 6386e1a3f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0002-block-introduce-the-BFQ-v7r8-I-O-sched-for-4.1.patch
+++ /dev/null
@@ -1,6953 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From af6f05b4c3bcc92a3c28be57411b9fcc290fa301 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Thu, 9 May 2013 19:10:02 +0200
-Subject: [PATCH 2/3] block: introduce the BFQ-v7r8 I/O sched for 4.1
-
-Add the BFQ-v7r8 I/O scheduler to 4.1.
-The general structure is borrowed from CFQ, as much of the code for
-handling I/O contexts. Over time, several useful features have been
-ported from CFQ as well (details in the changelog in README.BFQ). A
-(bfq_)queue is associated to each task doing I/O on a device, and each
-time a scheduling decision has to be made a queue is selected and served
-until it expires.
-
-    - Slices are given in the service domain: tasks are assigned
-      budgets, measured in number of sectors. Once got the disk, a task
-      must however consume its assigned budget within a configurable
-      maximum time (by default, the maximum possible value of the
-      budgets is automatically computed to comply with this timeout).
-      This allows the desired latency vs "throughput boosting" tradeoff
-      to be set.
-
-    - Budgets are scheduled according to a variant of WF2Q+, implemented
-      using an augmented rb-tree to take eligibility into account while
-      preserving an O(log N) overall complexity.
-
-    - A low-latency tunable is provided; if enabled, both interactive
-      and soft real-time applications are guaranteed a very low latency.
-
-    - Latency guarantees are preserved also in the presence of NCQ.
-
-    - Also with flash-based devices, a high throughput is achieved
-      while still preserving latency guarantees.
-
-    - BFQ features Early Queue Merge (EQM), a sort of fusion of the
-      cooperating-queue-merging and the preemption mechanisms present
-      in CFQ. EQM is in fact a unified mechanism that tries to get a
-      sequential read pattern, and hence a high throughput, with any
-      set of processes performing interleaved I/O over a contiguous
-      sequence of sectors.
-
-    - BFQ supports full hierarchical scheduling, exporting a cgroups
-      interface.  Since each node has a full scheduler, each group can
-      be assigned its own weight.
-
-    - If the cgroups interface is not used, only I/O priorities can be
-      assigned to processes, with ioprio values mapped to weights
-      with the relation weight = IOPRIO_BE_NR - ioprio.
-
-    - ioprio classes are served in strict priority order, i.e., lower
-      priority queues are not served as long as there are higher
-      priority queues.  Among queues in the same class the bandwidth is
-      distributed in proportion to the weight of each queue. A very
-      thin extra bandwidth is however guaranteed to the Idle class, to
-      prevent it from starving.
-
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
----
- block/bfq-cgroup.c  |  936 +++++++++++++
- block/bfq-ioc.c     |   36 +
- block/bfq-iosched.c | 3898 +++++++++++++++++++++++++++++++++++++++++++++++++++
- block/bfq-sched.c   | 1208 ++++++++++++++++
- block/bfq.h         |  771 ++++++++++
- 5 files changed, 6849 insertions(+)
- create mode 100644 block/bfq-cgroup.c
- create mode 100644 block/bfq-ioc.c
- create mode 100644 block/bfq-iosched.c
- create mode 100644 block/bfq-sched.c
- create mode 100644 block/bfq.h
-
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-new file mode 100644
-index 0000000..11e2f1d
---- /dev/null
-+++ b/block/bfq-cgroup.c
-@@ -0,0 +1,936 @@
-+/*
-+ * BFQ: CGROUPS support.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-+ * file.
-+ */
-+
-+#ifdef CONFIG_CGROUP_BFQIO
-+
-+static DEFINE_MUTEX(bfqio_mutex);
-+
-+static bool bfqio_is_removed(struct bfqio_cgroup *bgrp)
-+{
-+	return bgrp ? !bgrp->online : false;
-+}
-+
-+static struct bfqio_cgroup bfqio_root_cgroup = {
-+	.weight = BFQ_DEFAULT_GRP_WEIGHT,
-+	.ioprio = BFQ_DEFAULT_GRP_IOPRIO,
-+	.ioprio_class = BFQ_DEFAULT_GRP_CLASS,
-+};
-+
-+static inline void bfq_init_entity(struct bfq_entity *entity,
-+				   struct bfq_group *bfqg)
-+{
-+	entity->weight = entity->new_weight;
-+	entity->orig_weight = entity->new_weight;
-+	entity->ioprio = entity->new_ioprio;
-+	entity->ioprio_class = entity->new_ioprio_class;
-+	entity->parent = bfqg->my_entity;
-+	entity->sched_data = &bfqg->sched_data;
-+}
-+
-+static struct bfqio_cgroup *css_to_bfqio(struct cgroup_subsys_state *css)
-+{
-+	return css ? container_of(css, struct bfqio_cgroup, css) : NULL;
-+}
-+
-+/*
-+ * Search the bfq_group for bfqd into the hash table (by now only a list)
-+ * of bgrp.  Must be called under rcu_read_lock().
-+ */
-+static struct bfq_group *bfqio_lookup_group(struct bfqio_cgroup *bgrp,
-+					    struct bfq_data *bfqd)
-+{
-+	struct bfq_group *bfqg;
-+	void *key;
-+
-+	hlist_for_each_entry_rcu(bfqg, &bgrp->group_data, group_node) {
-+		key = rcu_dereference(bfqg->bfqd);
-+		if (key == bfqd)
-+			return bfqg;
-+	}
-+
-+	return NULL;
-+}
-+
-+static inline void bfq_group_init_entity(struct bfqio_cgroup *bgrp,
-+					 struct bfq_group *bfqg)
-+{
-+	struct bfq_entity *entity = &bfqg->entity;
-+
-+	/*
-+	 * If the weight of the entity has never been set via the sysfs
-+	 * interface, then bgrp->weight == 0. In this case we initialize
-+	 * the weight from the current ioprio value. Otherwise, the group
-+	 * weight, if set, has priority over the ioprio value.
-+	 */
-+	if (bgrp->weight == 0) {
-+		entity->new_weight = bfq_ioprio_to_weight(bgrp->ioprio);
-+		entity->new_ioprio = bgrp->ioprio;
-+	} else {
-+		if (bgrp->weight < BFQ_MIN_WEIGHT ||
-+		    bgrp->weight > BFQ_MAX_WEIGHT) {
-+			printk(KERN_CRIT "bfq_group_init_entity: "
-+					 "bgrp->weight %d\n", bgrp->weight);
-+			BUG();
-+		}
-+		entity->new_weight = bgrp->weight;
-+		entity->new_ioprio = bfq_weight_to_ioprio(bgrp->weight);
-+	}
-+	entity->orig_weight = entity->weight = entity->new_weight;
-+	entity->ioprio = entity->new_ioprio;
-+	entity->ioprio_class = entity->new_ioprio_class = bgrp->ioprio_class;
-+	entity->my_sched_data = &bfqg->sched_data;
-+	bfqg->active_entities = 0;
-+}
-+
-+static inline void bfq_group_set_parent(struct bfq_group *bfqg,
-+					struct bfq_group *parent)
-+{
-+	struct bfq_entity *entity;
-+
-+	BUG_ON(parent == NULL);
-+	BUG_ON(bfqg == NULL);
-+
-+	entity = &bfqg->entity;
-+	entity->parent = parent->my_entity;
-+	entity->sched_data = &parent->sched_data;
-+}
-+
-+/**
-+ * bfq_group_chain_alloc - allocate a chain of groups.
-+ * @bfqd: queue descriptor.
-+ * @css: the leaf cgroup_subsys_state this chain starts from.
-+ *
-+ * Allocate a chain of groups starting from the one belonging to
-+ * @cgroup up to the root cgroup.  Stop if a cgroup on the chain
-+ * to the root has already an allocated group on @bfqd.
-+ */
-+static struct bfq_group *bfq_group_chain_alloc(struct bfq_data *bfqd,
-+					       struct cgroup_subsys_state *css)
-+{
-+	struct bfqio_cgroup *bgrp;
-+	struct bfq_group *bfqg, *prev = NULL, *leaf = NULL;
-+
-+	for (; css != NULL; css = css->parent) {
-+		bgrp = css_to_bfqio(css);
-+
-+		bfqg = bfqio_lookup_group(bgrp, bfqd);
-+		if (bfqg != NULL) {
-+			/*
-+			 * All the cgroups in the path from there to the
-+			 * root must have a bfq_group for bfqd, so we don't
-+			 * need any more allocations.
-+			 */
-+			break;
-+		}
-+
-+		bfqg = kzalloc(sizeof(*bfqg), GFP_ATOMIC);
-+		if (bfqg == NULL)
-+			goto cleanup;
-+
-+		bfq_group_init_entity(bgrp, bfqg);
-+		bfqg->my_entity = &bfqg->entity;
-+
-+		if (leaf == NULL) {
-+			leaf = bfqg;
-+			prev = leaf;
-+		} else {
-+			bfq_group_set_parent(prev, bfqg);
-+			/*
-+			 * Build a list of allocated nodes using the bfqd
-+			 * filed, that is still unused and will be
-+			 * initialized only after the node will be
-+			 * connected.
-+			 */
-+			prev->bfqd = bfqg;
-+			prev = bfqg;
-+		}
-+	}
-+
-+	return leaf;
-+
-+cleanup:
-+	while (leaf != NULL) {
-+		prev = leaf;
-+		leaf = leaf->bfqd;
-+		kfree(prev);
-+	}
-+
-+	return NULL;
-+}
-+
-+/**
-+ * bfq_group_chain_link - link an allocated group chain to a cgroup
-+ *                        hierarchy.
-+ * @bfqd: the queue descriptor.
-+ * @css: the leaf cgroup_subsys_state to start from.
-+ * @leaf: the leaf group (to be associated to @cgroup).
-+ *
-+ * Try to link a chain of groups to a cgroup hierarchy, connecting the
-+ * nodes bottom-up, so we can be sure that when we find a cgroup in the
-+ * hierarchy that already as a group associated to @bfqd all the nodes
-+ * in the path to the root cgroup have one too.
-+ *
-+ * On locking: the queue lock protects the hierarchy (there is a hierarchy
-+ * per device) while the bfqio_cgroup lock protects the list of groups
-+ * belonging to the same cgroup.
-+ */
-+static void bfq_group_chain_link(struct bfq_data *bfqd,
-+				 struct cgroup_subsys_state *css,
-+				 struct bfq_group *leaf)
-+{
-+	struct bfqio_cgroup *bgrp;
-+	struct bfq_group *bfqg, *next, *prev = NULL;
-+	unsigned long flags;
-+
-+	assert_spin_locked(bfqd->queue->queue_lock);
-+
-+	for (; css != NULL && leaf != NULL; css = css->parent) {
-+		bgrp = css_to_bfqio(css);
-+		next = leaf->bfqd;
-+
-+		bfqg = bfqio_lookup_group(bgrp, bfqd);
-+		BUG_ON(bfqg != NULL);
-+
-+		spin_lock_irqsave(&bgrp->lock, flags);
-+
-+		rcu_assign_pointer(leaf->bfqd, bfqd);
-+		hlist_add_head_rcu(&leaf->group_node, &bgrp->group_data);
-+		hlist_add_head(&leaf->bfqd_node, &bfqd->group_list);
-+
-+		spin_unlock_irqrestore(&bgrp->lock, flags);
-+
-+		prev = leaf;
-+		leaf = next;
-+	}
-+
-+	BUG_ON(css == NULL && leaf != NULL);
-+	if (css != NULL && prev != NULL) {
-+		bgrp = css_to_bfqio(css);
-+		bfqg = bfqio_lookup_group(bgrp, bfqd);
-+		bfq_group_set_parent(prev, bfqg);
-+	}
-+}
-+
-+/**
-+ * bfq_find_alloc_group - return the group associated to @bfqd in @cgroup.
-+ * @bfqd: queue descriptor.
-+ * @cgroup: cgroup being searched for.
-+ *
-+ * Return a group associated to @bfqd in @cgroup, allocating one if
-+ * necessary.  When a group is returned all the cgroups in the path
-+ * to the root have a group associated to @bfqd.
-+ *
-+ * If the allocation fails, return the root group: this breaks guarantees
-+ * but is a safe fallback.  If this loss becomes a problem it can be
-+ * mitigated using the equivalent weight (given by the product of the
-+ * weights of the groups in the path from @group to the root) in the
-+ * root scheduler.
-+ *
-+ * We allocate all the missing nodes in the path from the leaf cgroup
-+ * to the root and we connect the nodes only after all the allocations
-+ * have been successful.
-+ */
-+static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
-+					      struct cgroup_subsys_state *css)
-+{
-+	struct bfqio_cgroup *bgrp = css_to_bfqio(css);
-+	struct bfq_group *bfqg;
-+
-+	bfqg = bfqio_lookup_group(bgrp, bfqd);
-+	if (bfqg != NULL)
-+		return bfqg;
-+
-+	bfqg = bfq_group_chain_alloc(bfqd, css);
-+	if (bfqg != NULL)
-+		bfq_group_chain_link(bfqd, css, bfqg);
-+	else
-+		bfqg = bfqd->root_group;
-+
-+	return bfqg;
-+}
-+
-+/**
-+ * bfq_bfqq_move - migrate @bfqq to @bfqg.
-+ * @bfqd: queue descriptor.
-+ * @bfqq: the queue to move.
-+ * @entity: @bfqq's entity.
-+ * @bfqg: the group to move to.
-+ *
-+ * Move @bfqq to @bfqg, deactivating it from its old group and reactivating
-+ * it on the new one.  Avoid putting the entity on the old group idle tree.
-+ *
-+ * Must be called under the queue lock; the cgroup owning @bfqg must
-+ * not disappear (by now this just means that we are called under
-+ * rcu_read_lock()).
-+ */
-+static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			  struct bfq_entity *entity, struct bfq_group *bfqg)
-+{
-+	int busy, resume;
-+
-+	busy = bfq_bfqq_busy(bfqq);
-+	resume = !RB_EMPTY_ROOT(&bfqq->sort_list);
-+
-+	BUG_ON(resume && !entity->on_st);
-+	BUG_ON(busy && !resume && entity->on_st &&
-+	       bfqq != bfqd->in_service_queue);
-+
-+	if (busy) {
-+		BUG_ON(atomic_read(&bfqq->ref) < 2);
-+
-+		if (!resume)
-+			bfq_del_bfqq_busy(bfqd, bfqq, 0);
-+		else
-+			bfq_deactivate_bfqq(bfqd, bfqq, 0);
-+	} else if (entity->on_st)
-+		bfq_put_idle_entity(bfq_entity_service_tree(entity), entity);
-+
-+	/*
-+	 * Here we use a reference to bfqg.  We don't need a refcounter
-+	 * as the cgroup reference will not be dropped, so that its
-+	 * destroy() callback will not be invoked.
-+	 */
-+	entity->parent = bfqg->my_entity;
-+	entity->sched_data = &bfqg->sched_data;
-+
-+	if (busy && resume)
-+		bfq_activate_bfqq(bfqd, bfqq);
-+
-+	if (bfqd->in_service_queue == NULL && !bfqd->rq_in_driver)
-+		bfq_schedule_dispatch(bfqd);
-+}
-+
-+/**
-+ * __bfq_bic_change_cgroup - move @bic to @cgroup.
-+ * @bfqd: the queue descriptor.
-+ * @bic: the bic to move.
-+ * @cgroup: the cgroup to move to.
-+ *
-+ * Move bic to cgroup, assuming that bfqd->queue is locked; the caller
-+ * has to make sure that the reference to cgroup is valid across the call.
-+ *
-+ * NOTE: an alternative approach might have been to store the current
-+ * cgroup in bfqq and getting a reference to it, reducing the lookup
-+ * time here, at the price of slightly more complex code.
-+ */
-+static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
-+						struct bfq_io_cq *bic,
-+						struct cgroup_subsys_state *css)
-+{
-+	struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0);
-+	struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1);
-+	struct bfq_entity *entity;
-+	struct bfq_group *bfqg;
-+	struct bfqio_cgroup *bgrp;
-+
-+	bgrp = css_to_bfqio(css);
-+
-+	bfqg = bfq_find_alloc_group(bfqd, css);
-+	if (async_bfqq != NULL) {
-+		entity = &async_bfqq->entity;
-+
-+		if (entity->sched_data != &bfqg->sched_data) {
-+			bic_set_bfqq(bic, NULL, 0);
-+			bfq_log_bfqq(bfqd, async_bfqq,
-+				     "bic_change_group: %p %d",
-+				     async_bfqq, atomic_read(&async_bfqq->ref));
-+			bfq_put_queue(async_bfqq);
-+		}
-+	}
-+
-+	if (sync_bfqq != NULL) {
-+		entity = &sync_bfqq->entity;
-+		if (entity->sched_data != &bfqg->sched_data)
-+			bfq_bfqq_move(bfqd, sync_bfqq, entity, bfqg);
-+	}
-+
-+	return bfqg;
-+}
-+
-+/**
-+ * bfq_bic_change_cgroup - move @bic to @cgroup.
-+ * @bic: the bic being migrated.
-+ * @cgroup: the destination cgroup.
-+ *
-+ * When the task owning @bic is moved to @cgroup, @bic is immediately
-+ * moved into its new parent group.
-+ */
-+static void bfq_bic_change_cgroup(struct bfq_io_cq *bic,
-+				  struct cgroup_subsys_state *css)
-+{
-+	struct bfq_data *bfqd;
-+	unsigned long uninitialized_var(flags);
-+
-+	bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data),
-+				   &flags);
-+	if (bfqd != NULL) {
-+		__bfq_bic_change_cgroup(bfqd, bic, css);
-+		bfq_put_bfqd_unlock(bfqd, &flags);
-+	}
-+}
-+
-+/**
-+ * bfq_bic_update_cgroup - update the cgroup of @bic.
-+ * @bic: the @bic to update.
-+ *
-+ * Make sure that @bic is enqueued in the cgroup of the current task.
-+ * We need this in addition to moving bics during the cgroup attach
-+ * phase because the task owning @bic could be at its first disk
-+ * access or we may end up in the root cgroup as the result of a
-+ * memory allocation failure and here we try to move to the right
-+ * group.
-+ *
-+ * Must be called under the queue lock.  It is safe to use the returned
-+ * value even after the rcu_read_unlock() as the migration/destruction
-+ * paths act under the queue lock too.  IOW it is impossible to race with
-+ * group migration/destruction and end up with an invalid group as:
-+ *   a) here cgroup has not yet been destroyed, nor its destroy callback
-+ *      has started execution, as current holds a reference to it,
-+ *   b) if it is destroyed after rcu_read_unlock() [after current is
-+ *      migrated to a different cgroup] its attach() callback will have
-+ *      taken care of remove all the references to the old cgroup data.
-+ */
-+static struct bfq_group *bfq_bic_update_cgroup(struct bfq_io_cq *bic)
-+{
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+	struct bfq_group *bfqg;
-+	struct cgroup_subsys_state *css;
-+
-+	BUG_ON(bfqd == NULL);
-+
-+	rcu_read_lock();
-+	css = task_css(current, bfqio_cgrp_id);
-+	bfqg = __bfq_bic_change_cgroup(bfqd, bic, css);
-+	rcu_read_unlock();
-+
-+	return bfqg;
-+}
-+
-+/**
-+ * bfq_flush_idle_tree - deactivate any entity on the idle tree of @st.
-+ * @st: the service tree being flushed.
-+ */
-+static inline void bfq_flush_idle_tree(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entity = st->first_idle;
-+
-+	for (; entity != NULL; entity = st->first_idle)
-+		__bfq_deactivate_entity(entity, 0);
-+}
-+
-+/**
-+ * bfq_reparent_leaf_entity - move leaf entity to the root_group.
-+ * @bfqd: the device data structure with the root group.
-+ * @entity: the entity to move.
-+ */
-+static inline void bfq_reparent_leaf_entity(struct bfq_data *bfqd,
-+					    struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	BUG_ON(bfqq == NULL);
-+	bfq_bfqq_move(bfqd, bfqq, entity, bfqd->root_group);
-+	return;
-+}
-+
-+/**
-+ * bfq_reparent_active_entities - move to the root group all active
-+ *                                entities.
-+ * @bfqd: the device data structure with the root group.
-+ * @bfqg: the group to move from.
-+ * @st: the service tree with the entities.
-+ *
-+ * Needs queue_lock to be taken and reference to be valid over the call.
-+ */
-+static inline void bfq_reparent_active_entities(struct bfq_data *bfqd,
-+						struct bfq_group *bfqg,
-+						struct bfq_service_tree *st)
-+{
-+	struct rb_root *active = &st->active;
-+	struct bfq_entity *entity = NULL;
-+
-+	if (!RB_EMPTY_ROOT(&st->active))
-+		entity = bfq_entity_of(rb_first(active));
-+
-+	for (; entity != NULL; entity = bfq_entity_of(rb_first(active)))
-+		bfq_reparent_leaf_entity(bfqd, entity);
-+
-+	if (bfqg->sched_data.in_service_entity != NULL)
-+		bfq_reparent_leaf_entity(bfqd,
-+			bfqg->sched_data.in_service_entity);
-+
-+	return;
-+}
-+
-+/**
-+ * bfq_destroy_group - destroy @bfqg.
-+ * @bgrp: the bfqio_cgroup containing @bfqg.
-+ * @bfqg: the group being destroyed.
-+ *
-+ * Destroy @bfqg, making sure that it is not referenced from its parent.
-+ */
-+static void bfq_destroy_group(struct bfqio_cgroup *bgrp, struct bfq_group *bfqg)
-+{
-+	struct bfq_data *bfqd;
-+	struct bfq_service_tree *st;
-+	struct bfq_entity *entity = bfqg->my_entity;
-+	unsigned long uninitialized_var(flags);
-+	int i;
-+
-+	hlist_del(&bfqg->group_node);
-+
-+	/*
-+	 * Empty all service_trees belonging to this group before
-+	 * deactivating the group itself.
-+	 */
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) {
-+		st = bfqg->sched_data.service_tree + i;
-+
-+		/*
-+		 * The idle tree may still contain bfq_queues belonging
-+		 * to exited task because they never migrated to a different
-+		 * cgroup from the one being destroyed now.  No one else
-+		 * can access them so it's safe to act without any lock.
-+		 */
-+		bfq_flush_idle_tree(st);
-+
-+		/*
-+		 * It may happen that some queues are still active
-+		 * (busy) upon group destruction (if the corresponding
-+		 * processes have been forced to terminate). We move
-+		 * all the leaf entities corresponding to these queues
-+		 * to the root_group.
-+		 * Also, it may happen that the group has an entity
-+		 * in service, which is disconnected from the active
-+		 * tree: it must be moved, too.
-+		 * There is no need to put the sync queues, as the
-+		 * scheduler has taken no reference.
-+		 */
-+		bfqd = bfq_get_bfqd_locked(&bfqg->bfqd, &flags);
-+		if (bfqd != NULL) {
-+			bfq_reparent_active_entities(bfqd, bfqg, st);
-+			bfq_put_bfqd_unlock(bfqd, &flags);
-+		}
-+		BUG_ON(!RB_EMPTY_ROOT(&st->active));
-+		BUG_ON(!RB_EMPTY_ROOT(&st->idle));
-+	}
-+	BUG_ON(bfqg->sched_data.next_in_service != NULL);
-+	BUG_ON(bfqg->sched_data.in_service_entity != NULL);
-+
-+	/*
-+	 * We may race with device destruction, take extra care when
-+	 * dereferencing bfqg->bfqd.
-+	 */
-+	bfqd = bfq_get_bfqd_locked(&bfqg->bfqd, &flags);
-+	if (bfqd != NULL) {
-+		hlist_del(&bfqg->bfqd_node);
-+		__bfq_deactivate_entity(entity, 0);
-+		bfq_put_async_queues(bfqd, bfqg);
-+		bfq_put_bfqd_unlock(bfqd, &flags);
-+	}
-+	BUG_ON(entity->tree != NULL);
-+
-+	/*
-+	 * No need to defer the kfree() to the end of the RCU grace
-+	 * period: we are called from the destroy() callback of our
-+	 * cgroup, so we can be sure that no one is a) still using
-+	 * this cgroup or b) doing lookups in it.
-+	 */
-+	kfree(bfqg);
-+}
-+
-+static void bfq_end_wr_async(struct bfq_data *bfqd)
-+{
-+	struct hlist_node *tmp;
-+	struct bfq_group *bfqg;
-+
-+	hlist_for_each_entry_safe(bfqg, tmp, &bfqd->group_list, bfqd_node)
-+		bfq_end_wr_async_queues(bfqd, bfqg);
-+	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+/**
-+ * bfq_disconnect_groups - disconnect @bfqd from all its groups.
-+ * @bfqd: the device descriptor being exited.
-+ *
-+ * When the device exits we just make sure that no lookup can return
-+ * the now unused group structures.  They will be deallocated on cgroup
-+ * destruction.
-+ */
-+static void bfq_disconnect_groups(struct bfq_data *bfqd)
-+{
-+	struct hlist_node *tmp;
-+	struct bfq_group *bfqg;
-+
-+	bfq_log(bfqd, "disconnect_groups beginning");
-+	hlist_for_each_entry_safe(bfqg, tmp, &bfqd->group_list, bfqd_node) {
-+		hlist_del(&bfqg->bfqd_node);
-+
-+		__bfq_deactivate_entity(bfqg->my_entity, 0);
-+
-+		/*
-+		 * Don't remove from the group hash, just set an
-+		 * invalid key.  No lookups can race with the
-+		 * assignment as bfqd is being destroyed; this
-+		 * implies also that new elements cannot be added
-+		 * to the list.
-+		 */
-+		rcu_assign_pointer(bfqg->bfqd, NULL);
-+
-+		bfq_log(bfqd, "disconnect_groups: put async for group %p",
-+			bfqg);
-+		bfq_put_async_queues(bfqd, bfqg);
-+	}
-+}
-+
-+static inline void bfq_free_root_group(struct bfq_data *bfqd)
-+{
-+	struct bfqio_cgroup *bgrp = &bfqio_root_cgroup;
-+	struct bfq_group *bfqg = bfqd->root_group;
-+
-+	bfq_put_async_queues(bfqd, bfqg);
-+
-+	spin_lock_irq(&bgrp->lock);
-+	hlist_del_rcu(&bfqg->group_node);
-+	spin_unlock_irq(&bgrp->lock);
-+
-+	/*
-+	 * No need to synchronize_rcu() here: since the device is gone
-+	 * there cannot be any read-side access to its root_group.
-+	 */
-+	kfree(bfqg);
-+}
-+
-+static struct bfq_group *bfq_alloc_root_group(struct bfq_data *bfqd, int node)
-+{
-+	struct bfq_group *bfqg;
-+	struct bfqio_cgroup *bgrp;
-+	int i;
-+
-+	bfqg = kzalloc_node(sizeof(*bfqg), GFP_KERNEL, node);
-+	if (bfqg == NULL)
-+		return NULL;
-+
-+	bfqg->entity.parent = NULL;
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
-+		bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
-+
-+	bgrp = &bfqio_root_cgroup;
-+	spin_lock_irq(&bgrp->lock);
-+	rcu_assign_pointer(bfqg->bfqd, bfqd);
-+	hlist_add_head_rcu(&bfqg->group_node, &bgrp->group_data);
-+	spin_unlock_irq(&bgrp->lock);
-+
-+	return bfqg;
-+}
-+
-+#define SHOW_FUNCTION(__VAR)						\
-+static u64 bfqio_cgroup_##__VAR##_read(struct cgroup_subsys_state *css, \
-+				       struct cftype *cftype)		\
-+{									\
-+	struct bfqio_cgroup *bgrp = css_to_bfqio(css);			\
-+	u64 ret = -ENODEV;						\
-+									\
-+	mutex_lock(&bfqio_mutex);					\
-+	if (bfqio_is_removed(bgrp))					\
-+		goto out_unlock;					\
-+									\
-+	spin_lock_irq(&bgrp->lock);					\
-+	ret = bgrp->__VAR;						\
-+	spin_unlock_irq(&bgrp->lock);					\
-+									\
-+out_unlock:								\
-+	mutex_unlock(&bfqio_mutex);					\
-+	return ret;							\
-+}
-+
-+SHOW_FUNCTION(weight);
-+SHOW_FUNCTION(ioprio);
-+SHOW_FUNCTION(ioprio_class);
-+#undef SHOW_FUNCTION
-+
-+#define STORE_FUNCTION(__VAR, __MIN, __MAX)				\
-+static int bfqio_cgroup_##__VAR##_write(struct cgroup_subsys_state *css,\
-+					struct cftype *cftype,		\
-+					u64 val)			\
-+{									\
-+	struct bfqio_cgroup *bgrp = css_to_bfqio(css);			\
-+	struct bfq_group *bfqg;						\
-+	int ret = -EINVAL;						\
-+									\
-+	if (val < (__MIN) || val > (__MAX))				\
-+		return ret;						\
-+									\
-+	ret = -ENODEV;							\
-+	mutex_lock(&bfqio_mutex);					\
-+	if (bfqio_is_removed(bgrp))					\
-+		goto out_unlock;					\
-+	ret = 0;							\
-+									\
-+	spin_lock_irq(&bgrp->lock);					\
-+	bgrp->__VAR = (unsigned short)val;				\
-+	hlist_for_each_entry(bfqg, &bgrp->group_data, group_node) {	\
-+		/*							\
-+		 * Setting the ioprio_changed flag of the entity        \
-+		 * to 1 with new_##__VAR == ##__VAR would re-set        \
-+		 * the value of the weight to its ioprio mapping.       \
-+		 * Set the flag only if necessary.			\
-+		 */							\
-+		if ((unsigned short)val != bfqg->entity.new_##__VAR) {  \
-+			bfqg->entity.new_##__VAR = (unsigned short)val; \
-+			/*						\
-+			 * Make sure that the above new value has been	\
-+			 * stored in bfqg->entity.new_##__VAR before	\
-+			 * setting the ioprio_changed flag. In fact,	\
-+			 * this flag may be read asynchronously (in	\
-+			 * critical sections protected by a different	\
-+			 * lock than that held here), and finding this	\
-+			 * flag set may cause the execution of the code	\
-+			 * for updating parameters whose value may	\
-+			 * depend also on bfqg->entity.new_##__VAR (in	\
-+			 * __bfq_entity_update_weight_prio).		\
-+			 * This barrier makes sure that the new value	\
-+			 * of bfqg->entity.new_##__VAR is correctly	\
-+			 * seen in that code.				\
-+			 */						\
-+			smp_wmb();                                      \
-+			bfqg->entity.ioprio_changed = 1;                \
-+		}							\
-+	}								\
-+	spin_unlock_irq(&bgrp->lock);					\
-+									\
-+out_unlock:								\
-+	mutex_unlock(&bfqio_mutex);					\
-+	return ret;							\
-+}
-+
-+STORE_FUNCTION(weight, BFQ_MIN_WEIGHT, BFQ_MAX_WEIGHT);
-+STORE_FUNCTION(ioprio, 0, IOPRIO_BE_NR - 1);
-+STORE_FUNCTION(ioprio_class, IOPRIO_CLASS_RT, IOPRIO_CLASS_IDLE);
-+#undef STORE_FUNCTION
-+
-+static struct cftype bfqio_files[] = {
-+	{
-+		.name = "weight",
-+		.read_u64 = bfqio_cgroup_weight_read,
-+		.write_u64 = bfqio_cgroup_weight_write,
-+	},
-+	{
-+		.name = "ioprio",
-+		.read_u64 = bfqio_cgroup_ioprio_read,
-+		.write_u64 = bfqio_cgroup_ioprio_write,
-+	},
-+	{
-+		.name = "ioprio_class",
-+		.read_u64 = bfqio_cgroup_ioprio_class_read,
-+		.write_u64 = bfqio_cgroup_ioprio_class_write,
-+	},
-+	{ },	/* terminate */
-+};
-+
-+static struct cgroup_subsys_state *bfqio_create(struct cgroup_subsys_state
-+						*parent_css)
-+{
-+	struct bfqio_cgroup *bgrp;
-+
-+	if (parent_css != NULL) {
-+		bgrp = kzalloc(sizeof(*bgrp), GFP_KERNEL);
-+		if (bgrp == NULL)
-+			return ERR_PTR(-ENOMEM);
-+	} else
-+		bgrp = &bfqio_root_cgroup;
-+
-+	spin_lock_init(&bgrp->lock);
-+	INIT_HLIST_HEAD(&bgrp->group_data);
-+	bgrp->ioprio = BFQ_DEFAULT_GRP_IOPRIO;
-+	bgrp->ioprio_class = BFQ_DEFAULT_GRP_CLASS;
-+
-+	return &bgrp->css;
-+}
-+
-+/*
-+ * We cannot support shared io contexts, as we have no means to support
-+ * two tasks with the same ioc in two different groups without major rework
-+ * of the main bic/bfqq data structures.  By now we allow a task to change
-+ * its cgroup only if it's the only owner of its ioc; the drawback of this
-+ * behavior is that a group containing a task that forked using CLONE_IO
-+ * will not be destroyed until the tasks sharing the ioc die.
-+ */
-+static int bfqio_can_attach(struct cgroup_subsys_state *css,
-+			    struct cgroup_taskset *tset)
-+{
-+	struct task_struct *task;
-+	struct io_context *ioc;
-+	int ret = 0;
-+
-+	cgroup_taskset_for_each(task, tset) {
-+		/*
-+		 * task_lock() is needed to avoid races with
-+		 * exit_io_context()
-+		 */
-+		task_lock(task);
-+		ioc = task->io_context;
-+		if (ioc != NULL && atomic_read(&ioc->nr_tasks) > 1)
-+			/*
-+			 * ioc == NULL means that the task is either too
-+			 * young or exiting: if it has still no ioc the
-+			 * ioc can't be shared, if the task is exiting the
-+			 * attach will fail anyway, no matter what we
-+			 * return here.
-+			 */
-+			ret = -EINVAL;
-+		task_unlock(task);
-+		if (ret)
-+			break;
-+	}
-+
-+	return ret;
-+}
-+
-+static void bfqio_attach(struct cgroup_subsys_state *css,
-+			 struct cgroup_taskset *tset)
-+{
-+	struct task_struct *task;
-+	struct io_context *ioc;
-+	struct io_cq *icq;
-+
-+	/*
-+	 * IMPORTANT NOTE: The move of more than one process at a time to a
-+	 * new group has not yet been tested.
-+	 */
-+	cgroup_taskset_for_each(task, tset) {
-+		ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE);
-+		if (ioc) {
-+			/*
-+			 * Handle cgroup change here.
-+			 */
-+			rcu_read_lock();
-+			hlist_for_each_entry_rcu(icq, &ioc->icq_list, ioc_node)
-+				if (!strncmp(
-+					icq->q->elevator->type->elevator_name,
-+					"bfq", ELV_NAME_MAX))
-+					bfq_bic_change_cgroup(icq_to_bic(icq),
-+							      css);
-+			rcu_read_unlock();
-+			put_io_context(ioc);
-+		}
-+	}
-+}
-+
-+static void bfqio_destroy(struct cgroup_subsys_state *css)
-+{
-+	struct bfqio_cgroup *bgrp = css_to_bfqio(css);
-+	struct hlist_node *tmp;
-+	struct bfq_group *bfqg;
-+
-+	/*
-+	 * Since we are destroying the cgroup, there are no more tasks
-+	 * referencing it, and all the RCU grace periods that may have
-+	 * referenced it are ended (as the destruction of the parent
-+	 * cgroup is RCU-safe); bgrp->group_data will not be accessed by
-+	 * anything else and we don't need any synchronization.
-+	 */
-+	hlist_for_each_entry_safe(bfqg, tmp, &bgrp->group_data, group_node)
-+		bfq_destroy_group(bgrp, bfqg);
-+
-+	BUG_ON(!hlist_empty(&bgrp->group_data));
-+
-+	kfree(bgrp);
-+}
-+
-+static int bfqio_css_online(struct cgroup_subsys_state *css)
-+{
-+	struct bfqio_cgroup *bgrp = css_to_bfqio(css);
-+
-+	mutex_lock(&bfqio_mutex);
-+	bgrp->online = true;
-+	mutex_unlock(&bfqio_mutex);
-+
-+	return 0;
-+}
-+
-+static void bfqio_css_offline(struct cgroup_subsys_state *css)
-+{
-+	struct bfqio_cgroup *bgrp = css_to_bfqio(css);
-+
-+	mutex_lock(&bfqio_mutex);
-+	bgrp->online = false;
-+	mutex_unlock(&bfqio_mutex);
-+}
-+
-+struct cgroup_subsys bfqio_cgrp_subsys = {
-+	.css_alloc = bfqio_create,
-+	.css_online = bfqio_css_online,
-+	.css_offline = bfqio_css_offline,
-+	.can_attach = bfqio_can_attach,
-+	.attach = bfqio_attach,
-+	.css_free = bfqio_destroy,
-+	.legacy_cftypes = bfqio_files,
-+};
-+#else
-+static inline void bfq_init_entity(struct bfq_entity *entity,
-+				   struct bfq_group *bfqg)
-+{
-+	entity->weight = entity->new_weight;
-+	entity->orig_weight = entity->new_weight;
-+	entity->ioprio = entity->new_ioprio;
-+	entity->ioprio_class = entity->new_ioprio_class;
-+	entity->sched_data = &bfqg->sched_data;
-+}
-+
-+static inline struct bfq_group *
-+bfq_bic_update_cgroup(struct bfq_io_cq *bic)
-+{
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+	return bfqd->root_group;
-+}
-+
-+static inline void bfq_bfqq_move(struct bfq_data *bfqd,
-+				 struct bfq_queue *bfqq,
-+				 struct bfq_entity *entity,
-+				 struct bfq_group *bfqg)
-+{
-+}
-+
-+static void bfq_end_wr_async(struct bfq_data *bfqd)
-+{
-+	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static inline void bfq_disconnect_groups(struct bfq_data *bfqd)
-+{
-+	bfq_put_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static inline void bfq_free_root_group(struct bfq_data *bfqd)
-+{
-+	kfree(bfqd->root_group);
-+}
-+
-+static struct bfq_group *bfq_alloc_root_group(struct bfq_data *bfqd, int node)
-+{
-+	struct bfq_group *bfqg;
-+	int i;
-+
-+	bfqg = kmalloc_node(sizeof(*bfqg), GFP_KERNEL | __GFP_ZERO, node);
-+	if (bfqg == NULL)
-+		return NULL;
-+
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
-+		bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
-+
-+	return bfqg;
-+}
-+#endif
-diff --git a/block/bfq-ioc.c b/block/bfq-ioc.c
-new file mode 100644
-index 0000000..7f6b000
---- /dev/null
-+++ b/block/bfq-ioc.c
-@@ -0,0 +1,36 @@
-+/*
-+ * BFQ: I/O context handling.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+/**
-+ * icq_to_bic - convert iocontext queue structure to bfq_io_cq.
-+ * @icq: the iocontext queue.
-+ */
-+static inline struct bfq_io_cq *icq_to_bic(struct io_cq *icq)
-+{
-+	/* bic->icq is the first member, %NULL will convert to %NULL */
-+	return container_of(icq, struct bfq_io_cq, icq);
-+}
-+
-+/**
-+ * bfq_bic_lookup - search into @ioc a bic associated to @bfqd.
-+ * @bfqd: the lookup key.
-+ * @ioc: the io_context of the process doing I/O.
-+ *
-+ * Queue lock must be held.
-+ */
-+static inline struct bfq_io_cq *bfq_bic_lookup(struct bfq_data *bfqd,
-+					       struct io_context *ioc)
-+{
-+	if (ioc)
-+		return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue));
-+	return NULL;
-+}
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-new file mode 100644
-index 0000000..773b2ee
---- /dev/null
-+++ b/block/bfq-iosched.c
-@@ -0,0 +1,3898 @@
-+/*
-+ * Budget Fair Queueing (BFQ) disk scheduler.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-+ * file.
-+ *
-+ * BFQ is a proportional-share storage-I/O scheduling algorithm based on
-+ * the slice-by-slice service scheme of CFQ. But BFQ assigns budgets,
-+ * measured in number of sectors, to processes instead of time slices. The
-+ * device is not granted to the in-service process for a given time slice,
-+ * but until it has exhausted its assigned budget. This change from the time
-+ * to the service domain allows BFQ to distribute the device throughput
-+ * among processes as desired, without any distortion due to ZBR, workload
-+ * fluctuations or other factors. BFQ uses an ad hoc internal scheduler,
-+ * called B-WF2Q+, to schedule processes according to their budgets. More
-+ * precisely, BFQ schedules queues associated to processes. Thanks to the
-+ * accurate policy of B-WF2Q+, BFQ can afford to assign high budgets to
-+ * I/O-bound processes issuing sequential requests (to boost the
-+ * throughput), and yet guarantee a low latency to interactive and soft
-+ * real-time applications.
-+ *
-+ * BFQ is described in [1], where also a reference to the initial, more
-+ * theoretical paper on BFQ can be found. The interested reader can find
-+ * in the latter paper full details on the main algorithm, as well as
-+ * formulas of the guarantees and formal proofs of all the properties.
-+ * With respect to the version of BFQ presented in these papers, this
-+ * implementation adds a few more heuristics, such as the one that
-+ * guarantees a low latency to soft real-time applications, and a
-+ * hierarchical extension based on H-WF2Q+.
-+ *
-+ * B-WF2Q+ is based on WF2Q+, that is described in [2], together with
-+ * H-WF2Q+, while the augmented tree used to implement B-WF2Q+ with O(log N)
-+ * complexity derives from the one introduced with EEVDF in [3].
-+ *
-+ * [1] P. Valente and M. Andreolini, ``Improving Application Responsiveness
-+ *     with the BFQ Disk I/O Scheduler'',
-+ *     Proceedings of the 5th Annual International Systems and Storage
-+ *     Conference (SYSTOR '12), June 2012.
-+ *
-+ * http://algogroup.unimo.it/people/paolo/disk_sched/bf1-v1-suite-results.pdf
-+ *
-+ * [2] Jon C.R. Bennett and H. Zhang, ``Hierarchical Packet Fair Queueing
-+ *     Algorithms,'' IEEE/ACM Transactions on Networking, 5(5):675-689,
-+ *     Oct 1997.
-+ *
-+ * http://www.cs.cmu.edu/~hzhang/papers/TON-97-Oct.ps.gz
-+ *
-+ * [3] I. Stoica and H. Abdel-Wahab, ``Earliest Eligible Virtual Deadline
-+ *     First: A Flexible and Accurate Mechanism for Proportional Share
-+ *     Resource Allocation,'' technical report.
-+ *
-+ * http://www.cs.berkeley.edu/~istoica/papers/eevdf-tr-95.pdf
-+ */
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/blkdev.h>
-+#include <linux/cgroup.h>
-+#include <linux/elevator.h>
-+#include <linux/jiffies.h>
-+#include <linux/rbtree.h>
-+#include <linux/ioprio.h>
-+#include "bfq.h"
-+#include "blk.h"
-+
-+/* Expiration time of sync (0) and async (1) requests, in jiffies. */
-+static const int bfq_fifo_expire[2] = { HZ / 4, HZ / 8 };
-+
-+/* Maximum backwards seek, in KiB. */
-+static const int bfq_back_max = 16 * 1024;
-+
-+/* Penalty of a backwards seek, in number of sectors. */
-+static const int bfq_back_penalty = 2;
-+
-+/* Idling period duration, in jiffies. */
-+static int bfq_slice_idle = HZ / 125;
-+
-+/* Default maximum budget values, in sectors and number of requests. */
-+static const int bfq_default_max_budget = 16 * 1024;
-+static const int bfq_max_budget_async_rq = 4;
-+
-+/*
-+ * Async to sync throughput distribution is controlled as follows:
-+ * when an async request is served, the entity is charged the number
-+ * of sectors of the request, multiplied by the factor below
-+ */
-+static const int bfq_async_charge_factor = 10;
-+
-+/* Default timeout values, in jiffies, approximating CFQ defaults. */
-+static const int bfq_timeout_sync = HZ / 8;
-+static int bfq_timeout_async = HZ / 25;
-+
-+struct kmem_cache *bfq_pool;
-+
-+/* Below this threshold (in ms), we consider thinktime immediate. */
-+#define BFQ_MIN_TT		2
-+
-+/* hw_tag detection: parallel requests threshold and min samples needed. */
-+#define BFQ_HW_QUEUE_THRESHOLD	4
-+#define BFQ_HW_QUEUE_SAMPLES	32
-+
-+#define BFQQ_SEEK_THR	 (sector_t)(8 * 1024)
-+#define BFQQ_SEEKY(bfqq) ((bfqq)->seek_mean > BFQQ_SEEK_THR)
-+
-+/* Min samples used for peak rate estimation (for autotuning). */
-+#define BFQ_PEAK_RATE_SAMPLES	32
-+
-+/* Shift used for peak rate fixed precision calculations. */
-+#define BFQ_RATE_SHIFT		16
-+
-+/*
-+ * By default, BFQ computes the duration of the weight raising for
-+ * interactive applications automatically, using the following formula:
-+ * duration = (R / r) * T, where r is the peak rate of the device, and
-+ * R and T are two reference parameters.
-+ * In particular, R is the peak rate of the reference device (see below),
-+ * and T is a reference time: given the systems that are likely to be
-+ * installed on the reference device according to its speed class, T is
-+ * about the maximum time needed, under BFQ and while reading two files in
-+ * parallel, to load typical large applications on these systems.
-+ * In practice, the slower/faster the device at hand is, the more/less it
-+ * takes to load applications with respect to the reference device.
-+ * Accordingly, the longer/shorter BFQ grants weight raising to interactive
-+ * applications.
-+ *
-+ * BFQ uses four different reference pairs (R, T), depending on:
-+ * . whether the device is rotational or non-rotational;
-+ * . whether the device is slow, such as old or portable HDDs, as well as
-+ *   SD cards, or fast, such as newer HDDs and SSDs.
-+ *
-+ * The device's speed class is dynamically (re)detected in
-+ * bfq_update_peak_rate() every time the estimated peak rate is updated.
-+ *
-+ * In the following definitions, R_slow[0]/R_fast[0] and T_slow[0]/T_fast[0]
-+ * are the reference values for a slow/fast rotational device, whereas
-+ * R_slow[1]/R_fast[1] and T_slow[1]/T_fast[1] are the reference values for
-+ * a slow/fast non-rotational device. Finally, device_speed_thresh are the
-+ * thresholds used to switch between speed classes.
-+ * Both the reference peak rates and the thresholds are measured in
-+ * sectors/usec, left-shifted by BFQ_RATE_SHIFT.
-+ */
-+static int R_slow[2] = {1536, 10752};
-+static int R_fast[2] = {17415, 34791};
-+/*
-+ * To improve readability, a conversion function is used to initialize the
-+ * following arrays, which entails that they can be initialized only in a
-+ * function.
-+ */
-+static int T_slow[2];
-+static int T_fast[2];
-+static int device_speed_thresh[2];
-+
-+#define BFQ_SERVICE_TREE_INIT	((struct bfq_service_tree)		\
-+				{ RB_ROOT, RB_ROOT, NULL, NULL, 0, 0 })
-+
-+#define RQ_BIC(rq)		((struct bfq_io_cq *) (rq)->elv.priv[0])
-+#define RQ_BFQQ(rq)		((rq)->elv.priv[1])
-+
-+static inline void bfq_schedule_dispatch(struct bfq_data *bfqd);
-+
-+#include "bfq-ioc.c"
-+#include "bfq-sched.c"
-+#include "bfq-cgroup.c"
-+
-+#define bfq_class_idle(bfqq)	((bfqq)->entity.ioprio_class ==\
-+				 IOPRIO_CLASS_IDLE)
-+#define bfq_class_rt(bfqq)	((bfqq)->entity.ioprio_class ==\
-+				 IOPRIO_CLASS_RT)
-+
-+#define bfq_sample_valid(samples)	((samples) > 80)
-+
-+/*
-+ * The following macro groups conditions that need to be evaluated when
-+ * checking if existing queues and groups form a symmetric scenario
-+ * and therefore idling can be reduced or disabled for some of the
-+ * queues. See the comment to the function bfq_bfqq_must_not_expire()
-+ * for further details.
-+ */
-+#ifdef CONFIG_CGROUP_BFQIO
-+#define symmetric_scenario	  (!bfqd->active_numerous_groups && \
-+				   !bfq_differentiated_weights(bfqd))
-+#else
-+#define symmetric_scenario	  (!bfq_differentiated_weights(bfqd))
-+#endif
-+
-+/*
-+ * We regard a request as SYNC, if either it's a read or has the SYNC bit
-+ * set (in which case it could also be a direct WRITE).
-+ */
-+static inline int bfq_bio_sync(struct bio *bio)
-+{
-+	if (bio_data_dir(bio) == READ || (bio->bi_rw & REQ_SYNC))
-+		return 1;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Scheduler run of queue, if there are requests pending and no one in the
-+ * driver that will restart queueing.
-+ */
-+static inline void bfq_schedule_dispatch(struct bfq_data *bfqd)
-+{
-+	if (bfqd->queued != 0) {
-+		bfq_log(bfqd, "schedule dispatch");
-+		kblockd_schedule_work(&bfqd->unplug_work);
-+	}
-+}
-+
-+/*
-+ * Lifted from AS - choose which of rq1 and rq2 that is best served now.
-+ * We choose the request that is closesr to the head right now.  Distance
-+ * behind the head is penalized and only allowed to a certain extent.
-+ */
-+static struct request *bfq_choose_req(struct bfq_data *bfqd,
-+				      struct request *rq1,
-+				      struct request *rq2,
-+				      sector_t last)
-+{
-+	sector_t s1, s2, d1 = 0, d2 = 0;
-+	unsigned long back_max;
-+#define BFQ_RQ1_WRAP	0x01 /* request 1 wraps */
-+#define BFQ_RQ2_WRAP	0x02 /* request 2 wraps */
-+	unsigned wrap = 0; /* bit mask: requests behind the disk head? */
-+
-+	if (rq1 == NULL || rq1 == rq2)
-+		return rq2;
-+	if (rq2 == NULL)
-+		return rq1;
-+
-+	if (rq_is_sync(rq1) && !rq_is_sync(rq2))
-+		return rq1;
-+	else if (rq_is_sync(rq2) && !rq_is_sync(rq1))
-+		return rq2;
-+	if ((rq1->cmd_flags & REQ_META) && !(rq2->cmd_flags & REQ_META))
-+		return rq1;
-+	else if ((rq2->cmd_flags & REQ_META) && !(rq1->cmd_flags & REQ_META))
-+		return rq2;
-+
-+	s1 = blk_rq_pos(rq1);
-+	s2 = blk_rq_pos(rq2);
-+
-+	/*
-+	 * By definition, 1KiB is 2 sectors.
-+	 */
-+	back_max = bfqd->bfq_back_max * 2;
-+
-+	/*
-+	 * Strict one way elevator _except_ in the case where we allow
-+	 * short backward seeks which are biased as twice the cost of a
-+	 * similar forward seek.
-+	 */
-+	if (s1 >= last)
-+		d1 = s1 - last;
-+	else if (s1 + back_max >= last)
-+		d1 = (last - s1) * bfqd->bfq_back_penalty;
-+	else
-+		wrap |= BFQ_RQ1_WRAP;
-+
-+	if (s2 >= last)
-+		d2 = s2 - last;
-+	else if (s2 + back_max >= last)
-+		d2 = (last - s2) * bfqd->bfq_back_penalty;
-+	else
-+		wrap |= BFQ_RQ2_WRAP;
-+
-+	/* Found required data */
-+
-+	/*
-+	 * By doing switch() on the bit mask "wrap" we avoid having to
-+	 * check two variables for all permutations: --> faster!
-+	 */
-+	switch (wrap) {
-+	case 0: /* common case for CFQ: rq1 and rq2 not wrapped */
-+		if (d1 < d2)
-+			return rq1;
-+		else if (d2 < d1)
-+			return rq2;
-+		else {
-+			if (s1 >= s2)
-+				return rq1;
-+			else
-+				return rq2;
-+		}
-+
-+	case BFQ_RQ2_WRAP:
-+		return rq1;
-+	case BFQ_RQ1_WRAP:
-+		return rq2;
-+	case (BFQ_RQ1_WRAP|BFQ_RQ2_WRAP): /* both rqs wrapped */
-+	default:
-+		/*
-+		 * Since both rqs are wrapped,
-+		 * start with the one that's further behind head
-+		 * (--> only *one* back seek required),
-+		 * since back seek takes more time than forward.
-+		 */
-+		if (s1 <= s2)
-+			return rq1;
-+		else
-+			return rq2;
-+	}
-+}
-+
-+static struct bfq_queue *
-+bfq_rq_pos_tree_lookup(struct bfq_data *bfqd, struct rb_root *root,
-+		     sector_t sector, struct rb_node **ret_parent,
-+		     struct rb_node ***rb_link)
-+{
-+	struct rb_node **p, *parent;
-+	struct bfq_queue *bfqq = NULL;
-+
-+	parent = NULL;
-+	p = &root->rb_node;
-+	while (*p) {
-+		struct rb_node **n;
-+
-+		parent = *p;
-+		bfqq = rb_entry(parent, struct bfq_queue, pos_node);
-+
-+		/*
-+		 * Sort strictly based on sector. Smallest to the left,
-+		 * largest to the right.
-+		 */
-+		if (sector > blk_rq_pos(bfqq->next_rq))
-+			n = &(*p)->rb_right;
-+		else if (sector < blk_rq_pos(bfqq->next_rq))
-+			n = &(*p)->rb_left;
-+		else
-+			break;
-+		p = n;
-+		bfqq = NULL;
-+	}
-+
-+	*ret_parent = parent;
-+	if (rb_link)
-+		*rb_link = p;
-+
-+	bfq_log(bfqd, "rq_pos_tree_lookup %llu: returning %d",
-+		(long long unsigned)sector,
-+		bfqq != NULL ? bfqq->pid : 0);
-+
-+	return bfqq;
-+}
-+
-+static void bfq_rq_pos_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct rb_node **p, *parent;
-+	struct bfq_queue *__bfqq;
-+
-+	if (bfqq->pos_root != NULL) {
-+		rb_erase(&bfqq->pos_node, bfqq->pos_root);
-+		bfqq->pos_root = NULL;
-+	}
-+
-+	if (bfq_class_idle(bfqq))
-+		return;
-+	if (!bfqq->next_rq)
-+		return;
-+
-+	bfqq->pos_root = &bfqd->rq_pos_tree;
-+	__bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root,
-+			blk_rq_pos(bfqq->next_rq), &parent, &p);
-+	if (__bfqq == NULL) {
-+		rb_link_node(&bfqq->pos_node, parent, p);
-+		rb_insert_color(&bfqq->pos_node, bfqq->pos_root);
-+	} else
-+		bfqq->pos_root = NULL;
-+}
-+
-+/*
-+ * Tell whether there are active queues or groups with differentiated weights.
-+ */
-+static inline bool bfq_differentiated_weights(struct bfq_data *bfqd)
-+{
-+	/*
-+	 * For weights to differ, at least one of the trees must contain
-+	 * at least two nodes.
-+	 */
-+	return (!RB_EMPTY_ROOT(&bfqd->queue_weights_tree) &&
-+		(bfqd->queue_weights_tree.rb_node->rb_left ||
-+		 bfqd->queue_weights_tree.rb_node->rb_right)
-+#ifdef CONFIG_CGROUP_BFQIO
-+	       ) ||
-+	       (!RB_EMPTY_ROOT(&bfqd->group_weights_tree) &&
-+		(bfqd->group_weights_tree.rb_node->rb_left ||
-+		 bfqd->group_weights_tree.rb_node->rb_right)
-+#endif
-+	       );
-+}
-+
-+/*
-+ * If the weight-counter tree passed as input contains no counter for
-+ * the weight of the input entity, then add that counter; otherwise just
-+ * increment the existing counter.
-+ *
-+ * Note that weight-counter trees contain few nodes in mostly symmetric
-+ * scenarios. For example, if all queues have the same weight, then the
-+ * weight-counter tree for the queues may contain at most one node.
-+ * This holds even if low_latency is on, because weight-raised queues
-+ * are not inserted in the tree.
-+ * In most scenarios, the rate at which nodes are created/destroyed
-+ * should be low too.
-+ */
-+static void bfq_weights_tree_add(struct bfq_data *bfqd,
-+				 struct bfq_entity *entity,
-+				 struct rb_root *root)
-+{
-+	struct rb_node **new = &(root->rb_node), *parent = NULL;
-+
-+	/*
-+	 * Do not insert if the entity is already associated with a
-+	 * counter, which happens if:
-+	 *   1) the entity is associated with a queue,
-+	 *   2) a request arrival has caused the queue to become both
-+	 *      non-weight-raised, and hence change its weight, and
-+	 *      backlogged; in this respect, each of the two events
-+	 *      causes an invocation of this function,
-+	 *   3) this is the invocation of this function caused by the
-+	 *      second event. This second invocation is actually useless,
-+	 *      and we handle this fact by exiting immediately. More
-+	 *      efficient or clearer solutions might possibly be adopted.
-+	 */
-+	if (entity->weight_counter)
-+		return;
-+
-+	while (*new) {
-+		struct bfq_weight_counter *__counter = container_of(*new,
-+						struct bfq_weight_counter,
-+						weights_node);
-+		parent = *new;
-+
-+		if (entity->weight == __counter->weight) {
-+			entity->weight_counter = __counter;
-+			goto inc_counter;
-+		}
-+		if (entity->weight < __counter->weight)
-+			new = &((*new)->rb_left);
-+		else
-+			new = &((*new)->rb_right);
-+	}
-+
-+	entity->weight_counter = kzalloc(sizeof(struct bfq_weight_counter),
-+					 GFP_ATOMIC);
-+	entity->weight_counter->weight = entity->weight;
-+	rb_link_node(&entity->weight_counter->weights_node, parent, new);
-+	rb_insert_color(&entity->weight_counter->weights_node, root);
-+
-+inc_counter:
-+	entity->weight_counter->num_active++;
-+}
-+
-+/*
-+ * Decrement the weight counter associated with the entity, and, if the
-+ * counter reaches 0, remove the counter from the tree.
-+ * See the comments to the function bfq_weights_tree_add() for considerations
-+ * about overhead.
-+ */
-+static void bfq_weights_tree_remove(struct bfq_data *bfqd,
-+				    struct bfq_entity *entity,
-+				    struct rb_root *root)
-+{
-+	if (!entity->weight_counter)
-+		return;
-+
-+	BUG_ON(RB_EMPTY_ROOT(root));
-+	BUG_ON(entity->weight_counter->weight != entity->weight);
-+
-+	BUG_ON(!entity->weight_counter->num_active);
-+	entity->weight_counter->num_active--;
-+	if (entity->weight_counter->num_active > 0)
-+		goto reset_entity_pointer;
-+
-+	rb_erase(&entity->weight_counter->weights_node, root);
-+	kfree(entity->weight_counter);
-+
-+reset_entity_pointer:
-+	entity->weight_counter = NULL;
-+}
-+
-+static struct request *bfq_find_next_rq(struct bfq_data *bfqd,
-+					struct bfq_queue *bfqq,
-+					struct request *last)
-+{
-+	struct rb_node *rbnext = rb_next(&last->rb_node);
-+	struct rb_node *rbprev = rb_prev(&last->rb_node);
-+	struct request *next = NULL, *prev = NULL;
-+
-+	BUG_ON(RB_EMPTY_NODE(&last->rb_node));
-+
-+	if (rbprev != NULL)
-+		prev = rb_entry_rq(rbprev);
-+
-+	if (rbnext != NULL)
-+		next = rb_entry_rq(rbnext);
-+	else {
-+		rbnext = rb_first(&bfqq->sort_list);
-+		if (rbnext && rbnext != &last->rb_node)
-+			next = rb_entry_rq(rbnext);
-+	}
-+
-+	return bfq_choose_req(bfqd, next, prev, blk_rq_pos(last));
-+}
-+
-+/* see the definition of bfq_async_charge_factor for details */
-+static inline unsigned long bfq_serv_to_charge(struct request *rq,
-+					       struct bfq_queue *bfqq)
-+{
-+	return blk_rq_sectors(rq) *
-+		(1 + ((!bfq_bfqq_sync(bfqq)) * (bfqq->wr_coeff == 1) *
-+		bfq_async_charge_factor));
-+}
-+
-+/**
-+ * bfq_updated_next_req - update the queue after a new next_rq selection.
-+ * @bfqd: the device data the queue belongs to.
-+ * @bfqq: the queue to update.
-+ *
-+ * If the first request of a queue changes we make sure that the queue
-+ * has enough budget to serve at least its first request (if the
-+ * request has grown).  We do this because if the queue has not enough
-+ * budget for its first request, it has to go through two dispatch
-+ * rounds to actually get it dispatched.
-+ */
-+static void bfq_updated_next_req(struct bfq_data *bfqd,
-+				 struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+	struct request *next_rq = bfqq->next_rq;
-+	unsigned long new_budget;
-+
-+	if (next_rq == NULL)
-+		return;
-+
-+	if (bfqq == bfqd->in_service_queue)
-+		/*
-+		 * In order not to break guarantees, budgets cannot be
-+		 * changed after an entity has been selected.
-+		 */
-+		return;
-+
-+	BUG_ON(entity->tree != &st->active);
-+	BUG_ON(entity == entity->sched_data->in_service_entity);
-+
-+	new_budget = max_t(unsigned long, bfqq->max_budget,
-+			   bfq_serv_to_charge(next_rq, bfqq));
-+	if (entity->budget != new_budget) {
-+		entity->budget = new_budget;
-+		bfq_log_bfqq(bfqd, bfqq, "updated next rq: new budget %lu",
-+					 new_budget);
-+		bfq_activate_bfqq(bfqd, bfqq);
-+	}
-+}
-+
-+static inline unsigned int bfq_wr_duration(struct bfq_data *bfqd)
-+{
-+	u64 dur;
-+
-+	if (bfqd->bfq_wr_max_time > 0)
-+		return bfqd->bfq_wr_max_time;
-+
-+	dur = bfqd->RT_prod;
-+	do_div(dur, bfqd->peak_rate);
-+
-+	return dur;
-+}
-+
-+/* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */
-+static inline void bfq_reset_burst_list(struct bfq_data *bfqd,
-+					struct bfq_queue *bfqq)
-+{
-+	struct bfq_queue *item;
-+	struct hlist_node *n;
-+
-+	hlist_for_each_entry_safe(item, n, &bfqd->burst_list, burst_list_node)
-+		hlist_del_init(&item->burst_list_node);
-+	hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
-+	bfqd->burst_size = 1;
-+}
-+
-+/* Add bfqq to the list of queues in current burst (see bfq_handle_burst) */
-+static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	/* Increment burst size to take into account also bfqq */
-+	bfqd->burst_size++;
-+
-+	if (bfqd->burst_size == bfqd->bfq_large_burst_thresh) {
-+		struct bfq_queue *pos, *bfqq_item;
-+		struct hlist_node *n;
-+
-+		/*
-+		 * Enough queues have been activated shortly after each
-+		 * other to consider this burst as large.
-+		 */
-+		bfqd->large_burst = true;
-+
-+		/*
-+		 * We can now mark all queues in the burst list as
-+		 * belonging to a large burst.
-+		 */
-+		hlist_for_each_entry(bfqq_item, &bfqd->burst_list,
-+				     burst_list_node)
-+		        bfq_mark_bfqq_in_large_burst(bfqq_item);
-+		bfq_mark_bfqq_in_large_burst(bfqq);
-+
-+		/*
-+		 * From now on, and until the current burst finishes, any
-+		 * new queue being activated shortly after the last queue
-+		 * was inserted in the burst can be immediately marked as
-+		 * belonging to a large burst. So the burst list is not
-+		 * needed any more. Remove it.
-+		 */
-+		hlist_for_each_entry_safe(pos, n, &bfqd->burst_list,
-+					  burst_list_node)
-+			hlist_del_init(&pos->burst_list_node);
-+	} else /* burst not yet large: add bfqq to the burst list */
-+		hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
-+}
-+
-+/*
-+ * If many queues happen to become active shortly after each other, then,
-+ * to help the processes associated to these queues get their job done as
-+ * soon as possible, it is usually better to not grant either weight-raising
-+ * or device idling to these queues. In this comment we describe, firstly,
-+ * the reasons why this fact holds, and, secondly, the next function, which
-+ * implements the main steps needed to properly mark these queues so that
-+ * they can then be treated in a different way.
-+ *
-+ * As for the terminology, we say that a queue becomes active, i.e.,
-+ * switches from idle to backlogged, either when it is created (as a
-+ * consequence of the arrival of an I/O request), or, if already existing,
-+ * when a new request for the queue arrives while the queue is idle.
-+ * Bursts of activations, i.e., activations of different queues occurring
-+ * shortly after each other, are typically caused by services or applications
-+ * that spawn or reactivate many parallel threads/processes. Examples are
-+ * systemd during boot or git grep.
-+ *
-+ * These services or applications benefit mostly from a high throughput:
-+ * the quicker the requests of the activated queues are cumulatively served,
-+ * the sooner the target job of these queues gets completed. As a consequence,
-+ * weight-raising any of these queues, which also implies idling the device
-+ * for it, is almost always counterproductive: in most cases it just lowers
-+ * throughput.
-+ *
-+ * On the other hand, a burst of activations may be also caused by the start
-+ * of an application that does not consist in a lot of parallel I/O-bound
-+ * threads. In fact, with a complex application, the burst may be just a
-+ * consequence of the fact that several processes need to be executed to
-+ * start-up the application. To start an application as quickly as possible,
-+ * the best thing to do is to privilege the I/O related to the application
-+ * with respect to all other I/O. Therefore, the best strategy to start as
-+ * quickly as possible an application that causes a burst of activations is
-+ * to weight-raise all the queues activated during the burst. This is the
-+ * exact opposite of the best strategy for the other type of bursts.
-+ *
-+ * In the end, to take the best action for each of the two cases, the two
-+ * types of bursts need to be distinguished. Fortunately, this seems
-+ * relatively easy to do, by looking at the sizes of the bursts. In
-+ * particular, we found a threshold such that bursts with a larger size
-+ * than that threshold are apparently caused only by services or commands
-+ * such as systemd or git grep. For brevity, hereafter we call just 'large'
-+ * these bursts. BFQ *does not* weight-raise queues whose activations occur
-+ * in a large burst. In addition, for each of these queues BFQ performs or
-+ * does not perform idling depending on which choice boosts the throughput
-+ * most. The exact choice depends on the device and request pattern at
-+ * hand.
-+ *
-+ * Turning back to the next function, it implements all the steps needed
-+ * to detect the occurrence of a large burst and to properly mark all the
-+ * queues belonging to it (so that they can then be treated in a different
-+ * way). This goal is achieved by maintaining a special "burst list" that
-+ * holds, temporarily, the queues that belong to the burst in progress. The
-+ * list is then used to mark these queues as belonging to a large burst if
-+ * the burst does become large. The main steps are the following.
-+ *
-+ * . when the very first queue is activated, the queue is inserted into the
-+ *   list (as it could be the first queue in a possible burst)
-+ *
-+ * . if the current burst has not yet become large, and a queue Q that does
-+ *   not yet belong to the burst is activated shortly after the last time
-+ *   at which a new queue entered the burst list, then the function appends
-+ *   Q to the burst list
-+ *
-+ * . if, as a consequence of the previous step, the burst size reaches
-+ *   the large-burst threshold, then
-+ *
-+ *     . all the queues in the burst list are marked as belonging to a
-+ *       large burst
-+ *
-+ *     . the burst list is deleted; in fact, the burst list already served
-+ *       its purpose (keeping temporarily track of the queues in a burst,
-+ *       so as to be able to mark them as belonging to a large burst in the
-+ *       previous sub-step), and now is not needed any more
-+ *
-+ *     . the device enters a large-burst mode
-+ *
-+ * . if a queue Q that does not belong to the burst is activated while
-+ *   the device is in large-burst mode and shortly after the last time
-+ *   at which a queue either entered the burst list or was marked as
-+ *   belonging to the current large burst, then Q is immediately marked
-+ *   as belonging to a large burst.
-+ *
-+ * . if a queue Q that does not belong to the burst is activated a while
-+ *   later, i.e., not shortly after, than the last time at which a queue
-+ *   either entered the burst list or was marked as belonging to the
-+ *   current large burst, then the current burst is deemed as finished and:
-+ *
-+ *        . the large-burst mode is reset if set
-+ *
-+ *        . the burst list is emptied
-+ *
-+ *        . Q is inserted in the burst list, as Q may be the first queue
-+ *          in a possible new burst (then the burst list contains just Q
-+ *          after this step).
-+ */
-+static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			     bool idle_for_long_time)
-+{
-+	/*
-+	 * If bfqq happened to be activated in a burst, but has been idle
-+	 * for at least as long as an interactive queue, then we assume
-+	 * that, in the overall I/O initiated in the burst, the I/O
-+	 * associated to bfqq is finished. So bfqq does not need to be
-+	 * treated as a queue belonging to a burst anymore. Accordingly,
-+	 * we reset bfqq's in_large_burst flag if set, and remove bfqq
-+	 * from the burst list if it's there. We do not decrement instead
-+	 * burst_size, because the fact that bfqq does not need to belong
-+	 * to the burst list any more does not invalidate the fact that
-+	 * bfqq may have been activated during the current burst.
-+	 */
-+	if (idle_for_long_time) {
-+		hlist_del_init(&bfqq->burst_list_node);
-+		bfq_clear_bfqq_in_large_burst(bfqq);
-+	}
-+
-+	/*
-+	 * If bfqq is already in the burst list or is part of a large
-+	 * burst, then there is nothing else to do.
-+	 */
-+	if (!hlist_unhashed(&bfqq->burst_list_node) ||
-+	    bfq_bfqq_in_large_burst(bfqq))
-+		return;
-+
-+	/*
-+	 * If bfqq's activation happens late enough, then the current
-+	 * burst is finished, and related data structures must be reset.
-+	 *
-+	 * In this respect, consider the special case where bfqq is the very
-+	 * first queue being activated. In this case, last_ins_in_burst is
-+	 * not yet significant when we get here. But it is easy to verify
-+	 * that, whether or not the following condition is true, bfqq will
-+	 * end up being inserted into the burst list. In particular the
-+	 * list will happen to contain only bfqq. And this is exactly what
-+	 * has to happen, as bfqq may be the first queue in a possible
-+	 * burst.
-+	 */
-+	if (time_is_before_jiffies(bfqd->last_ins_in_burst +
-+	    bfqd->bfq_burst_interval)) {
-+		bfqd->large_burst = false;
-+		bfq_reset_burst_list(bfqd, bfqq);
-+		return;
-+	}
-+
-+	/*
-+	 * If we get here, then bfqq is being activated shortly after the
-+	 * last queue. So, if the current burst is also large, we can mark
-+	 * bfqq as belonging to this large burst immediately.
-+	 */
-+	if (bfqd->large_burst) {
-+		bfq_mark_bfqq_in_large_burst(bfqq);
-+		return;
-+	}
-+
-+	/*
-+	 * If we get here, then a large-burst state has not yet been
-+	 * reached, but bfqq is being activated shortly after the last
-+	 * queue. Then we add bfqq to the burst.
-+	 */
-+	bfq_add_to_burst(bfqd, bfqq);
-+}
-+
-+static void bfq_add_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	struct request *next_rq, *prev;
-+	unsigned long old_wr_coeff = bfqq->wr_coeff;
-+	bool interactive = false;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "add_request %d", rq_is_sync(rq));
-+	bfqq->queued[rq_is_sync(rq)]++;
-+	bfqd->queued++;
-+
-+	elv_rb_add(&bfqq->sort_list, rq);
-+
-+	/*
-+	 * Check if this request is a better next-serve candidate.
-+	 */
-+	prev = bfqq->next_rq;
-+	next_rq = bfq_choose_req(bfqd, bfqq->next_rq, rq, bfqd->last_position);
-+	BUG_ON(next_rq == NULL);
-+	bfqq->next_rq = next_rq;
-+
-+	/*
-+	 * Adjust priority tree position, if next_rq changes.
-+	 */
-+	if (prev != bfqq->next_rq)
-+		bfq_rq_pos_tree_add(bfqd, bfqq);
-+
-+	if (!bfq_bfqq_busy(bfqq)) {
-+		bool soft_rt,
-+		     idle_for_long_time = time_is_before_jiffies(
-+						bfqq->budget_timeout +
-+						bfqd->bfq_wr_min_idle_time);
-+
-+		if (bfq_bfqq_sync(bfqq)) {
-+			bool already_in_burst =
-+			   !hlist_unhashed(&bfqq->burst_list_node) ||
-+			   bfq_bfqq_in_large_burst(bfqq);
-+			bfq_handle_burst(bfqd, bfqq, idle_for_long_time);
-+			/*
-+			 * If bfqq was not already in the current burst,
-+			 * then, at this point, bfqq either has been
-+			 * added to the current burst or has caused the
-+			 * current burst to terminate. In particular, in
-+			 * the second case, bfqq has become the first
-+			 * queue in a possible new burst.
-+			 * In both cases last_ins_in_burst needs to be
-+			 * moved forward.
-+			 */
-+			if (!already_in_burst)
-+				bfqd->last_ins_in_burst = jiffies;
-+		}
-+
-+		soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
-+			!bfq_bfqq_in_large_burst(bfqq) &&
-+			time_is_before_jiffies(bfqq->soft_rt_next_start);
-+		interactive = !bfq_bfqq_in_large_burst(bfqq) &&
-+			      idle_for_long_time;
-+		entity->budget = max_t(unsigned long, bfqq->max_budget,
-+				       bfq_serv_to_charge(next_rq, bfqq));
-+
-+		if (!bfq_bfqq_IO_bound(bfqq)) {
-+			if (time_before(jiffies,
-+					RQ_BIC(rq)->ttime.last_end_request +
-+					bfqd->bfq_slice_idle)) {
-+				bfqq->requests_within_timer++;
-+				if (bfqq->requests_within_timer >=
-+				    bfqd->bfq_requests_within_timer)
-+					bfq_mark_bfqq_IO_bound(bfqq);
-+			} else
-+				bfqq->requests_within_timer = 0;
-+		}
-+
-+		if (!bfqd->low_latency)
-+			goto add_bfqq_busy;
-+
-+		/*
-+		 * If the queue is not being boosted and has been idle
-+		 * for enough time, start a weight-raising period
-+		 */
-+		if (old_wr_coeff == 1 && (interactive || soft_rt)) {
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			if (interactive)
-+				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+			else
-+				bfqq->wr_cur_max_time =
-+					bfqd->bfq_wr_rt_max_time;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "wrais starting at %lu, rais_max_time %u",
-+				     jiffies,
-+				     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+		} else if (old_wr_coeff > 1) {
-+			if (interactive)
-+				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+			else if (bfq_bfqq_in_large_burst(bfqq) ||
-+				 (bfqq->wr_cur_max_time ==
-+				  bfqd->bfq_wr_rt_max_time &&
-+				  !soft_rt)) {
-+				bfqq->wr_coeff = 1;
-+				bfq_log_bfqq(bfqd, bfqq,
-+					"wrais ending at %lu, rais_max_time %u",
-+					jiffies,
-+					jiffies_to_msecs(bfqq->
-+						wr_cur_max_time));
-+			} else if (time_before(
-+					bfqq->last_wr_start_finish +
-+					bfqq->wr_cur_max_time,
-+					jiffies +
-+					bfqd->bfq_wr_rt_max_time) &&
-+				   soft_rt) {
-+				/*
-+				 *
-+				 * The remaining weight-raising time is lower
-+				 * than bfqd->bfq_wr_rt_max_time, which
-+				 * means that the application is enjoying
-+				 * weight raising either because deemed soft-
-+				 * rt in the near past, or because deemed
-+				 * interactive a long ago. In both cases,
-+				 * resetting now the current remaining weight-
-+				 * raising time for the application to the
-+				 * weight-raising duration for soft rt
-+				 * applications would not cause any latency
-+				 * increase for the application (as the new
-+				 * duration would be higher than the remaining
-+				 * time).
-+				 *
-+				 * In addition, the application is now meeting
-+				 * the requirements for being deemed soft rt.
-+				 * In the end we can correctly and safely
-+				 * (re)charge the weight-raising duration for
-+				 * the application with the weight-raising
-+				 * duration for soft rt applications.
-+				 *
-+				 * In particular, doing this recharge now, i.e.,
-+				 * before the weight-raising period for the
-+				 * application finishes, reduces the probability
-+				 * of the following negative scenario:
-+				 * 1) the weight of a soft rt application is
-+				 *    raised at startup (as for any newly
-+				 *    created application),
-+				 * 2) since the application is not interactive,
-+				 *    at a certain time weight-raising is
-+				 *    stopped for the application,
-+				 * 3) at that time the application happens to
-+				 *    still have pending requests, and hence
-+				 *    is destined to not have a chance to be
-+				 *    deemed soft rt before these requests are
-+				 *    completed (see the comments to the
-+				 *    function bfq_bfqq_softrt_next_start()
-+				 *    for details on soft rt detection),
-+				 * 4) these pending requests experience a high
-+				 *    latency because the application is not
-+				 *    weight-raised while they are pending.
-+				 */
-+				bfqq->last_wr_start_finish = jiffies;
-+				bfqq->wr_cur_max_time =
-+					bfqd->bfq_wr_rt_max_time;
-+			}
-+		}
-+		if (old_wr_coeff != bfqq->wr_coeff)
-+			entity->ioprio_changed = 1;
-+add_bfqq_busy:
-+		bfqq->last_idle_bklogged = jiffies;
-+		bfqq->service_from_backlogged = 0;
-+		bfq_clear_bfqq_softrt_update(bfqq);
-+		bfq_add_bfqq_busy(bfqd, bfqq);
-+	} else {
-+		if (bfqd->low_latency && old_wr_coeff == 1 && !rq_is_sync(rq) &&
-+		    time_is_before_jiffies(
-+				bfqq->last_wr_start_finish +
-+				bfqd->bfq_wr_min_inter_arr_async)) {
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+
-+			bfqd->wr_busy_queues++;
-+			entity->ioprio_changed = 1;
-+			bfq_log_bfqq(bfqd, bfqq,
-+			    "non-idle wrais starting at %lu, rais_max_time %u",
-+			    jiffies,
-+			    jiffies_to_msecs(bfqq->wr_cur_max_time));
-+		}
-+		if (prev != bfqq->next_rq)
-+			bfq_updated_next_req(bfqd, bfqq);
-+	}
-+
-+	if (bfqd->low_latency &&
-+		(old_wr_coeff == 1 || bfqq->wr_coeff == 1 || interactive))
-+		bfqq->last_wr_start_finish = jiffies;
-+}
-+
-+static struct request *bfq_find_rq_fmerge(struct bfq_data *bfqd,
-+					  struct bio *bio)
-+{
-+	struct task_struct *tsk = current;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq;
-+
-+	bic = bfq_bic_lookup(bfqd, tsk->io_context);
-+	if (bic == NULL)
-+		return NULL;
-+
-+	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
-+	if (bfqq != NULL)
-+		return elv_rb_find(&bfqq->sort_list, bio_end_sector(bio));
-+
-+	return NULL;
-+}
-+
-+static void bfq_activate_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+
-+	bfqd->rq_in_driver++;
-+	bfqd->last_position = blk_rq_pos(rq) + blk_rq_sectors(rq);
-+	bfq_log(bfqd, "activate_request: new bfqd->last_position %llu",
-+		(long long unsigned)bfqd->last_position);
-+}
-+
-+static inline void bfq_deactivate_request(struct request_queue *q,
-+					  struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+
-+	BUG_ON(bfqd->rq_in_driver == 0);
-+	bfqd->rq_in_driver--;
-+}
-+
-+static void bfq_remove_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	const int sync = rq_is_sync(rq);
-+
-+	if (bfqq->next_rq == rq) {
-+		bfqq->next_rq = bfq_find_next_rq(bfqd, bfqq, rq);
-+		bfq_updated_next_req(bfqd, bfqq);
-+	}
-+
-+	if (rq->queuelist.prev != &rq->queuelist)
-+		list_del_init(&rq->queuelist);
-+	BUG_ON(bfqq->queued[sync] == 0);
-+	bfqq->queued[sync]--;
-+	bfqd->queued--;
-+	elv_rb_del(&bfqq->sort_list, rq);
-+
-+	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue)
-+			bfq_del_bfqq_busy(bfqd, bfqq, 1);
-+		/*
-+		 * Remove queue from request-position tree as it is empty.
-+		 */
-+		if (bfqq->pos_root != NULL) {
-+			rb_erase(&bfqq->pos_node, bfqq->pos_root);
-+			bfqq->pos_root = NULL;
-+		}
-+	}
-+
-+	if (rq->cmd_flags & REQ_META) {
-+		BUG_ON(bfqq->meta_pending == 0);
-+		bfqq->meta_pending--;
-+	}
-+}
-+
-+static int bfq_merge(struct request_queue *q, struct request **req,
-+		     struct bio *bio)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct request *__rq;
-+
-+	__rq = bfq_find_rq_fmerge(bfqd, bio);
-+	if (__rq != NULL && elv_rq_merge_ok(__rq, bio)) {
-+		*req = __rq;
-+		return ELEVATOR_FRONT_MERGE;
-+	}
-+
-+	return ELEVATOR_NO_MERGE;
-+}
-+
-+static void bfq_merged_request(struct request_queue *q, struct request *req,
-+			       int type)
-+{
-+	if (type == ELEVATOR_FRONT_MERGE &&
-+	    rb_prev(&req->rb_node) &&
-+	    blk_rq_pos(req) <
-+	    blk_rq_pos(container_of(rb_prev(&req->rb_node),
-+				    struct request, rb_node))) {
-+		struct bfq_queue *bfqq = RQ_BFQQ(req);
-+		struct bfq_data *bfqd = bfqq->bfqd;
-+		struct request *prev, *next_rq;
-+
-+		/* Reposition request in its sort_list */
-+		elv_rb_del(&bfqq->sort_list, req);
-+		elv_rb_add(&bfqq->sort_list, req);
-+		/* Choose next request to be served for bfqq */
-+		prev = bfqq->next_rq;
-+		next_rq = bfq_choose_req(bfqd, bfqq->next_rq, req,
-+					 bfqd->last_position);
-+		BUG_ON(next_rq == NULL);
-+		bfqq->next_rq = next_rq;
-+		/*
-+		 * If next_rq changes, update both the queue's budget to
-+		 * fit the new request and the queue's position in its
-+		 * rq_pos_tree.
-+		 */
-+		if (prev != bfqq->next_rq) {
-+			bfq_updated_next_req(bfqd, bfqq);
-+			bfq_rq_pos_tree_add(bfqd, bfqq);
-+		}
-+	}
-+}
-+
-+static void bfq_merged_requests(struct request_queue *q, struct request *rq,
-+				struct request *next)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq), *next_bfqq = RQ_BFQQ(next);
-+
-+	/*
-+	 * If next and rq belong to the same bfq_queue and next is older
-+	 * than rq, then reposition rq in the fifo (by substituting next
-+	 * with rq). Otherwise, if next and rq belong to different
-+	 * bfq_queues, never reposition rq: in fact, we would have to
-+	 * reposition it with respect to next's position in its own fifo,
-+	 * which would most certainly be too expensive with respect to
-+	 * the benefits.
-+	 */
-+	if (bfqq == next_bfqq &&
-+	    !list_empty(&rq->queuelist) && !list_empty(&next->queuelist) &&
-+	    time_before(next->fifo_time, rq->fifo_time)) {
-+		list_del_init(&rq->queuelist);
-+		list_replace_init(&next->queuelist, &rq->queuelist);
-+		rq->fifo_time = next->fifo_time;
-+	}
-+
-+	if (bfqq->next_rq == next)
-+		bfqq->next_rq = rq;
-+
-+	bfq_remove_request(next);
-+}
-+
-+/* Must be called with bfqq != NULL */
-+static inline void bfq_bfqq_end_wr(struct bfq_queue *bfqq)
-+{
-+	BUG_ON(bfqq == NULL);
-+	if (bfq_bfqq_busy(bfqq))
-+		bfqq->bfqd->wr_busy_queues--;
-+	bfqq->wr_coeff = 1;
-+	bfqq->wr_cur_max_time = 0;
-+	/* Trigger a weight change on the next activation of the queue */
-+	bfqq->entity.ioprio_changed = 1;
-+}
-+
-+static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
-+				    struct bfq_group *bfqg)
-+{
-+	int i, j;
-+
-+	for (i = 0; i < 2; i++)
-+		for (j = 0; j < IOPRIO_BE_NR; j++)
-+			if (bfqg->async_bfqq[i][j] != NULL)
-+				bfq_bfqq_end_wr(bfqg->async_bfqq[i][j]);
-+	if (bfqg->async_idle_bfqq != NULL)
-+		bfq_bfqq_end_wr(bfqg->async_idle_bfqq);
-+}
-+
-+static void bfq_end_wr(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq;
-+
-+	spin_lock_irq(bfqd->queue->queue_lock);
-+
-+	list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list)
-+		bfq_bfqq_end_wr(bfqq);
-+	list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list)
-+		bfq_bfqq_end_wr(bfqq);
-+	bfq_end_wr_async(bfqd);
-+
-+	spin_unlock_irq(bfqd->queue->queue_lock);
-+}
-+
-+static int bfq_allow_merge(struct request_queue *q, struct request *rq,
-+			   struct bio *bio)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq;
-+
-+	/*
-+	 * Disallow merge of a sync bio into an async request.
-+	 */
-+	if (bfq_bio_sync(bio) && !rq_is_sync(rq))
-+		return 0;
-+
-+	/*
-+	 * Lookup the bfqq that this bio will be queued with. Allow
-+	 * merge only if rq is queued there.
-+	 * Queue lock is held here.
-+	 */
-+	bic = bfq_bic_lookup(bfqd, current->io_context);
-+	if (bic == NULL)
-+		return 0;
-+
-+	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
-+	return bfqq == RQ_BFQQ(rq);
-+}
-+
-+static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
-+				       struct bfq_queue *bfqq)
-+{
-+	if (bfqq != NULL) {
-+		bfq_mark_bfqq_must_alloc(bfqq);
-+		bfq_mark_bfqq_budget_new(bfqq);
-+		bfq_clear_bfqq_fifo_expire(bfqq);
-+
-+		bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8;
-+
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "set_in_service_queue, cur-budget = %lu",
-+			     bfqq->entity.budget);
-+	}
-+
-+	bfqd->in_service_queue = bfqq;
-+}
-+
-+/*
-+ * Get and set a new queue for service.
-+ */
-+static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd,
-+						  struct bfq_queue *bfqq)
-+{
-+	if (!bfqq)
-+		bfqq = bfq_get_next_queue(bfqd);
-+	else
-+		bfq_get_next_queue_forced(bfqd, bfqq);
-+
-+	__bfq_set_in_service_queue(bfqd, bfqq);
-+	return bfqq;
-+}
-+
-+static inline sector_t bfq_dist_from_last(struct bfq_data *bfqd,
-+					  struct request *rq)
-+{
-+	if (blk_rq_pos(rq) >= bfqd->last_position)
-+		return blk_rq_pos(rq) - bfqd->last_position;
-+	else
-+		return bfqd->last_position - blk_rq_pos(rq);
-+}
-+
-+/*
-+ * Return true if bfqq has no request pending and rq is close enough to
-+ * bfqd->last_position, or if rq is closer to bfqd->last_position than
-+ * bfqq->next_rq
-+ */
-+static inline int bfq_rq_close(struct bfq_data *bfqd, struct request *rq)
-+{
-+	return bfq_dist_from_last(bfqd, rq) <= BFQQ_SEEK_THR;
-+}
-+
-+static struct bfq_queue *bfqq_close(struct bfq_data *bfqd)
-+{
-+	struct rb_root *root = &bfqd->rq_pos_tree;
-+	struct rb_node *parent, *node;
-+	struct bfq_queue *__bfqq;
-+	sector_t sector = bfqd->last_position;
-+
-+	if (RB_EMPTY_ROOT(root))
-+		return NULL;
-+
-+	/*
-+	 * First, if we find a request starting at the end of the last
-+	 * request, choose it.
-+	 */
-+	__bfqq = bfq_rq_pos_tree_lookup(bfqd, root, sector, &parent, NULL);
-+	if (__bfqq != NULL)
-+		return __bfqq;
-+
-+	/*
-+	 * If the exact sector wasn't found, the parent of the NULL leaf
-+	 * will contain the closest sector (rq_pos_tree sorted by
-+	 * next_request position).
-+	 */
-+	__bfqq = rb_entry(parent, struct bfq_queue, pos_node);
-+	if (bfq_rq_close(bfqd, __bfqq->next_rq))
-+		return __bfqq;
-+
-+	if (blk_rq_pos(__bfqq->next_rq) < sector)
-+		node = rb_next(&__bfqq->pos_node);
-+	else
-+		node = rb_prev(&__bfqq->pos_node);
-+	if (node == NULL)
-+		return NULL;
-+
-+	__bfqq = rb_entry(node, struct bfq_queue, pos_node);
-+	if (bfq_rq_close(bfqd, __bfqq->next_rq))
-+		return __bfqq;
-+
-+	return NULL;
-+}
-+
-+/*
-+ * bfqd - obvious
-+ * cur_bfqq - passed in so that we don't decide that the current queue
-+ *            is closely cooperating with itself.
-+ *
-+ * We are assuming that cur_bfqq has dispatched at least one request,
-+ * and that bfqd->last_position reflects a position on the disk associated
-+ * with the I/O issued by cur_bfqq.
-+ */
-+static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd,
-+					      struct bfq_queue *cur_bfqq)
-+{
-+	struct bfq_queue *bfqq;
-+
-+	if (bfq_class_idle(cur_bfqq))
-+		return NULL;
-+	if (!bfq_bfqq_sync(cur_bfqq))
-+		return NULL;
-+	if (BFQQ_SEEKY(cur_bfqq))
-+		return NULL;
-+
-+	/* If device has only one backlogged bfq_queue, don't search. */
-+	if (bfqd->busy_queues == 1)
-+		return NULL;
-+
-+	/*
-+	 * We should notice if some of the queues are cooperating, e.g.
-+	 * working closely on the same area of the disk. In that case,
-+	 * we can group them together and don't waste time idling.
-+	 */
-+	bfqq = bfqq_close(bfqd);
-+	if (bfqq == NULL || bfqq == cur_bfqq)
-+		return NULL;
-+
-+	/*
-+	 * Do not merge queues from different bfq_groups.
-+	*/
-+	if (bfqq->entity.parent != cur_bfqq->entity.parent)
-+		return NULL;
-+
-+	/*
-+	 * It only makes sense to merge sync queues.
-+	 */
-+	if (!bfq_bfqq_sync(bfqq))
-+		return NULL;
-+	if (BFQQ_SEEKY(bfqq))
-+		return NULL;
-+
-+	/*
-+	 * Do not merge queues of different priority classes.
-+	 */
-+	if (bfq_class_rt(bfqq) != bfq_class_rt(cur_bfqq))
-+		return NULL;
-+
-+	return bfqq;
-+}
-+
-+/*
-+ * If enough samples have been computed, return the current max budget
-+ * stored in bfqd, which is dynamically updated according to the
-+ * estimated disk peak rate; otherwise return the default max budget
-+ */
-+static inline unsigned long bfq_max_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < 194)
-+		return bfq_default_max_budget;
-+	else
-+		return bfqd->bfq_max_budget;
-+}
-+
-+/*
-+ * Return min budget, which is a fraction of the current or default
-+ * max budget (trying with 1/32)
-+ */
-+static inline unsigned long bfq_min_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < 194)
-+		return bfq_default_max_budget / 32;
-+	else
-+		return bfqd->bfq_max_budget / 32;
-+}
-+
-+static void bfq_arm_slice_timer(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfqd->in_service_queue;
-+	struct bfq_io_cq *bic;
-+	unsigned long sl;
-+
-+	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	/* Processes have exited, don't wait. */
-+	bic = bfqd->in_service_bic;
-+	if (bic == NULL || atomic_read(&bic->icq.ioc->active_ref) == 0)
-+		return;
-+
-+	bfq_mark_bfqq_wait_request(bfqq);
-+
-+	/*
-+	 * We don't want to idle for seeks, but we do want to allow
-+	 * fair distribution of slice time for a process doing back-to-back
-+	 * seeks. So allow a little bit of time for him to submit a new rq.
-+	 *
-+	 * To prevent processes with (partly) seeky workloads from
-+	 * being too ill-treated, grant them a small fraction of the
-+	 * assigned budget before reducing the waiting time to
-+	 * BFQ_MIN_TT. This happened to help reduce latency.
-+	 */
-+	sl = bfqd->bfq_slice_idle;
-+	/*
-+	 * Unless the queue is being weight-raised or the scenario is
-+	 * asymmetric, grant only minimum idle time if the queue either
-+	 * has been seeky for long enough or has already proved to be
-+	 * constantly seeky.
-+	 */
-+	if (bfq_sample_valid(bfqq->seek_samples) &&
-+	    ((BFQQ_SEEKY(bfqq) && bfqq->entity.service >
-+				  bfq_max_budget(bfqq->bfqd) / 8) ||
-+	      bfq_bfqq_constantly_seeky(bfqq)) && bfqq->wr_coeff == 1 &&
-+	    symmetric_scenario)
-+		sl = min(sl, msecs_to_jiffies(BFQ_MIN_TT));
-+	else if (bfqq->wr_coeff > 1)
-+		sl = sl * 3;
-+	bfqd->last_idling_start = ktime_get();
-+	mod_timer(&bfqd->idle_slice_timer, jiffies + sl);
-+	bfq_log(bfqd, "arm idle: %u/%u ms",
-+		jiffies_to_msecs(sl), jiffies_to_msecs(bfqd->bfq_slice_idle));
-+}
-+
-+/*
-+ * Set the maximum time for the in-service queue to consume its
-+ * budget. This prevents seeky processes from lowering the disk
-+ * throughput (always guaranteed with a time slice scheme as in CFQ).
-+ */
-+static void bfq_set_budget_timeout(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfqd->in_service_queue;
-+	unsigned int timeout_coeff;
-+	if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time)
-+		timeout_coeff = 1;
-+	else
-+		timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight;
-+
-+	bfqd->last_budget_start = ktime_get();
-+
-+	bfq_clear_bfqq_budget_new(bfqq);
-+	bfqq->budget_timeout = jiffies +
-+		bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * timeout_coeff;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "set budget_timeout %u",
-+		jiffies_to_msecs(bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] *
-+		timeout_coeff));
-+}
-+
-+/*
-+ * Move request from internal lists to the request queue dispatch list.
-+ */
-+static void bfq_dispatch_insert(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	/*
-+	 * For consistency, the next instruction should have been executed
-+	 * after removing the request from the queue and dispatching it.
-+	 * We execute instead this instruction before bfq_remove_request()
-+	 * (and hence introduce a temporary inconsistency), for efficiency.
-+	 * In fact, in a forced_dispatch, this prevents two counters related
-+	 * to bfqq->dispatched to risk to be uselessly decremented if bfqq
-+	 * is not in service, and then to be incremented again after
-+	 * incrementing bfqq->dispatched.
-+	 */
-+	bfqq->dispatched++;
-+	bfq_remove_request(rq);
-+	elv_dispatch_sort(q, rq);
-+
-+	if (bfq_bfqq_sync(bfqq))
-+		bfqd->sync_flight++;
-+}
-+
-+/*
-+ * Return expired entry, or NULL to just start from scratch in rbtree.
-+ */
-+static struct request *bfq_check_fifo(struct bfq_queue *bfqq)
-+{
-+	struct request *rq = NULL;
-+
-+	if (bfq_bfqq_fifo_expire(bfqq))
-+		return NULL;
-+
-+	bfq_mark_bfqq_fifo_expire(bfqq);
-+
-+	if (list_empty(&bfqq->fifo))
-+		return NULL;
-+
-+	rq = rq_entry_fifo(bfqq->fifo.next);
-+
-+	if (time_before(jiffies, rq->fifo_time))
-+		return NULL;
-+
-+	return rq;
-+}
-+
-+/* Must be called with the queue_lock held. */
-+static int bfqq_process_refs(struct bfq_queue *bfqq)
-+{
-+	int process_refs, io_refs;
-+
-+	io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE];
-+	process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st;
-+	BUG_ON(process_refs < 0);
-+	return process_refs;
-+}
-+
-+static void bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
-+{
-+	int process_refs, new_process_refs;
-+	struct bfq_queue *__bfqq;
-+
-+	/*
-+	 * If there are no process references on the new_bfqq, then it is
-+	 * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain
-+	 * may have dropped their last reference (not just their last process
-+	 * reference).
-+	 */
-+	if (!bfqq_process_refs(new_bfqq))
-+		return;
-+
-+	/* Avoid a circular list and skip interim queue merges. */
-+	while ((__bfqq = new_bfqq->new_bfqq)) {
-+		if (__bfqq == bfqq)
-+			return;
-+		new_bfqq = __bfqq;
-+	}
-+
-+	process_refs = bfqq_process_refs(bfqq);
-+	new_process_refs = bfqq_process_refs(new_bfqq);
-+	/*
-+	 * If the process for the bfqq has gone away, there is no
-+	 * sense in merging the queues.
-+	 */
-+	if (process_refs == 0 || new_process_refs == 0)
-+		return;
-+
-+	/*
-+	 * Merge in the direction of the lesser amount of work.
-+	 */
-+	if (new_process_refs >= process_refs) {
-+		bfqq->new_bfqq = new_bfqq;
-+		atomic_add(process_refs, &new_bfqq->ref);
-+	} else {
-+		new_bfqq->new_bfqq = bfqq;
-+		atomic_add(new_process_refs, &bfqq->ref);
-+	}
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d",
-+		new_bfqq->pid);
-+}
-+
-+static inline unsigned long bfq_bfqq_budget_left(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	return entity->budget - entity->service;
-+}
-+
-+static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	__bfq_bfqd_reset_in_service(bfqd);
-+
-+	/*
-+	 * If this bfqq is shared between multiple processes, check
-+	 * to make sure that those processes are still issuing I/Os
-+	 * within the mean seek distance. If not, it may be time to
-+	 * break the queues apart again.
-+	 */
-+	if (bfq_bfqq_coop(bfqq) && BFQQ_SEEKY(bfqq))
-+		bfq_mark_bfqq_split_coop(bfqq);
-+
-+	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		/*
-+		 * Overloading budget_timeout field to store the time
-+		 * at which the queue remains with no backlog; used by
-+		 * the weight-raising mechanism.
-+		 */
-+		bfqq->budget_timeout = jiffies;
-+		bfq_del_bfqq_busy(bfqd, bfqq, 1);
-+	} else {
-+		bfq_activate_bfqq(bfqd, bfqq);
-+		/*
-+		 * Resort priority tree of potential close cooperators.
-+		 */
-+		bfq_rq_pos_tree_add(bfqd, bfqq);
-+	}
-+}
-+
-+/**
-+ * __bfq_bfqq_recalc_budget - try to adapt the budget to the @bfqq behavior.
-+ * @bfqd: device data.
-+ * @bfqq: queue to update.
-+ * @reason: reason for expiration.
-+ *
-+ * Handle the feedback on @bfqq budget.  See the body for detailed
-+ * comments.
-+ */
-+static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
-+				     struct bfq_queue *bfqq,
-+				     enum bfqq_expiration reason)
-+{
-+	struct request *next_rq;
-+	unsigned long budget, min_budget;
-+
-+	budget = bfqq->max_budget;
-+	min_budget = bfq_min_budget(bfqd);
-+
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last budg %lu, budg left %lu",
-+		bfqq->entity.budget, bfq_bfqq_budget_left(bfqq));
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last max_budg %lu, min budg %lu",
-+		budget, bfq_min_budget(bfqd));
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: sync %d, seeky %d",
-+		bfq_bfqq_sync(bfqq), BFQQ_SEEKY(bfqd->in_service_queue));
-+
-+	if (bfq_bfqq_sync(bfqq)) {
-+		switch (reason) {
-+		/*
-+		 * Caveat: in all the following cases we trade latency
-+		 * for throughput.
-+		 */
-+		case BFQ_BFQQ_TOO_IDLE:
-+			/*
-+			 * This is the only case where we may reduce
-+			 * the budget: if there is no request of the
-+			 * process still waiting for completion, then
-+			 * we assume (tentatively) that the timer has
-+			 * expired because the batch of requests of
-+			 * the process could have been served with a
-+			 * smaller budget.  Hence, betting that
-+			 * process will behave in the same way when it
-+			 * becomes backlogged again, we reduce its
-+			 * next budget.  As long as we guess right,
-+			 * this budget cut reduces the latency
-+			 * experienced by the process.
-+			 *
-+			 * However, if there are still outstanding
-+			 * requests, then the process may have not yet
-+			 * issued its next request just because it is
-+			 * still waiting for the completion of some of
-+			 * the still outstanding ones.  So in this
-+			 * subcase we do not reduce its budget, on the
-+			 * contrary we increase it to possibly boost
-+			 * the throughput, as discussed in the
-+			 * comments to the BUDGET_TIMEOUT case.
-+			 */
-+			if (bfqq->dispatched > 0) /* still outstanding reqs */
-+				budget = min(budget * 2, bfqd->bfq_max_budget);
-+			else {
-+				if (budget > 5 * min_budget)
-+					budget -= 4 * min_budget;
-+				else
-+					budget = min_budget;
-+			}
-+			break;
-+		case BFQ_BFQQ_BUDGET_TIMEOUT:
-+			/*
-+			 * We double the budget here because: 1) it
-+			 * gives the chance to boost the throughput if
-+			 * this is not a seeky process (which may have
-+			 * bumped into this timeout because of, e.g.,
-+			 * ZBR), 2) together with charge_full_budget
-+			 * it helps give seeky processes higher
-+			 * timestamps, and hence be served less
-+			 * frequently.
-+			 */
-+			budget = min(budget * 2, bfqd->bfq_max_budget);
-+			break;
-+		case BFQ_BFQQ_BUDGET_EXHAUSTED:
-+			/*
-+			 * The process still has backlog, and did not
-+			 * let either the budget timeout or the disk
-+			 * idling timeout expire. Hence it is not
-+			 * seeky, has a short thinktime and may be
-+			 * happy with a higher budget too. So
-+			 * definitely increase the budget of this good
-+			 * candidate to boost the disk throughput.
-+			 */
-+			budget = min(budget * 4, bfqd->bfq_max_budget);
-+			break;
-+		case BFQ_BFQQ_NO_MORE_REQUESTS:
-+		       /*
-+			* Leave the budget unchanged.
-+			*/
-+		default:
-+			return;
-+		}
-+	} else /* async queue */
-+	    /* async queues get always the maximum possible budget
-+	     * (their ability to dispatch is limited by
-+	     * @bfqd->bfq_max_budget_async_rq).
-+	     */
-+		budget = bfqd->bfq_max_budget;
-+
-+	bfqq->max_budget = budget;
-+
-+	if (bfqd->budgets_assigned >= 194 && bfqd->bfq_user_max_budget == 0 &&
-+	    bfqq->max_budget > bfqd->bfq_max_budget)
-+		bfqq->max_budget = bfqd->bfq_max_budget;
-+
-+	/*
-+	 * Make sure that we have enough budget for the next request.
-+	 * Since the finish time of the bfqq must be kept in sync with
-+	 * the budget, be sure to call __bfq_bfqq_expire() after the
-+	 * update.
-+	 */
-+	next_rq = bfqq->next_rq;
-+	if (next_rq != NULL)
-+		bfqq->entity.budget = max_t(unsigned long, bfqq->max_budget,
-+					    bfq_serv_to_charge(next_rq, bfqq));
-+	else
-+		bfqq->entity.budget = bfqq->max_budget;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "head sect: %u, new budget %lu",
-+			next_rq != NULL ? blk_rq_sectors(next_rq) : 0,
-+			bfqq->entity.budget);
-+}
-+
-+static unsigned long bfq_calc_max_budget(u64 peak_rate, u64 timeout)
-+{
-+	unsigned long max_budget;
-+
-+	/*
-+	 * The max_budget calculated when autotuning is equal to the
-+	 * amount of sectors transfered in timeout_sync at the
-+	 * estimated peak rate.
-+	 */
-+	max_budget = (unsigned long)(peak_rate * 1000 *
-+				     timeout >> BFQ_RATE_SHIFT);
-+
-+	return max_budget;
-+}
-+
-+/*
-+ * In addition to updating the peak rate, checks whether the process
-+ * is "slow", and returns 1 if so. This slow flag is used, in addition
-+ * to the budget timeout, to reduce the amount of service provided to
-+ * seeky processes, and hence reduce their chances to lower the
-+ * throughput. See the code for more details.
-+ */
-+static int bfq_update_peak_rate(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				int compensate, enum bfqq_expiration reason)
-+{
-+	u64 bw, usecs, expected, timeout;
-+	ktime_t delta;
-+	int update = 0;
-+
-+	if (!bfq_bfqq_sync(bfqq) || bfq_bfqq_budget_new(bfqq))
-+		return 0;
-+
-+	if (compensate)
-+		delta = bfqd->last_idling_start;
-+	else
-+		delta = ktime_get();
-+	delta = ktime_sub(delta, bfqd->last_budget_start);
-+	usecs = ktime_to_us(delta);
-+
-+	/* Don't trust short/unrealistic values. */
-+	if (usecs < 100 || usecs >= LONG_MAX)
-+		return 0;
-+
-+	/*
-+	 * Calculate the bandwidth for the last slice.  We use a 64 bit
-+	 * value to store the peak rate, in sectors per usec in fixed
-+	 * point math.  We do so to have enough precision in the estimate
-+	 * and to avoid overflows.
-+	 */
-+	bw = (u64)bfqq->entity.service << BFQ_RATE_SHIFT;
-+	do_div(bw, (unsigned long)usecs);
-+
-+	timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
-+
-+	/*
-+	 * Use only long (> 20ms) intervals to filter out spikes for
-+	 * the peak rate estimation.
-+	 */
-+	if (usecs > 20000) {
-+		if (bw > bfqd->peak_rate ||
-+		   (!BFQQ_SEEKY(bfqq) &&
-+		    reason == BFQ_BFQQ_BUDGET_TIMEOUT)) {
-+			bfq_log(bfqd, "measured bw =%llu", bw);
-+			/*
-+			 * To smooth oscillations use a low-pass filter with
-+			 * alpha=7/8, i.e.,
-+			 * new_rate = (7/8) * old_rate + (1/8) * bw
-+			 */
-+			do_div(bw, 8);
-+			if (bw == 0)
-+				return 0;
-+			bfqd->peak_rate *= 7;
-+			do_div(bfqd->peak_rate, 8);
-+			bfqd->peak_rate += bw;
-+			update = 1;
-+			bfq_log(bfqd, "new peak_rate=%llu", bfqd->peak_rate);
-+		}
-+
-+		update |= bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES - 1;
-+
-+		if (bfqd->peak_rate_samples < BFQ_PEAK_RATE_SAMPLES)
-+			bfqd->peak_rate_samples++;
-+
-+		if (bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES &&
-+		    update) {
-+			int dev_type = blk_queue_nonrot(bfqd->queue);
-+			if (bfqd->bfq_user_max_budget == 0) {
-+				bfqd->bfq_max_budget =
-+					bfq_calc_max_budget(bfqd->peak_rate,
-+							    timeout);
-+				bfq_log(bfqd, "new max_budget=%lu",
-+					bfqd->bfq_max_budget);
-+			}
-+			if (bfqd->device_speed == BFQ_BFQD_FAST &&
-+			    bfqd->peak_rate < device_speed_thresh[dev_type]) {
-+				bfqd->device_speed = BFQ_BFQD_SLOW;
-+				bfqd->RT_prod = R_slow[dev_type] *
-+						T_slow[dev_type];
-+			} else if (bfqd->device_speed == BFQ_BFQD_SLOW &&
-+			    bfqd->peak_rate > device_speed_thresh[dev_type]) {
-+				bfqd->device_speed = BFQ_BFQD_FAST;
-+				bfqd->RT_prod = R_fast[dev_type] *
-+						T_fast[dev_type];
-+			}
-+		}
-+	}
-+
-+	/*
-+	 * If the process has been served for a too short time
-+	 * interval to let its possible sequential accesses prevail on
-+	 * the initial seek time needed to move the disk head on the
-+	 * first sector it requested, then give the process a chance
-+	 * and for the moment return false.
-+	 */
-+	if (bfqq->entity.budget <= bfq_max_budget(bfqd) / 8)
-+		return 0;
-+
-+	/*
-+	 * A process is considered ``slow'' (i.e., seeky, so that we
-+	 * cannot treat it fairly in the service domain, as it would
-+	 * slow down too much the other processes) if, when a slice
-+	 * ends for whatever reason, it has received service at a
-+	 * rate that would not be high enough to complete the budget
-+	 * before the budget timeout expiration.
-+	 */
-+	expected = bw * 1000 * timeout >> BFQ_RATE_SHIFT;
-+
-+	/*
-+	 * Caveat: processes doing IO in the slower disk zones will
-+	 * tend to be slow(er) even if not seeky. And the estimated
-+	 * peak rate will actually be an average over the disk
-+	 * surface. Hence, to not be too harsh with unlucky processes,
-+	 * we keep a budget/3 margin of safety before declaring a
-+	 * process slow.
-+	 */
-+	return expected > (4 * bfqq->entity.budget) / 3;
-+}
-+
-+/*
-+ * To be deemed as soft real-time, an application must meet two
-+ * requirements. First, the application must not require an average
-+ * bandwidth higher than the approximate bandwidth required to playback or
-+ * record a compressed high-definition video.
-+ * The next function is invoked on the completion of the last request of a
-+ * batch, to compute the next-start time instant, soft_rt_next_start, such
-+ * that, if the next request of the application does not arrive before
-+ * soft_rt_next_start, then the above requirement on the bandwidth is met.
-+ *
-+ * The second requirement is that the request pattern of the application is
-+ * isochronous, i.e., that, after issuing a request or a batch of requests,
-+ * the application stops issuing new requests until all its pending requests
-+ * have been completed. After that, the application may issue a new batch,
-+ * and so on.
-+ * For this reason the next function is invoked to compute
-+ * soft_rt_next_start only for applications that meet this requirement,
-+ * whereas soft_rt_next_start is set to infinity for applications that do
-+ * not.
-+ *
-+ * Unfortunately, even a greedy application may happen to behave in an
-+ * isochronous way if the CPU load is high. In fact, the application may
-+ * stop issuing requests while the CPUs are busy serving other processes,
-+ * then restart, then stop again for a while, and so on. In addition, if
-+ * the disk achieves a low enough throughput with the request pattern
-+ * issued by the application (e.g., because the request pattern is random
-+ * and/or the device is slow), then the application may meet the above
-+ * bandwidth requirement too. To prevent such a greedy application to be
-+ * deemed as soft real-time, a further rule is used in the computation of
-+ * soft_rt_next_start: soft_rt_next_start must be higher than the current
-+ * time plus the maximum time for which the arrival of a request is waited
-+ * for when a sync queue becomes idle, namely bfqd->bfq_slice_idle.
-+ * This filters out greedy applications, as the latter issue instead their
-+ * next request as soon as possible after the last one has been completed
-+ * (in contrast, when a batch of requests is completed, a soft real-time
-+ * application spends some time processing data).
-+ *
-+ * Unfortunately, the last filter may easily generate false positives if
-+ * only bfqd->bfq_slice_idle is used as a reference time interval and one
-+ * or both the following cases occur:
-+ * 1) HZ is so low that the duration of a jiffy is comparable to or higher
-+ *    than bfqd->bfq_slice_idle. This happens, e.g., on slow devices with
-+ *    HZ=100.
-+ * 2) jiffies, instead of increasing at a constant rate, may stop increasing
-+ *    for a while, then suddenly 'jump' by several units to recover the lost
-+ *    increments. This seems to happen, e.g., inside virtual machines.
-+ * To address this issue, we do not use as a reference time interval just
-+ * bfqd->bfq_slice_idle, but bfqd->bfq_slice_idle plus a few jiffies. In
-+ * particular we add the minimum number of jiffies for which the filter
-+ * seems to be quite precise also in embedded systems and KVM/QEMU virtual
-+ * machines.
-+ */
-+static inline unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd,
-+						       struct bfq_queue *bfqq)
-+{
-+	return max(bfqq->last_idle_bklogged +
-+		   HZ * bfqq->service_from_backlogged /
-+		   bfqd->bfq_wr_max_softrt_rate,
-+		   jiffies + bfqq->bfqd->bfq_slice_idle + 4);
-+}
-+
-+/*
-+ * Return the largest-possible time instant such that, for as long as possible,
-+ * the current time will be lower than this time instant according to the macro
-+ * time_is_before_jiffies().
-+ */
-+static inline unsigned long bfq_infinity_from_now(unsigned long now)
-+{
-+	return now + ULONG_MAX / 2;
-+}
-+
-+/**
-+ * bfq_bfqq_expire - expire a queue.
-+ * @bfqd: device owning the queue.
-+ * @bfqq: the queue to expire.
-+ * @compensate: if true, compensate for the time spent idling.
-+ * @reason: the reason causing the expiration.
-+ *
-+ *
-+ * If the process associated to the queue is slow (i.e., seeky), or in
-+ * case of budget timeout, or, finally, if it is async, we
-+ * artificially charge it an entire budget (independently of the
-+ * actual service it received). As a consequence, the queue will get
-+ * higher timestamps than the correct ones upon reactivation, and
-+ * hence it will be rescheduled as if it had received more service
-+ * than what it actually received. In the end, this class of processes
-+ * will receive less service in proportion to how slowly they consume
-+ * their budgets (and hence how seriously they tend to lower the
-+ * throughput).
-+ *
-+ * In contrast, when a queue expires because it has been idling for
-+ * too much or because it exhausted its budget, we do not touch the
-+ * amount of service it has received. Hence when the queue will be
-+ * reactivated and its timestamps updated, the latter will be in sync
-+ * with the actual service received by the queue until expiration.
-+ *
-+ * Charging a full budget to the first type of queues and the exact
-+ * service to the others has the effect of using the WF2Q+ policy to
-+ * schedule the former on a timeslice basis, without violating the
-+ * service domain guarantees of the latter.
-+ */
-+static void bfq_bfqq_expire(struct bfq_data *bfqd,
-+			    struct bfq_queue *bfqq,
-+			    int compensate,
-+			    enum bfqq_expiration reason)
-+{
-+	int slow;
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	/* Update disk peak rate for autotuning and check whether the
-+	 * process is slow (see bfq_update_peak_rate).
-+	 */
-+	slow = bfq_update_peak_rate(bfqd, bfqq, compensate, reason);
-+
-+	/*
-+	 * As above explained, 'punish' slow (i.e., seeky), timed-out
-+	 * and async queues, to favor sequential sync workloads.
-+	 *
-+	 * Processes doing I/O in the slower disk zones will tend to be
-+	 * slow(er) even if not seeky. Hence, since the estimated peak
-+	 * rate is actually an average over the disk surface, these
-+	 * processes may timeout just for bad luck. To avoid punishing
-+	 * them we do not charge a full budget to a process that
-+	 * succeeded in consuming at least 2/3 of its budget.
-+	 */
-+	if (slow || (reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
-+		     bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3))
-+		bfq_bfqq_charge_full_budget(bfqq);
-+
-+	bfqq->service_from_backlogged += bfqq->entity.service;
-+
-+	if (BFQQ_SEEKY(bfqq) && reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
-+	    !bfq_bfqq_constantly_seeky(bfqq)) {
-+		bfq_mark_bfqq_constantly_seeky(bfqq);
-+		if (!blk_queue_nonrot(bfqd->queue))
-+			bfqd->const_seeky_busy_in_flight_queues++;
-+	}
-+
-+	if (reason == BFQ_BFQQ_TOO_IDLE &&
-+	    bfqq->entity.service <= 2 * bfqq->entity.budget / 10 )
-+		bfq_clear_bfqq_IO_bound(bfqq);
-+
-+	if (bfqd->low_latency && bfqq->wr_coeff == 1)
-+		bfqq->last_wr_start_finish = jiffies;
-+
-+	if (bfqd->low_latency && bfqd->bfq_wr_max_softrt_rate > 0 &&
-+	    RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		/*
-+		 * If we get here, and there are no outstanding requests,
-+		 * then the request pattern is isochronous (see the comments
-+		 * to the function bfq_bfqq_softrt_next_start()). Hence we
-+		 * can compute soft_rt_next_start. If, instead, the queue
-+		 * still has outstanding requests, then we have to wait
-+		 * for the completion of all the outstanding requests to
-+		 * discover whether the request pattern is actually
-+		 * isochronous.
-+		 */
-+		if (bfqq->dispatched == 0)
-+			bfqq->soft_rt_next_start =
-+				bfq_bfqq_softrt_next_start(bfqd, bfqq);
-+		else {
-+			/*
-+			 * The application is still waiting for the
-+			 * completion of one or more requests:
-+			 * prevent it from possibly being incorrectly
-+			 * deemed as soft real-time by setting its
-+			 * soft_rt_next_start to infinity. In fact,
-+			 * without this assignment, the application
-+			 * would be incorrectly deemed as soft
-+			 * real-time if:
-+			 * 1) it issued a new request before the
-+			 *    completion of all its in-flight
-+			 *    requests, and
-+			 * 2) at that time, its soft_rt_next_start
-+			 *    happened to be in the past.
-+			 */
-+			bfqq->soft_rt_next_start =
-+				bfq_infinity_from_now(jiffies);
-+			/*
-+			 * Schedule an update of soft_rt_next_start to when
-+			 * the task may be discovered to be isochronous.
-+			 */
-+			bfq_mark_bfqq_softrt_update(bfqq);
-+		}
-+	}
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		"expire (%d, slow %d, num_disp %d, idle_win %d)", reason,
-+		slow, bfqq->dispatched, bfq_bfqq_idle_window(bfqq));
-+
-+	/*
-+	 * Increase, decrease or leave budget unchanged according to
-+	 * reason.
-+	 */
-+	__bfq_bfqq_recalc_budget(bfqd, bfqq, reason);
-+	__bfq_bfqq_expire(bfqd, bfqq);
-+}
-+
-+/*
-+ * Budget timeout is not implemented through a dedicated timer, but
-+ * just checked on request arrivals and completions, as well as on
-+ * idle timer expirations.
-+ */
-+static int bfq_bfqq_budget_timeout(struct bfq_queue *bfqq)
-+{
-+	if (bfq_bfqq_budget_new(bfqq) ||
-+	    time_before(jiffies, bfqq->budget_timeout))
-+		return 0;
-+	return 1;
-+}
-+
-+/*
-+ * If we expire a queue that is waiting for the arrival of a new
-+ * request, we may prevent the fictitious timestamp back-shifting that
-+ * allows the guarantees of the queue to be preserved (see [1] for
-+ * this tricky aspect). Hence we return true only if this condition
-+ * does not hold, or if the queue is slow enough to deserve only to be
-+ * kicked off for preserving a high throughput.
-+*/
-+static inline int bfq_may_expire_for_budg_timeout(struct bfq_queue *bfqq)
-+{
-+	bfq_log_bfqq(bfqq->bfqd, bfqq,
-+		"may_budget_timeout: wait_request %d left %d timeout %d",
-+		bfq_bfqq_wait_request(bfqq),
-+			bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3,
-+		bfq_bfqq_budget_timeout(bfqq));
-+
-+	return (!bfq_bfqq_wait_request(bfqq) ||
-+		bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3)
-+		&&
-+		bfq_bfqq_budget_timeout(bfqq);
-+}
-+
-+/*
-+ * Device idling is allowed only for the queues for which this function
-+ * returns true. For this reason, the return value of this function plays a
-+ * critical role for both throughput boosting and service guarantees. The
-+ * return value is computed through a logical expression. In this rather
-+ * long comment, we try to briefly describe all the details and motivations
-+ * behind the components of this logical expression.
-+ *
-+ * First, the expression is false if bfqq is not sync, or if: bfqq happened
-+ * to become active during a large burst of queue activations, and the
-+ * pattern of requests bfqq contains boosts the throughput if bfqq is
-+ * expired. In fact, queues that became active during a large burst benefit
-+ * only from throughput, as discussed in the comments to bfq_handle_burst.
-+ * In this respect, expiring bfqq certainly boosts the throughput on NCQ-
-+ * capable flash-based devices, whereas, on rotational devices, it boosts
-+ * the throughput only if bfqq contains random requests.
-+ *
-+ * On the opposite end, if (a) bfqq is sync, (b) the above burst-related
-+ * condition does not hold, and (c) bfqq is being weight-raised, then the
-+ * expression always evaluates to true, as device idling is instrumental
-+ * for preserving low-latency guarantees (see [1]). If, instead, conditions
-+ * (a) and (b) do hold, but (c) does not, then the expression evaluates to
-+ * true only if: (1) bfqq is I/O-bound and has a non-null idle window, and
-+ * (2) at least one of the following two conditions holds.
-+ * The first condition is that the device is not performing NCQ, because
-+ * idling the device most certainly boosts the throughput if this condition
-+ * holds and bfqq is I/O-bound and has been granted a non-null idle window.
-+ * The second compound condition is made of the logical AND of two components.
-+ *
-+ * The first component is true only if there is no weight-raised busy
-+ * queue. This guarantees that the device is not idled for a sync non-
-+ * weight-raised queue when there are busy weight-raised queues. The former
-+ * is then expired immediately if empty. Combined with the timestamping
-+ * rules of BFQ (see [1] for details), this causes sync non-weight-raised
-+ * queues to get a lower number of requests served, and hence to ask for a
-+ * lower number of requests from the request pool, before the busy weight-
-+ * raised queues get served again.
-+ *
-+ * This is beneficial for the processes associated with weight-raised
-+ * queues, when the request pool is saturated (e.g., in the presence of
-+ * write hogs). In fact, if the processes associated with the other queues
-+ * ask for requests at a lower rate, then weight-raised processes have a
-+ * higher probability to get a request from the pool immediately (or at
-+ * least soon) when they need one. Hence they have a higher probability to
-+ * actually get a fraction of the disk throughput proportional to their
-+ * high weight. This is especially true with NCQ-capable drives, which
-+ * enqueue several requests in advance and further reorder internally-
-+ * queued requests.
-+ *
-+ * In the end, mistreating non-weight-raised queues when there are busy
-+ * weight-raised queues seems to mitigate starvation problems in the
-+ * presence of heavy write workloads and NCQ, and hence to guarantee a
-+ * higher application and system responsiveness in these hostile scenarios.
-+ *
-+ * If the first component of the compound condition is instead true, i.e.,
-+ * there is no weight-raised busy queue, then the second component of the
-+ * compound condition takes into account service-guarantee and throughput
-+ * issues related to NCQ (recall that the compound condition is evaluated
-+ * only if the device is detected as supporting NCQ).
-+ *
-+ * As for service guarantees, allowing the drive to enqueue more than one
-+ * request at a time, and hence delegating de facto final scheduling
-+ * decisions to the drive's internal scheduler, causes loss of control on
-+ * the actual request service order. In this respect, when the drive is
-+ * allowed to enqueue more than one request at a time, the service
-+ * distribution enforced by the drive's internal scheduler is likely to
-+ * coincide with the desired device-throughput distribution only in the
-+ * following, perfectly symmetric, scenario:
-+ * 1) all active queues have the same weight,
-+ * 2) all active groups at the same level in the groups tree have the same
-+ *    weight,
-+ * 3) all active groups at the same level in the groups tree have the same
-+ *    number of children.
-+ *
-+ * Even in such a scenario, sequential I/O may still receive a preferential
-+ * treatment, but this is not likely to be a big issue with flash-based
-+ * devices, because of their non-dramatic loss of throughput with random
-+ * I/O. Things do differ with HDDs, for which additional care is taken, as
-+ * explained after completing the discussion for flash-based devices.
-+ *
-+ * Unfortunately, keeping the necessary state for evaluating exactly the
-+ * above symmetry conditions would be quite complex and time-consuming.
-+ * Therefore BFQ evaluates instead the following stronger sub-conditions,
-+ * for which it is much easier to maintain the needed state:
-+ * 1) all active queues have the same weight,
-+ * 2) all active groups have the same weight,
-+ * 3) all active groups have at most one active child each.
-+ * In particular, the last two conditions are always true if hierarchical
-+ * support and the cgroups interface are not enabled, hence no state needs
-+ * to be maintained in this case.
-+ *
-+ * According to the above considerations, the second component of the
-+ * compound condition evaluates to true if any of the above symmetry
-+ * sub-condition does not hold, or the device is not flash-based. Therefore,
-+ * if also the first component is true, then idling is allowed for a sync
-+ * queue. These are the only sub-conditions considered if the device is
-+ * flash-based, as, for such a device, it is sensible to force idling only
-+ * for service-guarantee issues. In fact, as for throughput, idling
-+ * NCQ-capable flash-based devices would not boost the throughput even
-+ * with sequential I/O; rather it would lower the throughput in proportion
-+ * to how fast the device is. In the end, (only) if all the three
-+ * sub-conditions hold and the device is flash-based, the compound
-+ * condition evaluates to false and therefore no idling is performed.
-+ *
-+ * As already said, things change with a rotational device, where idling
-+ * boosts the throughput with sequential I/O (even with NCQ). Hence, for
-+ * such a device the second component of the compound condition evaluates
-+ * to true also if the following additional sub-condition does not hold:
-+ * the queue is constantly seeky. Unfortunately, this different behavior
-+ * with respect to flash-based devices causes an additional asymmetry: if
-+ * some sync queues enjoy idling and some other sync queues do not, then
-+ * the latter get a low share of the device throughput, simply because the
-+ * former get many requests served after being set as in service, whereas
-+ * the latter do not. As a consequence, to guarantee the desired throughput
-+ * distribution, on HDDs the compound expression evaluates to true (and
-+ * hence device idling is performed) also if the following last symmetry
-+ * condition does not hold: no other queue is benefiting from idling. Also
-+ * this last condition is actually replaced with a simpler-to-maintain and
-+ * stronger condition: there is no busy queue which is not constantly seeky
-+ * (and hence may also benefit from idling).
-+ *
-+ * To sum up, when all the required symmetry and throughput-boosting
-+ * sub-conditions hold, the second component of the compound condition
-+ * evaluates to false, and hence no idling is performed. This helps to
-+ * keep the drives' internal queues full on NCQ-capable devices, and hence
-+ * to boost the throughput, without causing 'almost' any loss of service
-+ * guarantees. The 'almost' follows from the fact that, if the internal
-+ * queue of one such device is filled while all the sub-conditions hold,
-+ * but at some point in time some sub-condition stops to hold, then it may
-+ * become impossible to let requests be served in the new desired order
-+ * until all the requests already queued in the device have been served.
-+ */
-+static inline bool bfq_bfqq_must_not_expire(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+#define cond_for_seeky_on_ncq_hdd (bfq_bfqq_constantly_seeky(bfqq) && \
-+				   bfqd->busy_in_flight_queues == \
-+				   bfqd->const_seeky_busy_in_flight_queues)
-+
-+#define cond_for_expiring_in_burst	(bfq_bfqq_in_large_burst(bfqq) && \
-+					 bfqd->hw_tag && \
-+					 (blk_queue_nonrot(bfqd->queue) || \
-+					  bfq_bfqq_constantly_seeky(bfqq)))
-+
-+/*
-+ * Condition for expiring a non-weight-raised queue (and hence not idling
-+ * the device).
-+ */
-+#define cond_for_expiring_non_wr  (bfqd->hw_tag && \
-+				   (bfqd->wr_busy_queues > 0 || \
-+				    (blk_queue_nonrot(bfqd->queue) || \
-+				      cond_for_seeky_on_ncq_hdd)))
-+
-+	return bfq_bfqq_sync(bfqq) &&
-+		!cond_for_expiring_in_burst &&
-+		(bfqq->wr_coeff > 1 || !symmetric_scenario ||
-+		 (bfq_bfqq_IO_bound(bfqq) && bfq_bfqq_idle_window(bfqq) &&
-+		  !cond_for_expiring_non_wr)
-+	);
-+}
-+
-+/*
-+ * If the in-service queue is empty but sync, and the function
-+ * bfq_bfqq_must_not_expire returns true, then:
-+ * 1) the queue must remain in service and cannot be expired, and
-+ * 2) the disk must be idled to wait for the possible arrival of a new
-+ *    request for the queue.
-+ * See the comments to the function bfq_bfqq_must_not_expire for the reasons
-+ * why performing device idling is the best choice to boost the throughput
-+ * and preserve service guarantees when bfq_bfqq_must_not_expire itself
-+ * returns true.
-+ */
-+static inline bool bfq_bfqq_must_idle(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+
-+	return RB_EMPTY_ROOT(&bfqq->sort_list) && bfqd->bfq_slice_idle != 0 &&
-+	       bfq_bfqq_must_not_expire(bfqq);
-+}
-+
-+/*
-+ * Select a queue for service.  If we have a current queue in service,
-+ * check whether to continue servicing it, or retrieve and set a new one.
-+ */
-+static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq, *new_bfqq = NULL;
-+	struct request *next_rq;
-+	enum bfqq_expiration reason = BFQ_BFQQ_BUDGET_TIMEOUT;
-+
-+	bfqq = bfqd->in_service_queue;
-+	if (bfqq == NULL)
-+		goto new_queue;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue");
-+
-+	/*
-+         * If another queue has a request waiting within our mean seek
-+         * distance, let it run. The expire code will check for close
-+         * cooperators and put the close queue at the front of the
-+         * service tree. If possible, merge the expiring queue with the
-+         * new bfqq.
-+         */
-+        new_bfqq = bfq_close_cooperator(bfqd, bfqq);
-+        if (new_bfqq != NULL && bfqq->new_bfqq == NULL)
-+                bfq_setup_merge(bfqq, new_bfqq);
-+
-+	if (bfq_may_expire_for_budg_timeout(bfqq) &&
-+	    !timer_pending(&bfqd->idle_slice_timer) &&
-+	    !bfq_bfqq_must_idle(bfqq))
-+		goto expire;
-+
-+	next_rq = bfqq->next_rq;
-+	/*
-+	 * If bfqq has requests queued and it has enough budget left to
-+	 * serve them, keep the queue, otherwise expire it.
-+	 */
-+	if (next_rq != NULL) {
-+		if (bfq_serv_to_charge(next_rq, bfqq) >
-+			bfq_bfqq_budget_left(bfqq)) {
-+			reason = BFQ_BFQQ_BUDGET_EXHAUSTED;
-+			goto expire;
-+		} else {
-+			/*
-+			 * The idle timer may be pending because we may
-+			 * not disable disk idling even when a new request
-+			 * arrives.
-+			 */
-+			if (timer_pending(&bfqd->idle_slice_timer)) {
-+				/*
-+				 * If we get here: 1) at least a new request
-+				 * has arrived but we have not disabled the
-+				 * timer because the request was too small,
-+				 * 2) then the block layer has unplugged
-+				 * the device, causing the dispatch to be
-+				 * invoked.
-+				 *
-+				 * Since the device is unplugged, now the
-+				 * requests are probably large enough to
-+				 * provide a reasonable throughput.
-+				 * So we disable idling.
-+				 */
-+				bfq_clear_bfqq_wait_request(bfqq);
-+				del_timer(&bfqd->idle_slice_timer);
-+			}
-+			if (new_bfqq == NULL)
-+				goto keep_queue;
-+			else
-+				goto expire;
-+		}
-+	}
-+
-+	/*
-+	 * No requests pending. However, if the in-service queue is idling
-+	 * for a new request, or has requests waiting for a completion and
-+	 * may idle after their completion, then keep it anyway.
-+	 */
-+	if (new_bfqq == NULL && (timer_pending(&bfqd->idle_slice_timer) ||
-+	    (bfqq->dispatched != 0 && bfq_bfqq_must_not_expire(bfqq)))) {
-+		bfqq = NULL;
-+		goto keep_queue;
-+	} else if (new_bfqq != NULL && timer_pending(&bfqd->idle_slice_timer)) {
-+		/*
-+		 * Expiring the queue because there is a close cooperator,
-+		 * cancel timer.
-+		 */
-+		bfq_clear_bfqq_wait_request(bfqq);
-+		del_timer(&bfqd->idle_slice_timer);
-+	}
-+
-+	reason = BFQ_BFQQ_NO_MORE_REQUESTS;
-+expire:
-+	bfq_bfqq_expire(bfqd, bfqq, 0, reason);
-+new_queue:
-+	bfqq = bfq_set_in_service_queue(bfqd, new_bfqq);
-+	bfq_log(bfqd, "select_queue: new queue %d returned",
-+		bfqq != NULL ? bfqq->pid : 0);
-+keep_queue:
-+	return bfqq;
-+}
-+
-+static void bfq_update_wr_data(struct bfq_data *bfqd,
-+			       struct bfq_queue *bfqq)
-+{
-+	if (bfqq->wr_coeff > 1) { /* queue is being boosted */
-+		struct bfq_entity *entity = &bfqq->entity;
-+
-+		bfq_log_bfqq(bfqd, bfqq,
-+			"raising period dur %u/%u msec, old coeff %u, w %d(%d)",
-+			jiffies_to_msecs(jiffies -
-+				bfqq->last_wr_start_finish),
-+			jiffies_to_msecs(bfqq->wr_cur_max_time),
-+			bfqq->wr_coeff,
-+			bfqq->entity.weight, bfqq->entity.orig_weight);
-+
-+		BUG_ON(bfqq != bfqd->in_service_queue && entity->weight !=
-+		       entity->orig_weight * bfqq->wr_coeff);
-+		if (entity->ioprio_changed)
-+			bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change");
-+		/*
-+		 * If the queue was activated in a burst, or
-+		 * too much time has elapsed from the beginning
-+		 * of this weight-raising, then end weight raising.
-+		 */
-+		if (bfq_bfqq_in_large_burst(bfqq) ||
-+		    time_is_before_jiffies(bfqq->last_wr_start_finish +
-+					   bfqq->wr_cur_max_time)) {
-+			bfqq->last_wr_start_finish = jiffies;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "wrais ending at %lu, rais_max_time %u",
-+				     bfqq->last_wr_start_finish,
-+				     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+			bfq_bfqq_end_wr(bfqq);
-+			__bfq_entity_update_weight_prio(
-+				bfq_entity_service_tree(entity),
-+				entity);
-+		}
-+	}
-+}
-+
-+/*
-+ * Dispatch one request from bfqq, moving it to the request queue
-+ * dispatch list.
-+ */
-+static int bfq_dispatch_request(struct bfq_data *bfqd,
-+				struct bfq_queue *bfqq)
-+{
-+	int dispatched = 0;
-+	struct request *rq;
-+	unsigned long service_to_charge;
-+
-+	BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	/* Follow expired path, else get first next available. */
-+	rq = bfq_check_fifo(bfqq);
-+	if (rq == NULL)
-+		rq = bfqq->next_rq;
-+	service_to_charge = bfq_serv_to_charge(rq, bfqq);
-+
-+	if (service_to_charge > bfq_bfqq_budget_left(bfqq)) {
-+		/*
-+		 * This may happen if the next rq is chosen in fifo order
-+		 * instead of sector order. The budget is properly
-+		 * dimensioned to be always sufficient to serve the next
-+		 * request only if it is chosen in sector order. The reason
-+		 * is that it would be quite inefficient and little useful
-+		 * to always make sure that the budget is large enough to
-+		 * serve even the possible next rq in fifo order.
-+		 * In fact, requests are seldom served in fifo order.
-+		 *
-+		 * Expire the queue for budget exhaustion, and make sure
-+		 * that the next act_budget is enough to serve the next
-+		 * request, even if it comes from the fifo expired path.
-+		 */
-+		bfqq->next_rq = rq;
-+		/*
-+		 * Since this dispatch is failed, make sure that
-+		 * a new one will be performed
-+		 */
-+		if (!bfqd->rq_in_driver)
-+			bfq_schedule_dispatch(bfqd);
-+		goto expire;
-+	}
-+
-+	/* Finally, insert request into driver dispatch list. */
-+	bfq_bfqq_served(bfqq, service_to_charge);
-+	bfq_dispatch_insert(bfqd->queue, rq);
-+
-+	bfq_update_wr_data(bfqd, bfqq);
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+			"dispatched %u sec req (%llu), budg left %lu",
-+			blk_rq_sectors(rq),
-+			(long long unsigned)blk_rq_pos(rq),
-+			bfq_bfqq_budget_left(bfqq));
-+
-+	dispatched++;
-+
-+	if (bfqd->in_service_bic == NULL) {
-+		atomic_long_inc(&RQ_BIC(rq)->icq.ioc->refcount);
-+		bfqd->in_service_bic = RQ_BIC(rq);
-+	}
-+
-+	if (bfqd->busy_queues > 1 && ((!bfq_bfqq_sync(bfqq) &&
-+	    dispatched >= bfqd->bfq_max_budget_async_rq) ||
-+	    bfq_class_idle(bfqq)))
-+		goto expire;
-+
-+	return dispatched;
-+
-+expire:
-+	bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_EXHAUSTED);
-+	return dispatched;
-+}
-+
-+static int __bfq_forced_dispatch_bfqq(struct bfq_queue *bfqq)
-+{
-+	int dispatched = 0;
-+
-+	while (bfqq->next_rq != NULL) {
-+		bfq_dispatch_insert(bfqq->bfqd->queue, bfqq->next_rq);
-+		dispatched++;
-+	}
-+
-+	BUG_ON(!list_empty(&bfqq->fifo));
-+	return dispatched;
-+}
-+
-+/*
-+ * Drain our current requests.
-+ * Used for barriers and when switching io schedulers on-the-fly.
-+ */
-+static int bfq_forced_dispatch(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq, *n;
-+	struct bfq_service_tree *st;
-+	int dispatched = 0;
-+
-+	bfqq = bfqd->in_service_queue;
-+	if (bfqq != NULL)
-+		__bfq_bfqq_expire(bfqd, bfqq);
-+
-+	/*
-+	 * Loop through classes, and be careful to leave the scheduler
-+	 * in a consistent state, as feedback mechanisms and vtime
-+	 * updates cannot be disabled during the process.
-+	 */
-+	list_for_each_entry_safe(bfqq, n, &bfqd->active_list, bfqq_list) {
-+		st = bfq_entity_service_tree(&bfqq->entity);
-+
-+		dispatched += __bfq_forced_dispatch_bfqq(bfqq);
-+		bfqq->max_budget = bfq_max_budget(bfqd);
-+
-+		bfq_forget_idle(st);
-+	}
-+
-+	BUG_ON(bfqd->busy_queues != 0);
-+
-+	return dispatched;
-+}
-+
-+static int bfq_dispatch_requests(struct request_queue *q, int force)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq;
-+	int max_dispatch;
-+
-+	bfq_log(bfqd, "dispatch requests: %d busy queues", bfqd->busy_queues);
-+	if (bfqd->busy_queues == 0)
-+		return 0;
-+
-+	if (unlikely(force))
-+		return bfq_forced_dispatch(bfqd);
-+
-+	bfqq = bfq_select_queue(bfqd);
-+	if (bfqq == NULL)
-+		return 0;
-+
-+	if (bfq_class_idle(bfqq))
-+		max_dispatch = 1;
-+
-+	if (!bfq_bfqq_sync(bfqq))
-+		max_dispatch = bfqd->bfq_max_budget_async_rq;
-+
-+	if (!bfq_bfqq_sync(bfqq) && bfqq->dispatched >= max_dispatch) {
-+		if (bfqd->busy_queues > 1)
-+			return 0;
-+		if (bfqq->dispatched >= 4 * max_dispatch)
-+			return 0;
-+	}
-+
-+	if (bfqd->sync_flight != 0 && !bfq_bfqq_sync(bfqq))
-+		return 0;
-+
-+	bfq_clear_bfqq_wait_request(bfqq);
-+	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+
-+	if (!bfq_dispatch_request(bfqd, bfqq))
-+		return 0;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "dispatched %s request",
-+			bfq_bfqq_sync(bfqq) ? "sync" : "async");
-+
-+	return 1;
-+}
-+
-+/*
-+ * Task holds one reference to the queue, dropped when task exits.  Each rq
-+ * in-flight on this queue also holds a reference, dropped when rq is freed.
-+ *
-+ * Queue lock must be held here.
-+ */
-+static void bfq_put_queue(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+
-+	BUG_ON(atomic_read(&bfqq->ref) <= 0);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+	if (!atomic_dec_and_test(&bfqq->ref))
-+		return;
-+
-+	BUG_ON(rb_first(&bfqq->sort_list) != NULL);
-+	BUG_ON(bfqq->allocated[READ] + bfqq->allocated[WRITE] != 0);
-+	BUG_ON(bfqq->entity.tree != NULL);
-+	BUG_ON(bfq_bfqq_busy(bfqq));
-+	BUG_ON(bfqd->in_service_queue == bfqq);
-+
-+	if (bfq_bfqq_sync(bfqq))
-+		/*
-+		 * The fact that this queue is being destroyed does not
-+		 * invalidate the fact that this queue may have been
-+		 * activated during the current burst. As a consequence,
-+		 * although the queue does not exist anymore, and hence
-+		 * needs to be removed from the burst list if there,
-+		 * the burst size has not to be decremented.
-+		 */
-+		hlist_del_init(&bfqq->burst_list_node);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p freed", bfqq);
-+
-+	kmem_cache_free(bfq_pool, bfqq);
-+}
-+
-+static void bfq_put_cooperator(struct bfq_queue *bfqq)
-+{
-+	struct bfq_queue *__bfqq, *next;
-+
-+	/*
-+	 * If this queue was scheduled to merge with another queue, be
-+	 * sure to drop the reference taken on that queue (and others in
-+	 * the merge chain). See bfq_setup_merge and bfq_merge_bfqqs.
-+	 */
-+	__bfqq = bfqq->new_bfqq;
-+	while (__bfqq) {
-+		if (__bfqq == bfqq)
-+			break;
-+		next = __bfqq->new_bfqq;
-+		bfq_put_queue(__bfqq);
-+		__bfqq = next;
-+	}
-+}
-+
-+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	if (bfqq == bfqd->in_service_queue) {
-+		__bfq_bfqq_expire(bfqd, bfqq);
-+		bfq_schedule_dispatch(bfqd);
-+	}
-+
-+	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+
-+	bfq_put_cooperator(bfqq);
-+
-+	bfq_put_queue(bfqq);
-+}
-+
-+static inline void bfq_init_icq(struct io_cq *icq)
-+{
-+	struct bfq_io_cq *bic = icq_to_bic(icq);
-+
-+	bic->ttime.last_end_request = jiffies;
-+}
-+
-+static void bfq_exit_icq(struct io_cq *icq)
-+{
-+	struct bfq_io_cq *bic = icq_to_bic(icq);
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+
-+	if (bic->bfqq[BLK_RW_ASYNC]) {
-+		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_ASYNC]);
-+		bic->bfqq[BLK_RW_ASYNC] = NULL;
-+	}
-+
-+	if (bic->bfqq[BLK_RW_SYNC]) {
-+		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]);
-+		bic->bfqq[BLK_RW_SYNC] = NULL;
-+	}
-+}
-+
-+/*
-+ * Update the entity prio values; note that the new values will not
-+ * be used until the next (re)activation.
-+ */
-+static void bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
-+{
-+	struct task_struct *tsk = current;
-+	int ioprio_class;
-+
-+	ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);
-+	switch (ioprio_class) {
-+	default:
-+		dev_err(bfqq->bfqd->queue->backing_dev_info.dev,
-+			"bfq: bad prio class %d\n", ioprio_class);
-+	case IOPRIO_CLASS_NONE:
-+		/*
-+		 * No prio set, inherit CPU scheduling settings.
-+		 */
-+		bfqq->entity.new_ioprio = task_nice_ioprio(tsk);
-+		bfqq->entity.new_ioprio_class = task_nice_ioclass(tsk);
-+		break;
-+	case IOPRIO_CLASS_RT:
-+		bfqq->entity.new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+		bfqq->entity.new_ioprio_class = IOPRIO_CLASS_RT;
-+		break;
-+	case IOPRIO_CLASS_BE:
-+		bfqq->entity.new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+		bfqq->entity.new_ioprio_class = IOPRIO_CLASS_BE;
-+		break;
-+	case IOPRIO_CLASS_IDLE:
-+		bfqq->entity.new_ioprio_class = IOPRIO_CLASS_IDLE;
-+		bfqq->entity.new_ioprio = 7;
-+		bfq_clear_bfqq_idle_window(bfqq);
-+		break;
-+	}
-+
-+	if (bfqq->entity.new_ioprio < 0 ||
-+	    bfqq->entity.new_ioprio >= IOPRIO_BE_NR) {
-+		printk(KERN_CRIT "bfq_set_next_ioprio_data: new_ioprio %d\n",
-+				 bfqq->entity.new_ioprio);
-+		BUG();
-+	}
-+
-+	bfqq->entity.new_weight = bfq_ioprio_to_weight(bfqq->entity.new_ioprio);
-+	bfqq->entity.ioprio_changed = 1;
-+}
-+
-+static void bfq_check_ioprio_change(struct bfq_io_cq *bic)
-+{
-+	struct bfq_data *bfqd;
-+	struct bfq_queue *bfqq, *new_bfqq;
-+	struct bfq_group *bfqg;
-+	unsigned long uninitialized_var(flags);
-+	int ioprio = bic->icq.ioc->ioprio;
-+
-+	bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data),
-+				   &flags);
-+	/*
-+	 * This condition may trigger on a newly created bic, be sure to
-+	 * drop the lock before returning.
-+	 */
-+	if (unlikely(bfqd == NULL) || likely(bic->ioprio == ioprio))
-+		goto out;
-+
-+	bic->ioprio = ioprio;
-+
-+	bfqq = bic->bfqq[BLK_RW_ASYNC];
-+	if (bfqq != NULL) {
-+		bfqg = container_of(bfqq->entity.sched_data, struct bfq_group,
-+				    sched_data);
-+		new_bfqq = bfq_get_queue(bfqd, bfqg, BLK_RW_ASYNC, bic,
-+					 GFP_ATOMIC);
-+		if (new_bfqq != NULL) {
-+			bic->bfqq[BLK_RW_ASYNC] = new_bfqq;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "check_ioprio_change: bfqq %p %d",
-+				     bfqq, atomic_read(&bfqq->ref));
-+			bfq_put_queue(bfqq);
-+		}
-+	}
-+
-+	bfqq = bic->bfqq[BLK_RW_SYNC];
-+	if (bfqq != NULL)
-+		bfq_set_next_ioprio_data(bfqq, bic);
-+
-+out:
-+	bfq_put_bfqd_unlock(bfqd, &flags);
-+}
-+
-+static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			  struct bfq_io_cq *bic, pid_t pid, int is_sync)
-+{
-+	RB_CLEAR_NODE(&bfqq->entity.rb_node);
-+	INIT_LIST_HEAD(&bfqq->fifo);
-+	INIT_HLIST_NODE(&bfqq->burst_list_node);
-+
-+	atomic_set(&bfqq->ref, 0);
-+	bfqq->bfqd = bfqd;
-+
-+	if (bic)
-+		bfq_set_next_ioprio_data(bfqq, bic);
-+
-+	if (is_sync) {
-+		if (!bfq_class_idle(bfqq))
-+			bfq_mark_bfqq_idle_window(bfqq);
-+		bfq_mark_bfqq_sync(bfqq);
-+	}
-+	bfq_mark_bfqq_IO_bound(bfqq);
-+
-+	/* Tentative initial value to trade off between thr and lat */
-+	bfqq->max_budget = (2 * bfq_max_budget(bfqd)) / 3;
-+	bfqq->pid = pid;
-+
-+	bfqq->wr_coeff = 1;
-+	bfqq->last_wr_start_finish = 0;
-+	/*
-+	 * Set to the value for which bfqq will not be deemed as
-+	 * soft rt when it becomes backlogged.
-+	 */
-+	bfqq->soft_rt_next_start = bfq_infinity_from_now(jiffies);
-+}
-+
-+static struct bfq_queue *bfq_find_alloc_queue(struct bfq_data *bfqd,
-+					      struct bfq_group *bfqg,
-+					      int is_sync,
-+					      struct bfq_io_cq *bic,
-+					      gfp_t gfp_mask)
-+{
-+	struct bfq_queue *bfqq, *new_bfqq = NULL;
-+
-+retry:
-+	/* bic always exists here */
-+	bfqq = bic_to_bfqq(bic, is_sync);
-+
-+	/*
-+	 * Always try a new alloc if we fall back to the OOM bfqq
-+	 * originally, since it should just be a temporary situation.
-+	 */
-+	if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) {
-+		bfqq = NULL;
-+		if (new_bfqq != NULL) {
-+			bfqq = new_bfqq;
-+			new_bfqq = NULL;
-+		} else if (gfp_mask & __GFP_WAIT) {
-+			spin_unlock_irq(bfqd->queue->queue_lock);
-+			new_bfqq = kmem_cache_alloc_node(bfq_pool,
-+					gfp_mask | __GFP_ZERO,
-+					bfqd->queue->node);
-+			spin_lock_irq(bfqd->queue->queue_lock);
-+			if (new_bfqq != NULL)
-+				goto retry;
-+		} else {
-+			bfqq = kmem_cache_alloc_node(bfq_pool,
-+					gfp_mask | __GFP_ZERO,
-+					bfqd->queue->node);
-+		}
-+
-+		if (bfqq != NULL) {
-+			bfq_init_bfqq(bfqd, bfqq, bic, current->pid,
-+                                      is_sync);
-+			bfq_init_entity(&bfqq->entity, bfqg);
-+			bfq_log_bfqq(bfqd, bfqq, "allocated");
-+		} else {
-+			bfqq = &bfqd->oom_bfqq;
-+			bfq_log_bfqq(bfqd, bfqq, "using oom bfqq");
-+		}
-+	}
-+
-+	if (new_bfqq != NULL)
-+		kmem_cache_free(bfq_pool, new_bfqq);
-+
-+	return bfqq;
-+}
-+
-+static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd,
-+					       struct bfq_group *bfqg,
-+					       int ioprio_class, int ioprio)
-+{
-+	switch (ioprio_class) {
-+	case IOPRIO_CLASS_RT:
-+		return &bfqg->async_bfqq[0][ioprio];
-+	case IOPRIO_CLASS_NONE:
-+		ioprio = IOPRIO_NORM;
-+		/* fall through */
-+	case IOPRIO_CLASS_BE:
-+		return &bfqg->async_bfqq[1][ioprio];
-+	case IOPRIO_CLASS_IDLE:
-+		return &bfqg->async_idle_bfqq;
-+	default:
-+		BUG();
-+	}
-+}
-+
-+static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
-+				       struct bfq_group *bfqg, int is_sync,
-+				       struct bfq_io_cq *bic, gfp_t gfp_mask)
-+{
-+	const int ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+	const int ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);
-+	struct bfq_queue **async_bfqq = NULL;
-+	struct bfq_queue *bfqq = NULL;
-+
-+	if (!is_sync) {
-+		async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class,
-+						  ioprio);
-+		bfqq = *async_bfqq;
-+	}
-+
-+	if (bfqq == NULL)
-+		bfqq = bfq_find_alloc_queue(bfqd, bfqg, is_sync, bic, gfp_mask);
-+
-+	/*
-+	 * Pin the queue now that it's allocated, scheduler exit will
-+	 * prune it.
-+	 */
-+	if (!is_sync && *async_bfqq == NULL) {
-+		atomic_inc(&bfqq->ref);
-+		bfq_log_bfqq(bfqd, bfqq, "get_queue, bfqq not in async: %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		*async_bfqq = bfqq;
-+	}
-+
-+	atomic_inc(&bfqq->ref);
-+	bfq_log_bfqq(bfqd, bfqq, "get_queue, at end: %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+	return bfqq;
-+}
-+
-+static void bfq_update_io_thinktime(struct bfq_data *bfqd,
-+				    struct bfq_io_cq *bic)
-+{
-+	unsigned long elapsed = jiffies - bic->ttime.last_end_request;
-+	unsigned long ttime = min(elapsed, 2UL * bfqd->bfq_slice_idle);
-+
-+	bic->ttime.ttime_samples = (7*bic->ttime.ttime_samples + 256) / 8;
-+	bic->ttime.ttime_total = (7*bic->ttime.ttime_total + 256*ttime) / 8;
-+	bic->ttime.ttime_mean = (bic->ttime.ttime_total + 128) /
-+				bic->ttime.ttime_samples;
-+}
-+
-+static void bfq_update_io_seektime(struct bfq_data *bfqd,
-+				   struct bfq_queue *bfqq,
-+				   struct request *rq)
-+{
-+	sector_t sdist;
-+	u64 total;
-+
-+	if (bfqq->last_request_pos < blk_rq_pos(rq))
-+		sdist = blk_rq_pos(rq) - bfqq->last_request_pos;
-+	else
-+		sdist = bfqq->last_request_pos - blk_rq_pos(rq);
-+
-+	/*
-+	 * Don't allow the seek distance to get too large from the
-+	 * odd fragment, pagein, etc.
-+	 */
-+	if (bfqq->seek_samples == 0) /* first request, not really a seek */
-+		sdist = 0;
-+	else if (bfqq->seek_samples <= 60) /* second & third seek */
-+		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*1024);
-+	else
-+		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*64);
-+
-+	bfqq->seek_samples = (7*bfqq->seek_samples + 256) / 8;
-+	bfqq->seek_total = (7*bfqq->seek_total + (u64)256*sdist) / 8;
-+	total = bfqq->seek_total + (bfqq->seek_samples/2);
-+	do_div(total, bfqq->seek_samples);
-+	bfqq->seek_mean = (sector_t)total;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "dist=%llu mean=%llu", (u64)sdist,
-+			(u64)bfqq->seek_mean);
-+}
-+
-+/*
-+ * Disable idle window if the process thinks too long or seeks so much that
-+ * it doesn't matter.
-+ */
-+static void bfq_update_idle_window(struct bfq_data *bfqd,
-+				   struct bfq_queue *bfqq,
-+				   struct bfq_io_cq *bic)
-+{
-+	int enable_idle;
-+
-+	/* Don't idle for async or idle io prio class. */
-+	if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq))
-+		return;
-+
-+	enable_idle = bfq_bfqq_idle_window(bfqq);
-+
-+	if (atomic_read(&bic->icq.ioc->active_ref) == 0 ||
-+	    bfqd->bfq_slice_idle == 0 ||
-+		(bfqd->hw_tag && BFQQ_SEEKY(bfqq) &&
-+			bfqq->wr_coeff == 1))
-+		enable_idle = 0;
-+	else if (bfq_sample_valid(bic->ttime.ttime_samples)) {
-+		if (bic->ttime.ttime_mean > bfqd->bfq_slice_idle &&
-+			bfqq->wr_coeff == 1)
-+			enable_idle = 0;
-+		else
-+			enable_idle = 1;
-+	}
-+	bfq_log_bfqq(bfqd, bfqq, "update_idle_window: enable_idle %d",
-+		enable_idle);
-+
-+	if (enable_idle)
-+		bfq_mark_bfqq_idle_window(bfqq);
-+	else
-+		bfq_clear_bfqq_idle_window(bfqq);
-+}
-+
-+/*
-+ * Called when a new fs request (rq) is added to bfqq.  Check if there's
-+ * something we should do about it.
-+ */
-+static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			    struct request *rq)
-+{
-+	struct bfq_io_cq *bic = RQ_BIC(rq);
-+
-+	if (rq->cmd_flags & REQ_META)
-+		bfqq->meta_pending++;
-+
-+	bfq_update_io_thinktime(bfqd, bic);
-+	bfq_update_io_seektime(bfqd, bfqq, rq);
-+	if (!BFQQ_SEEKY(bfqq) && bfq_bfqq_constantly_seeky(bfqq)) {
-+		bfq_clear_bfqq_constantly_seeky(bfqq);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->const_seeky_busy_in_flight_queues);
-+			bfqd->const_seeky_busy_in_flight_queues--;
-+		}
-+	}
-+	if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 ||
-+	    !BFQQ_SEEKY(bfqq))
-+		bfq_update_idle_window(bfqd, bfqq, bic);
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		     "rq_enqueued: idle_window=%d (seeky %d, mean %llu)",
-+		     bfq_bfqq_idle_window(bfqq), BFQQ_SEEKY(bfqq),
-+		     (long long unsigned)bfqq->seek_mean);
-+
-+	bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq);
-+
-+	if (bfqq == bfqd->in_service_queue && bfq_bfqq_wait_request(bfqq)) {
-+		int small_req = bfqq->queued[rq_is_sync(rq)] == 1 &&
-+				blk_rq_sectors(rq) < 32;
-+		int budget_timeout = bfq_bfqq_budget_timeout(bfqq);
-+
-+		/*
-+		 * There is just this request queued: if the request
-+		 * is small and the queue is not to be expired, then
-+		 * just exit.
-+		 *
-+		 * In this way, if the disk is being idled to wait for
-+		 * a new request from the in-service queue, we avoid
-+		 * unplugging the device and committing the disk to serve
-+		 * just a small request. On the contrary, we wait for
-+		 * the block layer to decide when to unplug the device:
-+		 * hopefully, new requests will be merged to this one
-+		 * quickly, then the device will be unplugged and
-+		 * larger requests will be dispatched.
-+		 */
-+		if (small_req && !budget_timeout)
-+			return;
-+
-+		/*
-+		 * A large enough request arrived, or the queue is to
-+		 * be expired: in both cases disk idling is to be
-+		 * stopped, so clear wait_request flag and reset
-+		 * timer.
-+		 */
-+		bfq_clear_bfqq_wait_request(bfqq);
-+		del_timer(&bfqd->idle_slice_timer);
-+
-+		/*
-+		 * The queue is not empty, because a new request just
-+		 * arrived. Hence we can safely expire the queue, in
-+		 * case of budget timeout, without risking that the
-+		 * timestamps of the queue are not updated correctly.
-+		 * See [1] for more details.
-+		 */
-+		if (budget_timeout)
-+			bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_TIMEOUT);
-+
-+		/*
-+		 * Let the request rip immediately, or let a new queue be
-+		 * selected if bfqq has just been expired.
-+		 */
-+		__blk_run_queue(bfqd->queue);
-+	}
-+}
-+
-+static void bfq_insert_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	assert_spin_locked(bfqd->queue->queue_lock);
-+
-+	bfq_add_request(rq);
-+
-+	rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)];
-+	list_add_tail(&rq->queuelist, &bfqq->fifo);
-+
-+	bfq_rq_enqueued(bfqd, bfqq, rq);
-+}
-+
-+static void bfq_update_hw_tag(struct bfq_data *bfqd)
-+{
-+	bfqd->max_rq_in_driver = max(bfqd->max_rq_in_driver,
-+				     bfqd->rq_in_driver);
-+
-+	if (bfqd->hw_tag == 1)
-+		return;
-+
-+	/*
-+	 * This sample is valid if the number of outstanding requests
-+	 * is large enough to allow a queueing behavior.  Note that the
-+	 * sum is not exact, as it's not taking into account deactivated
-+	 * requests.
-+	 */
-+	if (bfqd->rq_in_driver + bfqd->queued < BFQ_HW_QUEUE_THRESHOLD)
-+		return;
-+
-+	if (bfqd->hw_tag_samples++ < BFQ_HW_QUEUE_SAMPLES)
-+		return;
-+
-+	bfqd->hw_tag = bfqd->max_rq_in_driver > BFQ_HW_QUEUE_THRESHOLD;
-+	bfqd->max_rq_in_driver = 0;
-+	bfqd->hw_tag_samples = 0;
-+}
-+
-+static void bfq_completed_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	bool sync = bfq_bfqq_sync(bfqq);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "completed one req with %u sects left (%d)",
-+		     blk_rq_sectors(rq), sync);
-+
-+	bfq_update_hw_tag(bfqd);
-+
-+	BUG_ON(!bfqd->rq_in_driver);
-+	BUG_ON(!bfqq->dispatched);
-+	bfqd->rq_in_driver--;
-+	bfqq->dispatched--;
-+
-+	if (!bfqq->dispatched && !bfq_bfqq_busy(bfqq)) {
-+		bfq_weights_tree_remove(bfqd, &bfqq->entity,
-+					&bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->busy_in_flight_queues);
-+			bfqd->busy_in_flight_queues--;
-+			if (bfq_bfqq_constantly_seeky(bfqq)) {
-+				BUG_ON(!bfqd->
-+					const_seeky_busy_in_flight_queues);
-+				bfqd->const_seeky_busy_in_flight_queues--;
-+			}
-+		}
-+	}
-+
-+	if (sync) {
-+		bfqd->sync_flight--;
-+		RQ_BIC(rq)->ttime.last_end_request = jiffies;
-+	}
-+
-+	/*
-+	 * If we are waiting to discover whether the request pattern of the
-+	 * task associated with the queue is actually isochronous, and
-+	 * both requisites for this condition to hold are satisfied, then
-+	 * compute soft_rt_next_start (see the comments to the function
-+	 * bfq_bfqq_softrt_next_start()).
-+	 */
-+	if (bfq_bfqq_softrt_update(bfqq) && bfqq->dispatched == 0 &&
-+	    RB_EMPTY_ROOT(&bfqq->sort_list))
-+		bfqq->soft_rt_next_start =
-+			bfq_bfqq_softrt_next_start(bfqd, bfqq);
-+
-+	/*
-+	 * If this is the in-service queue, check if it needs to be expired,
-+	 * or if we want to idle in case it has no pending requests.
-+	 */
-+	if (bfqd->in_service_queue == bfqq) {
-+		if (bfq_bfqq_budget_new(bfqq))
-+			bfq_set_budget_timeout(bfqd);
-+
-+		if (bfq_bfqq_must_idle(bfqq)) {
-+			bfq_arm_slice_timer(bfqd);
-+			goto out;
-+		} else if (bfq_may_expire_for_budg_timeout(bfqq))
-+			bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_TIMEOUT);
-+		else if (RB_EMPTY_ROOT(&bfqq->sort_list) &&
-+			 (bfqq->dispatched == 0 ||
-+			  !bfq_bfqq_must_not_expire(bfqq)))
-+			bfq_bfqq_expire(bfqd, bfqq, 0,
-+					BFQ_BFQQ_NO_MORE_REQUESTS);
-+	}
-+
-+	if (!bfqd->rq_in_driver)
-+		bfq_schedule_dispatch(bfqd);
-+
-+out:
-+	return;
-+}
-+
-+static inline int __bfq_may_queue(struct bfq_queue *bfqq)
-+{
-+	if (bfq_bfqq_wait_request(bfqq) && bfq_bfqq_must_alloc(bfqq)) {
-+		bfq_clear_bfqq_must_alloc(bfqq);
-+		return ELV_MQUEUE_MUST;
-+	}
-+
-+	return ELV_MQUEUE_MAY;
-+}
-+
-+static int bfq_may_queue(struct request_queue *q, int rw)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct task_struct *tsk = current;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq;
-+
-+	/*
-+	 * Don't force setup of a queue from here, as a call to may_queue
-+	 * does not necessarily imply that a request actually will be
-+	 * queued. So just lookup a possibly existing queue, or return
-+	 * 'may queue' if that fails.
-+	 */
-+	bic = bfq_bic_lookup(bfqd, tsk->io_context);
-+	if (bic == NULL)
-+		return ELV_MQUEUE_MAY;
-+
-+	bfqq = bic_to_bfqq(bic, rw_is_sync(rw));
-+	if (bfqq != NULL)
-+		return __bfq_may_queue(bfqq);
-+
-+	return ELV_MQUEUE_MAY;
-+}
-+
-+/*
-+ * Queue lock held here.
-+ */
-+static void bfq_put_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	if (bfqq != NULL) {
-+		const int rw = rq_data_dir(rq);
-+
-+		BUG_ON(!bfqq->allocated[rw]);
-+		bfqq->allocated[rw]--;
-+
-+		rq->elv.priv[0] = NULL;
-+		rq->elv.priv[1] = NULL;
-+
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "put_request %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+	}
-+}
-+
-+static struct bfq_queue *
-+bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
-+		struct bfq_queue *bfqq)
-+{
-+	bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu",
-+		(long unsigned)bfqq->new_bfqq->pid);
-+	bic_set_bfqq(bic, bfqq->new_bfqq, 1);
-+	bfq_mark_bfqq_coop(bfqq->new_bfqq);
-+	bfq_put_queue(bfqq);
-+	return bic_to_bfqq(bic, 1);
-+}
-+
-+/*
-+ * Returns NULL if a new bfqq should be allocated, or the old bfqq if this
-+ * was the last process referring to said bfqq.
-+ */
-+static struct bfq_queue *
-+bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
-+{
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "splitting queue");
-+	if (bfqq_process_refs(bfqq) == 1) {
-+		bfqq->pid = current->pid;
-+		bfq_clear_bfqq_coop(bfqq);
-+		bfq_clear_bfqq_split_coop(bfqq);
-+		return bfqq;
-+	}
-+
-+	bic_set_bfqq(bic, NULL, 1);
-+
-+	bfq_put_cooperator(bfqq);
-+
-+	bfq_put_queue(bfqq);
-+	return NULL;
-+}
-+
-+/*
-+ * Allocate bfq data structures associated with this request.
-+ */
-+static int bfq_set_request(struct request_queue *q, struct request *rq,
-+			   struct bio *bio, gfp_t gfp_mask)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_io_cq *bic = icq_to_bic(rq->elv.icq);
-+	const int rw = rq_data_dir(rq);
-+	const int is_sync = rq_is_sync(rq);
-+	struct bfq_queue *bfqq;
-+	struct bfq_group *bfqg;
-+	unsigned long flags;
-+
-+	might_sleep_if(gfp_mask & __GFP_WAIT);
-+
-+	bfq_check_ioprio_change(bic);
-+
-+	spin_lock_irqsave(q->queue_lock, flags);
-+
-+	if (bic == NULL)
-+		goto queue_fail;
-+
-+	bfqg = bfq_bic_update_cgroup(bic);
-+
-+new_queue:
-+	bfqq = bic_to_bfqq(bic, is_sync);
-+	if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) {
-+		bfqq = bfq_get_queue(bfqd, bfqg, is_sync, bic, gfp_mask);
-+		bic_set_bfqq(bic, bfqq, is_sync);
-+	} else {
-+		/*
-+		 * If the queue was seeky for too long, break it apart.
-+		 */
-+		if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) {
-+			bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq");
-+			bfqq = bfq_split_bfqq(bic, bfqq);
-+			if (!bfqq)
-+				goto new_queue;
-+		}
-+
-+		/*
-+		 * Check to see if this queue is scheduled to merge with
-+		 * another closely cooperating queue. The merging of queues
-+		 * happens here as it must be done in process context.
-+		 * The reference on new_bfqq was taken in merge_bfqqs.
-+		 */
-+		if (bfqq->new_bfqq != NULL)
-+			bfqq = bfq_merge_bfqqs(bfqd, bic, bfqq);
-+	}
-+
-+	bfqq->allocated[rw]++;
-+	atomic_inc(&bfqq->ref);
-+	bfq_log_bfqq(bfqd, bfqq, "set_request: bfqq %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+
-+	rq->elv.priv[0] = bic;
-+	rq->elv.priv[1] = bfqq;
-+
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
-+	return 0;
-+
-+queue_fail:
-+	bfq_schedule_dispatch(bfqd);
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
-+	return 1;
-+}
-+
-+static void bfq_kick_queue(struct work_struct *work)
-+{
-+	struct bfq_data *bfqd =
-+		container_of(work, struct bfq_data, unplug_work);
-+	struct request_queue *q = bfqd->queue;
-+
-+	spin_lock_irq(q->queue_lock);
-+	__blk_run_queue(q);
-+	spin_unlock_irq(q->queue_lock);
-+}
-+
-+/*
-+ * Handler of the expiration of the timer running if the in-service queue
-+ * is idling inside its time slice.
-+ */
-+static void bfq_idle_slice_timer(unsigned long data)
-+{
-+	struct bfq_data *bfqd = (struct bfq_data *)data;
-+	struct bfq_queue *bfqq;
-+	unsigned long flags;
-+	enum bfqq_expiration reason;
-+
-+	spin_lock_irqsave(bfqd->queue->queue_lock, flags);
-+
-+	bfqq = bfqd->in_service_queue;
-+	/*
-+	 * Theoretical race here: the in-service queue can be NULL or
-+	 * different from the queue that was idling if the timer handler
-+	 * spins on the queue_lock and a new request arrives for the
-+	 * current queue and there is a full dispatch cycle that changes
-+	 * the in-service queue.  This can hardly happen, but in the worst
-+	 * case we just expire a queue too early.
-+	 */
-+	if (bfqq != NULL) {
-+		bfq_log_bfqq(bfqd, bfqq, "slice_timer expired");
-+		if (bfq_bfqq_budget_timeout(bfqq))
-+			/*
-+			 * Also here the queue can be safely expired
-+			 * for budget timeout without wasting
-+			 * guarantees
-+			 */
-+			reason = BFQ_BFQQ_BUDGET_TIMEOUT;
-+		else if (bfqq->queued[0] == 0 && bfqq->queued[1] == 0)
-+			/*
-+			 * The queue may not be empty upon timer expiration,
-+			 * because we may not disable the timer when the
-+			 * first request of the in-service queue arrives
-+			 * during disk idling.
-+			 */
-+			reason = BFQ_BFQQ_TOO_IDLE;
-+		else
-+			goto schedule_dispatch;
-+
-+		bfq_bfqq_expire(bfqd, bfqq, 1, reason);
-+	}
-+
-+schedule_dispatch:
-+	bfq_schedule_dispatch(bfqd);
-+
-+	spin_unlock_irqrestore(bfqd->queue->queue_lock, flags);
-+}
-+
-+static void bfq_shutdown_timer_wq(struct bfq_data *bfqd)
-+{
-+	del_timer_sync(&bfqd->idle_slice_timer);
-+	cancel_work_sync(&bfqd->unplug_work);
-+}
-+
-+static inline void __bfq_put_async_bfqq(struct bfq_data *bfqd,
-+					struct bfq_queue **bfqq_ptr)
-+{
-+	struct bfq_group *root_group = bfqd->root_group;
-+	struct bfq_queue *bfqq = *bfqq_ptr;
-+
-+	bfq_log(bfqd, "put_async_bfqq: %p", bfqq);
-+	if (bfqq != NULL) {
-+		bfq_bfqq_move(bfqd, bfqq, &bfqq->entity, root_group);
-+		bfq_log_bfqq(bfqd, bfqq, "put_async_bfqq: putting %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+		*bfqq_ptr = NULL;
-+	}
-+}
-+
-+/*
-+ * Release all the bfqg references to its async queues.  If we are
-+ * deallocating the group these queues may still contain requests, so
-+ * we reparent them to the root cgroup (i.e., the only one that will
-+ * exist for sure until all the requests on a device are gone).
-+ */
-+static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg)
-+{
-+	int i, j;
-+
-+	for (i = 0; i < 2; i++)
-+		for (j = 0; j < IOPRIO_BE_NR; j++)
-+			__bfq_put_async_bfqq(bfqd, &bfqg->async_bfqq[i][j]);
-+
-+	__bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq);
-+}
-+
-+static void bfq_exit_queue(struct elevator_queue *e)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	struct request_queue *q = bfqd->queue;
-+	struct bfq_queue *bfqq, *n;
-+
-+	bfq_shutdown_timer_wq(bfqd);
-+
-+	spin_lock_irq(q->queue_lock);
-+
-+	BUG_ON(bfqd->in_service_queue != NULL);
-+	list_for_each_entry_safe(bfqq, n, &bfqd->idle_list, bfqq_list)
-+		bfq_deactivate_bfqq(bfqd, bfqq, 0);
-+
-+	bfq_disconnect_groups(bfqd);
-+	spin_unlock_irq(q->queue_lock);
-+
-+	bfq_shutdown_timer_wq(bfqd);
-+
-+	synchronize_rcu();
-+
-+	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+
-+	bfq_free_root_group(bfqd);
-+	kfree(bfqd);
-+}
-+
-+static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
-+{
-+	struct bfq_group *bfqg;
-+	struct bfq_data *bfqd;
-+	struct elevator_queue *eq;
-+
-+	eq = elevator_alloc(q, e);
-+	if (eq == NULL)
-+		return -ENOMEM;
-+
-+	bfqd = kzalloc_node(sizeof(*bfqd), GFP_KERNEL, q->node);
-+	if (bfqd == NULL) {
-+		kobject_put(&eq->kobj);
-+		return -ENOMEM;
-+	}
-+	eq->elevator_data = bfqd;
-+
-+	/*
-+	 * Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues.
-+	 * Grab a permanent reference to it, so that the normal code flow
-+	 * will not attempt to free it.
-+	 */
-+	bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, NULL, 1, 0);
-+	atomic_inc(&bfqd->oom_bfqq.ref);
-+	bfqd->oom_bfqq.entity.new_ioprio = BFQ_DEFAULT_QUEUE_IOPRIO;
-+	bfqd->oom_bfqq.entity.new_ioprio_class = IOPRIO_CLASS_BE;
-+	bfqd->oom_bfqq.entity.new_weight =
-+		bfq_ioprio_to_weight(bfqd->oom_bfqq.entity.new_ioprio);
-+	/*
-+	 * Trigger weight initialization, according to ioprio, at the
-+	 * oom_bfqq's first activation. The oom_bfqq's ioprio and ioprio
-+	 * class won't be changed any more.
-+	 */
-+	bfqd->oom_bfqq.entity.ioprio_changed = 1;
-+
-+	bfqd->queue = q;
-+
-+	spin_lock_irq(q->queue_lock);
-+	q->elevator = eq;
-+	spin_unlock_irq(q->queue_lock);
-+
-+	bfqg = bfq_alloc_root_group(bfqd, q->node);
-+	if (bfqg == NULL) {
-+		kfree(bfqd);
-+		kobject_put(&eq->kobj);
-+		return -ENOMEM;
-+	}
-+
-+	bfqd->root_group = bfqg;
-+	bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group);
-+#ifdef CONFIG_CGROUP_BFQIO
-+	bfqd->active_numerous_groups = 0;
-+#endif
-+
-+	init_timer(&bfqd->idle_slice_timer);
-+	bfqd->idle_slice_timer.function = bfq_idle_slice_timer;
-+	bfqd->idle_slice_timer.data = (unsigned long)bfqd;
-+
-+	bfqd->rq_pos_tree = RB_ROOT;
-+	bfqd->queue_weights_tree = RB_ROOT;
-+	bfqd->group_weights_tree = RB_ROOT;
-+
-+	INIT_WORK(&bfqd->unplug_work, bfq_kick_queue);
-+
-+	INIT_LIST_HEAD(&bfqd->active_list);
-+	INIT_LIST_HEAD(&bfqd->idle_list);
-+	INIT_HLIST_HEAD(&bfqd->burst_list);
-+
-+	bfqd->hw_tag = -1;
-+
-+	bfqd->bfq_max_budget = bfq_default_max_budget;
-+
-+	bfqd->bfq_fifo_expire[0] = bfq_fifo_expire[0];
-+	bfqd->bfq_fifo_expire[1] = bfq_fifo_expire[1];
-+	bfqd->bfq_back_max = bfq_back_max;
-+	bfqd->bfq_back_penalty = bfq_back_penalty;
-+	bfqd->bfq_slice_idle = bfq_slice_idle;
-+	bfqd->bfq_class_idle_last_service = 0;
-+	bfqd->bfq_max_budget_async_rq = bfq_max_budget_async_rq;
-+	bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async;
-+	bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync;
-+
-+	bfqd->bfq_coop_thresh = 2;
-+	bfqd->bfq_failed_cooperations = 7000;
-+	bfqd->bfq_requests_within_timer = 120;
-+
-+	bfqd->bfq_large_burst_thresh = 11;
-+	bfqd->bfq_burst_interval = msecs_to_jiffies(500);
-+
-+	bfqd->low_latency = true;
-+
-+	bfqd->bfq_wr_coeff = 20;
-+	bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300);
-+	bfqd->bfq_wr_max_time = 0;
-+	bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000);
-+	bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500);
-+	bfqd->bfq_wr_max_softrt_rate = 7000; /*
-+					      * Approximate rate required
-+					      * to playback or record a
-+					      * high-definition compressed
-+					      * video.
-+					      */
-+	bfqd->wr_busy_queues = 0;
-+	bfqd->busy_in_flight_queues = 0;
-+	bfqd->const_seeky_busy_in_flight_queues = 0;
-+
-+	/*
-+	 * Begin by assuming, optimistically, that the device peak rate is
-+	 * equal to the highest reference rate.
-+	 */
-+	bfqd->RT_prod = R_fast[blk_queue_nonrot(bfqd->queue)] *
-+			T_fast[blk_queue_nonrot(bfqd->queue)];
-+	bfqd->peak_rate = R_fast[blk_queue_nonrot(bfqd->queue)];
-+	bfqd->device_speed = BFQ_BFQD_FAST;
-+
-+	return 0;
-+}
-+
-+static void bfq_slab_kill(void)
-+{
-+	if (bfq_pool != NULL)
-+		kmem_cache_destroy(bfq_pool);
-+}
-+
-+static int __init bfq_slab_setup(void)
-+{
-+	bfq_pool = KMEM_CACHE(bfq_queue, 0);
-+	if (bfq_pool == NULL)
-+		return -ENOMEM;
-+	return 0;
-+}
-+
-+static ssize_t bfq_var_show(unsigned int var, char *page)
-+{
-+	return sprintf(page, "%d\n", var);
-+}
-+
-+static ssize_t bfq_var_store(unsigned long *var, const char *page,
-+			     size_t count)
-+{
-+	unsigned long new_val;
-+	int ret = kstrtoul(page, 10, &new_val);
-+
-+	if (ret == 0)
-+		*var = new_val;
-+
-+	return count;
-+}
-+
-+static ssize_t bfq_wr_max_time_show(struct elevator_queue *e, char *page)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	return sprintf(page, "%d\n", bfqd->bfq_wr_max_time > 0 ?
-+		       jiffies_to_msecs(bfqd->bfq_wr_max_time) :
-+		       jiffies_to_msecs(bfq_wr_duration(bfqd)));
-+}
-+
-+static ssize_t bfq_weights_show(struct elevator_queue *e, char *page)
-+{
-+	struct bfq_queue *bfqq;
-+	struct bfq_data *bfqd = e->elevator_data;
-+	ssize_t num_char = 0;
-+
-+	num_char += sprintf(page + num_char, "Tot reqs queued %d\n\n",
-+			    bfqd->queued);
-+
-+	spin_lock_irq(bfqd->queue->queue_lock);
-+
-+	num_char += sprintf(page + num_char, "Active:\n");
-+	list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) {
-+	  num_char += sprintf(page + num_char,
-+			      "pid%d: weight %hu, nr_queued %d %d, dur %d/%u\n",
-+			      bfqq->pid,
-+			      bfqq->entity.weight,
-+			      bfqq->queued[0],
-+			      bfqq->queued[1],
-+			jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish),
-+			jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	}
-+
-+	num_char += sprintf(page + num_char, "Idle:\n");
-+	list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) {
-+			num_char += sprintf(page + num_char,
-+				"pid%d: weight %hu, dur %d/%u\n",
-+				bfqq->pid,
-+				bfqq->entity.weight,
-+				jiffies_to_msecs(jiffies -
-+					bfqq->last_wr_start_finish),
-+				jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	}
-+
-+	spin_unlock_irq(bfqd->queue->queue_lock);
-+
-+	return num_char;
-+}
-+
-+#define SHOW_FUNCTION(__FUNC, __VAR, __CONV)				\
-+static ssize_t __FUNC(struct elevator_queue *e, char *page)		\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	unsigned int __data = __VAR;					\
-+	if (__CONV)							\
-+		__data = jiffies_to_msecs(__data);			\
-+	return bfq_var_show(__data, (page));				\
-+}
-+SHOW_FUNCTION(bfq_fifo_expire_sync_show, bfqd->bfq_fifo_expire[1], 1);
-+SHOW_FUNCTION(bfq_fifo_expire_async_show, bfqd->bfq_fifo_expire[0], 1);
-+SHOW_FUNCTION(bfq_back_seek_max_show, bfqd->bfq_back_max, 0);
-+SHOW_FUNCTION(bfq_back_seek_penalty_show, bfqd->bfq_back_penalty, 0);
-+SHOW_FUNCTION(bfq_slice_idle_show, bfqd->bfq_slice_idle, 1);
-+SHOW_FUNCTION(bfq_max_budget_show, bfqd->bfq_user_max_budget, 0);
-+SHOW_FUNCTION(bfq_max_budget_async_rq_show,
-+	      bfqd->bfq_max_budget_async_rq, 0);
-+SHOW_FUNCTION(bfq_timeout_sync_show, bfqd->bfq_timeout[BLK_RW_SYNC], 1);
-+SHOW_FUNCTION(bfq_timeout_async_show, bfqd->bfq_timeout[BLK_RW_ASYNC], 1);
-+SHOW_FUNCTION(bfq_low_latency_show, bfqd->low_latency, 0);
-+SHOW_FUNCTION(bfq_wr_coeff_show, bfqd->bfq_wr_coeff, 0);
-+SHOW_FUNCTION(bfq_wr_rt_max_time_show, bfqd->bfq_wr_rt_max_time, 1);
-+SHOW_FUNCTION(bfq_wr_min_idle_time_show, bfqd->bfq_wr_min_idle_time, 1);
-+SHOW_FUNCTION(bfq_wr_min_inter_arr_async_show, bfqd->bfq_wr_min_inter_arr_async,
-+	1);
-+SHOW_FUNCTION(bfq_wr_max_softrt_rate_show, bfqd->bfq_wr_max_softrt_rate, 0);
-+#undef SHOW_FUNCTION
-+
-+#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV)			\
-+static ssize_t								\
-+__FUNC(struct elevator_queue *e, const char *page, size_t count)	\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	unsigned long uninitialized_var(__data);			\
-+	int ret = bfq_var_store(&__data, (page), count);		\
-+	if (__data < (MIN))						\
-+		__data = (MIN);						\
-+	else if (__data > (MAX))					\
-+		__data = (MAX);						\
-+	if (__CONV)							\
-+		*(__PTR) = msecs_to_jiffies(__data);			\
-+	else								\
-+		*(__PTR) = __data;					\
-+	return ret;							\
-+}
-+STORE_FUNCTION(bfq_fifo_expire_sync_store, &bfqd->bfq_fifo_expire[1], 1,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_fifo_expire_async_store, &bfqd->bfq_fifo_expire[0], 1,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_back_seek_max_store, &bfqd->bfq_back_max, 0, INT_MAX, 0);
-+STORE_FUNCTION(bfq_back_seek_penalty_store, &bfqd->bfq_back_penalty, 1,
-+		INT_MAX, 0);
-+STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_max_budget_async_rq_store, &bfqd->bfq_max_budget_async_rq,
-+		1, INT_MAX, 0);
-+STORE_FUNCTION(bfq_timeout_async_store, &bfqd->bfq_timeout[BLK_RW_ASYNC], 0,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_coeff_store, &bfqd->bfq_wr_coeff, 1, INT_MAX, 0);
-+STORE_FUNCTION(bfq_wr_max_time_store, &bfqd->bfq_wr_max_time, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_rt_max_time_store, &bfqd->bfq_wr_rt_max_time, 0, INT_MAX,
-+		1);
-+STORE_FUNCTION(bfq_wr_min_idle_time_store, &bfqd->bfq_wr_min_idle_time, 0,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_min_inter_arr_async_store,
-+		&bfqd->bfq_wr_min_inter_arr_async, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_max_softrt_rate_store, &bfqd->bfq_wr_max_softrt_rate, 0,
-+		INT_MAX, 0);
-+#undef STORE_FUNCTION
-+
-+/* do nothing for the moment */
-+static ssize_t bfq_weights_store(struct elevator_queue *e,
-+				    const char *page, size_t count)
-+{
-+	return count;
-+}
-+
-+static inline unsigned long bfq_estimated_max_budget(struct bfq_data *bfqd)
-+{
-+	u64 timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
-+
-+	if (bfqd->peak_rate_samples >= BFQ_PEAK_RATE_SAMPLES)
-+		return bfq_calc_max_budget(bfqd->peak_rate, timeout);
-+	else
-+		return bfq_default_max_budget;
-+}
-+
-+static ssize_t bfq_max_budget_store(struct elevator_queue *e,
-+				    const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data == 0)
-+		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+	else {
-+		if (__data > INT_MAX)
-+			__data = INT_MAX;
-+		bfqd->bfq_max_budget = __data;
-+	}
-+
-+	bfqd->bfq_user_max_budget = __data;
-+
-+	return ret;
-+}
-+
-+static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
-+				      const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data < 1)
-+		__data = 1;
-+	else if (__data > INT_MAX)
-+		__data = INT_MAX;
-+
-+	bfqd->bfq_timeout[BLK_RW_SYNC] = msecs_to_jiffies(__data);
-+	if (bfqd->bfq_user_max_budget == 0)
-+		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+
-+	return ret;
-+}
-+
-+static ssize_t bfq_low_latency_store(struct elevator_queue *e,
-+				     const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data > 1)
-+		__data = 1;
-+	if (__data == 0 && bfqd->low_latency != 0)
-+		bfq_end_wr(bfqd);
-+	bfqd->low_latency = __data;
-+
-+	return ret;
-+}
-+
-+#define BFQ_ATTR(name) \
-+	__ATTR(name, S_IRUGO|S_IWUSR, bfq_##name##_show, bfq_##name##_store)
-+
-+static struct elv_fs_entry bfq_attrs[] = {
-+	BFQ_ATTR(fifo_expire_sync),
-+	BFQ_ATTR(fifo_expire_async),
-+	BFQ_ATTR(back_seek_max),
-+	BFQ_ATTR(back_seek_penalty),
-+	BFQ_ATTR(slice_idle),
-+	BFQ_ATTR(max_budget),
-+	BFQ_ATTR(max_budget_async_rq),
-+	BFQ_ATTR(timeout_sync),
-+	BFQ_ATTR(timeout_async),
-+	BFQ_ATTR(low_latency),
-+	BFQ_ATTR(wr_coeff),
-+	BFQ_ATTR(wr_max_time),
-+	BFQ_ATTR(wr_rt_max_time),
-+	BFQ_ATTR(wr_min_idle_time),
-+	BFQ_ATTR(wr_min_inter_arr_async),
-+	BFQ_ATTR(wr_max_softrt_rate),
-+	BFQ_ATTR(weights),
-+	__ATTR_NULL
-+};
-+
-+static struct elevator_type iosched_bfq = {
-+	.ops = {
-+		.elevator_merge_fn =		bfq_merge,
-+		.elevator_merged_fn =		bfq_merged_request,
-+		.elevator_merge_req_fn =	bfq_merged_requests,
-+		.elevator_allow_merge_fn =	bfq_allow_merge,
-+		.elevator_dispatch_fn =		bfq_dispatch_requests,
-+		.elevator_add_req_fn =		bfq_insert_request,
-+		.elevator_activate_req_fn =	bfq_activate_request,
-+		.elevator_deactivate_req_fn =	bfq_deactivate_request,
-+		.elevator_completed_req_fn =	bfq_completed_request,
-+		.elevator_former_req_fn =	elv_rb_former_request,
-+		.elevator_latter_req_fn =	elv_rb_latter_request,
-+		.elevator_init_icq_fn =		bfq_init_icq,
-+		.elevator_exit_icq_fn =		bfq_exit_icq,
-+		.elevator_set_req_fn =		bfq_set_request,
-+		.elevator_put_req_fn =		bfq_put_request,
-+		.elevator_may_queue_fn =	bfq_may_queue,
-+		.elevator_init_fn =		bfq_init_queue,
-+		.elevator_exit_fn =		bfq_exit_queue,
-+	},
-+	.icq_size =		sizeof(struct bfq_io_cq),
-+	.icq_align =		__alignof__(struct bfq_io_cq),
-+	.elevator_attrs =	bfq_attrs,
-+	.elevator_name =	"bfq",
-+	.elevator_owner =	THIS_MODULE,
-+};
-+
-+static int __init bfq_init(void)
-+{
-+	/*
-+	 * Can be 0 on HZ < 1000 setups.
-+	 */
-+	if (bfq_slice_idle == 0)
-+		bfq_slice_idle = 1;
-+
-+	if (bfq_timeout_async == 0)
-+		bfq_timeout_async = 1;
-+
-+	if (bfq_slab_setup())
-+		return -ENOMEM;
-+
-+	/*
-+	 * Times to load large popular applications for the typical systems
-+	 * installed on the reference devices (see the comments before the
-+	 * definitions of the two arrays).
-+	 */
-+	T_slow[0] = msecs_to_jiffies(2600);
-+	T_slow[1] = msecs_to_jiffies(1000);
-+	T_fast[0] = msecs_to_jiffies(5500);
-+	T_fast[1] = msecs_to_jiffies(2000);
-+
-+	/*
-+	 * Thresholds that determine the switch between speed classes (see
-+	 * the comments before the definition of the array).
-+	 */
-+	device_speed_thresh[0] = (R_fast[0] + R_slow[0]) / 2;
-+	device_speed_thresh[1] = (R_fast[1] + R_slow[1]) / 2;
-+
-+	elv_register(&iosched_bfq);
-+	pr_info("BFQ I/O-scheduler: v7r8");
-+
-+	return 0;
-+}
-+
-+static void __exit bfq_exit(void)
-+{
-+	elv_unregister(&iosched_bfq);
-+	bfq_slab_kill();
-+}
-+
-+module_init(bfq_init);
-+module_exit(bfq_exit);
-+
-+MODULE_AUTHOR("Fabio Checconi, Paolo Valente");
-+MODULE_LICENSE("GPL");
-diff --git a/block/bfq-sched.c b/block/bfq-sched.c
-new file mode 100644
-index 0000000..c343099
---- /dev/null
-+++ b/block/bfq-sched.c
-@@ -0,0 +1,1208 @@
-+/*
-+ * BFQ: Hierarchical B-WF2Q+ scheduler.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+#ifdef CONFIG_CGROUP_BFQIO
-+#define for_each_entity(entity)	\
-+	for (; entity != NULL; entity = entity->parent)
-+
-+#define for_each_entity_safe(entity, parent) \
-+	for (; entity && ({ parent = entity->parent; 1; }); entity = parent)
-+
-+static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
-+						 int extract,
-+						 struct bfq_data *bfqd);
-+
-+static inline void bfq_update_budget(struct bfq_entity *next_in_service)
-+{
-+	struct bfq_entity *bfqg_entity;
-+	struct bfq_group *bfqg;
-+	struct bfq_sched_data *group_sd;
-+
-+	BUG_ON(next_in_service == NULL);
-+
-+	group_sd = next_in_service->sched_data;
-+
-+	bfqg = container_of(group_sd, struct bfq_group, sched_data);
-+	/*
-+	 * bfq_group's my_entity field is not NULL only if the group
-+	 * is not the root group. We must not touch the root entity
-+	 * as it must never become an in-service entity.
-+	 */
-+	bfqg_entity = bfqg->my_entity;
-+	if (bfqg_entity != NULL)
-+		bfqg_entity->budget = next_in_service->budget;
-+}
-+
-+static int bfq_update_next_in_service(struct bfq_sched_data *sd)
-+{
-+	struct bfq_entity *next_in_service;
-+
-+	if (sd->in_service_entity != NULL)
-+		/* will update/requeue at the end of service */
-+		return 0;
-+
-+	/*
-+	 * NOTE: this can be improved in many ways, such as returning
-+	 * 1 (and thus propagating upwards the update) only when the
-+	 * budget changes, or caching the bfqq that will be scheduled
-+	 * next from this subtree.  By now we worry more about
-+	 * correctness than about performance...
-+	 */
-+	next_in_service = bfq_lookup_next_entity(sd, 0, NULL);
-+	sd->next_in_service = next_in_service;
-+
-+	if (next_in_service != NULL)
-+		bfq_update_budget(next_in_service);
-+
-+	return 1;
-+}
-+
-+static inline void bfq_check_next_in_service(struct bfq_sched_data *sd,
-+					     struct bfq_entity *entity)
-+{
-+	BUG_ON(sd->next_in_service != entity);
-+}
-+#else
-+#define for_each_entity(entity)	\
-+	for (; entity != NULL; entity = NULL)
-+
-+#define for_each_entity_safe(entity, parent) \
-+	for (parent = NULL; entity != NULL; entity = parent)
-+
-+static inline int bfq_update_next_in_service(struct bfq_sched_data *sd)
-+{
-+	return 0;
-+}
-+
-+static inline void bfq_check_next_in_service(struct bfq_sched_data *sd,
-+					     struct bfq_entity *entity)
-+{
-+}
-+
-+static inline void bfq_update_budget(struct bfq_entity *next_in_service)
-+{
-+}
-+#endif
-+
-+/*
-+ * Shift for timestamp calculations.  This actually limits the maximum
-+ * service allowed in one timestamp delta (small shift values increase it),
-+ * the maximum total weight that can be used for the queues in the system
-+ * (big shift values increase it), and the period of virtual time
-+ * wraparounds.
-+ */
-+#define WFQ_SERVICE_SHIFT	22
-+
-+/**
-+ * bfq_gt - compare two timestamps.
-+ * @a: first ts.
-+ * @b: second ts.
-+ *
-+ * Return @a > @b, dealing with wrapping correctly.
-+ */
-+static inline int bfq_gt(u64 a, u64 b)
-+{
-+	return (s64)(a - b) > 0;
-+}
-+
-+static inline struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = NULL;
-+
-+	BUG_ON(entity == NULL);
-+
-+	if (entity->my_sched_data == NULL)
-+		bfqq = container_of(entity, struct bfq_queue, entity);
-+
-+	return bfqq;
-+}
-+
-+
-+/**
-+ * bfq_delta - map service into the virtual time domain.
-+ * @service: amount of service.
-+ * @weight: scale factor (weight of an entity or weight sum).
-+ */
-+static inline u64 bfq_delta(unsigned long service,
-+					unsigned long weight)
-+{
-+	u64 d = (u64)service << WFQ_SERVICE_SHIFT;
-+
-+	do_div(d, weight);
-+	return d;
-+}
-+
-+/**
-+ * bfq_calc_finish - assign the finish time to an entity.
-+ * @entity: the entity to act upon.
-+ * @service: the service to be charged to the entity.
-+ */
-+static inline void bfq_calc_finish(struct bfq_entity *entity,
-+				   unsigned long service)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	BUG_ON(entity->weight == 0);
-+
-+	entity->finish = entity->start +
-+		bfq_delta(service, entity->weight);
-+
-+	if (bfqq != NULL) {
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			"calc_finish: serv %lu, w %d",
-+			service, entity->weight);
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			"calc_finish: start %llu, finish %llu, delta %llu",
-+			entity->start, entity->finish,
-+			bfq_delta(service, entity->weight));
-+	}
-+}
-+
-+/**
-+ * bfq_entity_of - get an entity from a node.
-+ * @node: the node field of the entity.
-+ *
-+ * Convert a node pointer to the relative entity.  This is used only
-+ * to simplify the logic of some functions and not as the generic
-+ * conversion mechanism because, e.g., in the tree walking functions,
-+ * the check for a %NULL value would be redundant.
-+ */
-+static inline struct bfq_entity *bfq_entity_of(struct rb_node *node)
-+{
-+	struct bfq_entity *entity = NULL;
-+
-+	if (node != NULL)
-+		entity = rb_entry(node, struct bfq_entity, rb_node);
-+
-+	return entity;
-+}
-+
-+/**
-+ * bfq_extract - remove an entity from a tree.
-+ * @root: the tree root.
-+ * @entity: the entity to remove.
-+ */
-+static inline void bfq_extract(struct rb_root *root,
-+			       struct bfq_entity *entity)
-+{
-+	BUG_ON(entity->tree != root);
-+
-+	entity->tree = NULL;
-+	rb_erase(&entity->rb_node, root);
-+}
-+
-+/**
-+ * bfq_idle_extract - extract an entity from the idle tree.
-+ * @st: the service tree of the owning @entity.
-+ * @entity: the entity being removed.
-+ */
-+static void bfq_idle_extract(struct bfq_service_tree *st,
-+			     struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *next;
-+
-+	BUG_ON(entity->tree != &st->idle);
-+
-+	if (entity == st->first_idle) {
-+		next = rb_next(&entity->rb_node);
-+		st->first_idle = bfq_entity_of(next);
-+	}
-+
-+	if (entity == st->last_idle) {
-+		next = rb_prev(&entity->rb_node);
-+		st->last_idle = bfq_entity_of(next);
-+	}
-+
-+	bfq_extract(&st->idle, entity);
-+
-+	if (bfqq != NULL)
-+		list_del(&bfqq->bfqq_list);
-+}
-+
-+/**
-+ * bfq_insert - generic tree insertion.
-+ * @root: tree root.
-+ * @entity: entity to insert.
-+ *
-+ * This is used for the idle and the active tree, since they are both
-+ * ordered by finish time.
-+ */
-+static void bfq_insert(struct rb_root *root, struct bfq_entity *entity)
-+{
-+	struct bfq_entity *entry;
-+	struct rb_node **node = &root->rb_node;
-+	struct rb_node *parent = NULL;
-+
-+	BUG_ON(entity->tree != NULL);
-+
-+	while (*node != NULL) {
-+		parent = *node;
-+		entry = rb_entry(parent, struct bfq_entity, rb_node);
-+
-+		if (bfq_gt(entry->finish, entity->finish))
-+			node = &parent->rb_left;
-+		else
-+			node = &parent->rb_right;
-+	}
-+
-+	rb_link_node(&entity->rb_node, parent, node);
-+	rb_insert_color(&entity->rb_node, root);
-+
-+	entity->tree = root;
-+}
-+
-+/**
-+ * bfq_update_min - update the min_start field of a entity.
-+ * @entity: the entity to update.
-+ * @node: one of its children.
-+ *
-+ * This function is called when @entity may store an invalid value for
-+ * min_start due to updates to the active tree.  The function  assumes
-+ * that the subtree rooted at @node (which may be its left or its right
-+ * child) has a valid min_start value.
-+ */
-+static inline void bfq_update_min(struct bfq_entity *entity,
-+				  struct rb_node *node)
-+{
-+	struct bfq_entity *child;
-+
-+	if (node != NULL) {
-+		child = rb_entry(node, struct bfq_entity, rb_node);
-+		if (bfq_gt(entity->min_start, child->min_start))
-+			entity->min_start = child->min_start;
-+	}
-+}
-+
-+/**
-+ * bfq_update_active_node - recalculate min_start.
-+ * @node: the node to update.
-+ *
-+ * @node may have changed position or one of its children may have moved,
-+ * this function updates its min_start value.  The left and right subtrees
-+ * are assumed to hold a correct min_start value.
-+ */
-+static inline void bfq_update_active_node(struct rb_node *node)
-+{
-+	struct bfq_entity *entity = rb_entry(node, struct bfq_entity, rb_node);
-+
-+	entity->min_start = entity->start;
-+	bfq_update_min(entity, node->rb_right);
-+	bfq_update_min(entity, node->rb_left);
-+}
-+
-+/**
-+ * bfq_update_active_tree - update min_start for the whole active tree.
-+ * @node: the starting node.
-+ *
-+ * @node must be the deepest modified node after an update.  This function
-+ * updates its min_start using the values held by its children, assuming
-+ * that they did not change, and then updates all the nodes that may have
-+ * changed in the path to the root.  The only nodes that may have changed
-+ * are the ones in the path or their siblings.
-+ */
-+static void bfq_update_active_tree(struct rb_node *node)
-+{
-+	struct rb_node *parent;
-+
-+up:
-+	bfq_update_active_node(node);
-+
-+	parent = rb_parent(node);
-+	if (parent == NULL)
-+		return;
-+
-+	if (node == parent->rb_left && parent->rb_right != NULL)
-+		bfq_update_active_node(parent->rb_right);
-+	else if (parent->rb_left != NULL)
-+		bfq_update_active_node(parent->rb_left);
-+
-+	node = parent;
-+	goto up;
-+}
-+
-+static void bfq_weights_tree_add(struct bfq_data *bfqd,
-+				 struct bfq_entity *entity,
-+				 struct rb_root *root);
-+
-+static void bfq_weights_tree_remove(struct bfq_data *bfqd,
-+				    struct bfq_entity *entity,
-+				    struct rb_root *root);
-+
-+
-+/**
-+ * bfq_active_insert - insert an entity in the active tree of its
-+ *                     group/device.
-+ * @st: the service tree of the entity.
-+ * @entity: the entity being inserted.
-+ *
-+ * The active tree is ordered by finish time, but an extra key is kept
-+ * per each node, containing the minimum value for the start times of
-+ * its children (and the node itself), so it's possible to search for
-+ * the eligible node with the lowest finish time in logarithmic time.
-+ */
-+static void bfq_active_insert(struct bfq_service_tree *st,
-+			      struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *node = &entity->rb_node;
-+#ifdef CONFIG_CGROUP_BFQIO
-+	struct bfq_sched_data *sd = NULL;
-+	struct bfq_group *bfqg = NULL;
-+	struct bfq_data *bfqd = NULL;
-+#endif
-+
-+	bfq_insert(&st->active, entity);
-+
-+	if (node->rb_left != NULL)
-+		node = node->rb_left;
-+	else if (node->rb_right != NULL)
-+		node = node->rb_right;
-+
-+	bfq_update_active_tree(node);
-+
-+#ifdef CONFIG_CGROUP_BFQIO
-+	sd = entity->sched_data;
-+	bfqg = container_of(sd, struct bfq_group, sched_data);
-+	BUG_ON(!bfqg);
-+	bfqd = (struct bfq_data *)bfqg->bfqd;
-+#endif
-+	if (bfqq != NULL)
-+		list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list);
-+#ifdef CONFIG_CGROUP_BFQIO
-+	else { /* bfq_group */
-+		BUG_ON(!bfqd);
-+		bfq_weights_tree_add(bfqd, entity, &bfqd->group_weights_tree);
-+	}
-+	if (bfqg != bfqd->root_group) {
-+		BUG_ON(!bfqg);
-+		BUG_ON(!bfqd);
-+		bfqg->active_entities++;
-+		if (bfqg->active_entities == 2)
-+			bfqd->active_numerous_groups++;
-+	}
-+#endif
-+}
-+
-+/**
-+ * bfq_ioprio_to_weight - calc a weight from an ioprio.
-+ * @ioprio: the ioprio value to convert.
-+ */
-+static inline unsigned short bfq_ioprio_to_weight(int ioprio)
-+{
-+	BUG_ON(ioprio < 0 || ioprio >= IOPRIO_BE_NR);
-+	return IOPRIO_BE_NR - ioprio;
-+}
-+
-+/**
-+ * bfq_weight_to_ioprio - calc an ioprio from a weight.
-+ * @weight: the weight value to convert.
-+ *
-+ * To preserve as mush as possible the old only-ioprio user interface,
-+ * 0 is used as an escape ioprio value for weights (numerically) equal or
-+ * larger than IOPRIO_BE_NR
-+ */
-+static inline unsigned short bfq_weight_to_ioprio(int weight)
-+{
-+	BUG_ON(weight < BFQ_MIN_WEIGHT || weight > BFQ_MAX_WEIGHT);
-+	return IOPRIO_BE_NR - weight < 0 ? 0 : IOPRIO_BE_NR - weight;
-+}
-+
-+static inline void bfq_get_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	if (bfqq != NULL) {
-+		atomic_inc(&bfqq->ref);
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+	}
-+}
-+
-+/**
-+ * bfq_find_deepest - find the deepest node that an extraction can modify.
-+ * @node: the node being removed.
-+ *
-+ * Do the first step of an extraction in an rb tree, looking for the
-+ * node that will replace @node, and returning the deepest node that
-+ * the following modifications to the tree can touch.  If @node is the
-+ * last node in the tree return %NULL.
-+ */
-+static struct rb_node *bfq_find_deepest(struct rb_node *node)
-+{
-+	struct rb_node *deepest;
-+
-+	if (node->rb_right == NULL && node->rb_left == NULL)
-+		deepest = rb_parent(node);
-+	else if (node->rb_right == NULL)
-+		deepest = node->rb_left;
-+	else if (node->rb_left == NULL)
-+		deepest = node->rb_right;
-+	else {
-+		deepest = rb_next(node);
-+		if (deepest->rb_right != NULL)
-+			deepest = deepest->rb_right;
-+		else if (rb_parent(deepest) != node)
-+			deepest = rb_parent(deepest);
-+	}
-+
-+	return deepest;
-+}
-+
-+/**
-+ * bfq_active_extract - remove an entity from the active tree.
-+ * @st: the service_tree containing the tree.
-+ * @entity: the entity being removed.
-+ */
-+static void bfq_active_extract(struct bfq_service_tree *st,
-+			       struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *node;
-+#ifdef CONFIG_CGROUP_BFQIO
-+	struct bfq_sched_data *sd = NULL;
-+	struct bfq_group *bfqg = NULL;
-+	struct bfq_data *bfqd = NULL;
-+#endif
-+
-+	node = bfq_find_deepest(&entity->rb_node);
-+	bfq_extract(&st->active, entity);
-+
-+	if (node != NULL)
-+		bfq_update_active_tree(node);
-+
-+#ifdef CONFIG_CGROUP_BFQIO
-+	sd = entity->sched_data;
-+	bfqg = container_of(sd, struct bfq_group, sched_data);
-+	BUG_ON(!bfqg);
-+	bfqd = (struct bfq_data *)bfqg->bfqd;
-+#endif
-+	if (bfqq != NULL)
-+		list_del(&bfqq->bfqq_list);
-+#ifdef CONFIG_CGROUP_BFQIO
-+	else { /* bfq_group */
-+		BUG_ON(!bfqd);
-+		bfq_weights_tree_remove(bfqd, entity,
-+					&bfqd->group_weights_tree);
-+	}
-+	if (bfqg != bfqd->root_group) {
-+		BUG_ON(!bfqg);
-+		BUG_ON(!bfqd);
-+		BUG_ON(!bfqg->active_entities);
-+		bfqg->active_entities--;
-+		if (bfqg->active_entities == 1) {
-+			BUG_ON(!bfqd->active_numerous_groups);
-+			bfqd->active_numerous_groups--;
-+		}
-+	}
-+#endif
-+}
-+
-+/**
-+ * bfq_idle_insert - insert an entity into the idle tree.
-+ * @st: the service tree containing the tree.
-+ * @entity: the entity to insert.
-+ */
-+static void bfq_idle_insert(struct bfq_service_tree *st,
-+			    struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct bfq_entity *first_idle = st->first_idle;
-+	struct bfq_entity *last_idle = st->last_idle;
-+
-+	if (first_idle == NULL || bfq_gt(first_idle->finish, entity->finish))
-+		st->first_idle = entity;
-+	if (last_idle == NULL || bfq_gt(entity->finish, last_idle->finish))
-+		st->last_idle = entity;
-+
-+	bfq_insert(&st->idle, entity);
-+
-+	if (bfqq != NULL)
-+		list_add(&bfqq->bfqq_list, &bfqq->bfqd->idle_list);
-+}
-+
-+/**
-+ * bfq_forget_entity - remove an entity from the wfq trees.
-+ * @st: the service tree.
-+ * @entity: the entity being removed.
-+ *
-+ * Update the device status and forget everything about @entity, putting
-+ * the device reference to it, if it is a queue.  Entities belonging to
-+ * groups are not refcounted.
-+ */
-+static void bfq_forget_entity(struct bfq_service_tree *st,
-+			      struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct bfq_sched_data *sd;
-+
-+	BUG_ON(!entity->on_st);
-+
-+	entity->on_st = 0;
-+	st->wsum -= entity->weight;
-+	if (bfqq != NULL) {
-+		sd = entity->sched_data;
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "forget_entity: %p %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+	}
-+}
-+
-+/**
-+ * bfq_put_idle_entity - release the idle tree ref of an entity.
-+ * @st: service tree for the entity.
-+ * @entity: the entity being released.
-+ */
-+static void bfq_put_idle_entity(struct bfq_service_tree *st,
-+				struct bfq_entity *entity)
-+{
-+	bfq_idle_extract(st, entity);
-+	bfq_forget_entity(st, entity);
-+}
-+
-+/**
-+ * bfq_forget_idle - update the idle tree if necessary.
-+ * @st: the service tree to act upon.
-+ *
-+ * To preserve the global O(log N) complexity we only remove one entry here;
-+ * as the idle tree will not grow indefinitely this can be done safely.
-+ */
-+static void bfq_forget_idle(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *first_idle = st->first_idle;
-+	struct bfq_entity *last_idle = st->last_idle;
-+
-+	if (RB_EMPTY_ROOT(&st->active) && last_idle != NULL &&
-+	    !bfq_gt(last_idle->finish, st->vtime)) {
-+		/*
-+		 * Forget the whole idle tree, increasing the vtime past
-+		 * the last finish time of idle entities.
-+		 */
-+		st->vtime = last_idle->finish;
-+	}
-+
-+	if (first_idle != NULL && !bfq_gt(first_idle->finish, st->vtime))
-+		bfq_put_idle_entity(st, first_idle);
-+}
-+
-+static struct bfq_service_tree *
-+__bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
-+			 struct bfq_entity *entity)
-+{
-+	struct bfq_service_tree *new_st = old_st;
-+
-+	if (entity->ioprio_changed) {
-+		struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+		unsigned short prev_weight, new_weight;
-+		struct bfq_data *bfqd = NULL;
-+		struct rb_root *root;
-+#ifdef CONFIG_CGROUP_BFQIO
-+		struct bfq_sched_data *sd;
-+		struct bfq_group *bfqg;
-+#endif
-+
-+		if (bfqq != NULL)
-+			bfqd = bfqq->bfqd;
-+#ifdef CONFIG_CGROUP_BFQIO
-+		else {
-+			sd = entity->my_sched_data;
-+			bfqg = container_of(sd, struct bfq_group, sched_data);
-+			BUG_ON(!bfqg);
-+			bfqd = (struct bfq_data *)bfqg->bfqd;
-+			BUG_ON(!bfqd);
-+		}
-+#endif
-+
-+		BUG_ON(old_st->wsum < entity->weight);
-+		old_st->wsum -= entity->weight;
-+
-+		if (entity->new_weight != entity->orig_weight) {
-+			if (entity->new_weight < BFQ_MIN_WEIGHT ||
-+			    entity->new_weight > BFQ_MAX_WEIGHT) {
-+				printk(KERN_CRIT "update_weight_prio: "
-+						 "new_weight %d\n",
-+					entity->new_weight);
-+				BUG();
-+			}
-+			entity->orig_weight = entity->new_weight;
-+			entity->ioprio =
-+				bfq_weight_to_ioprio(entity->orig_weight);
-+		}
-+
-+		entity->ioprio_class = entity->new_ioprio_class;
-+		entity->ioprio_changed = 0;
-+
-+		/*
-+		 * NOTE: here we may be changing the weight too early,
-+		 * this will cause unfairness.  The correct approach
-+		 * would have required additional complexity to defer
-+		 * weight changes to the proper time instants (i.e.,
-+		 * when entity->finish <= old_st->vtime).
-+		 */
-+		new_st = bfq_entity_service_tree(entity);
-+
-+		prev_weight = entity->weight;
-+		new_weight = entity->orig_weight *
-+			     (bfqq != NULL ? bfqq->wr_coeff : 1);
-+		/*
-+		 * If the weight of the entity changes, remove the entity
-+		 * from its old weight counter (if there is a counter
-+		 * associated with the entity), and add it to the counter
-+		 * associated with its new weight.
-+		 */
-+		if (prev_weight != new_weight) {
-+			root = bfqq ? &bfqd->queue_weights_tree :
-+				      &bfqd->group_weights_tree;
-+			bfq_weights_tree_remove(bfqd, entity, root);
-+		}
-+		entity->weight = new_weight;
-+		/*
-+		 * Add the entity to its weights tree only if it is
-+		 * not associated with a weight-raised queue.
-+		 */
-+		if (prev_weight != new_weight &&
-+		    (bfqq ? bfqq->wr_coeff == 1 : 1))
-+			/* If we get here, root has been initialized. */
-+			bfq_weights_tree_add(bfqd, entity, root);
-+
-+		new_st->wsum += entity->weight;
-+
-+		if (new_st != old_st)
-+			entity->start = new_st->vtime;
-+	}
-+
-+	return new_st;
-+}
-+
-+/**
-+ * bfq_bfqq_served - update the scheduler status after selection for
-+ *                   service.
-+ * @bfqq: the queue being served.
-+ * @served: bytes to transfer.
-+ *
-+ * NOTE: this can be optimized, as the timestamps of upper level entities
-+ * are synchronized every time a new bfqq is selected for service.  By now,
-+ * we keep it to better check consistency.
-+ */
-+static void bfq_bfqq_served(struct bfq_queue *bfqq, unsigned long served)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_service_tree *st;
-+
-+	for_each_entity(entity) {
-+		st = bfq_entity_service_tree(entity);
-+
-+		entity->service += served;
-+		BUG_ON(entity->service > entity->budget);
-+		BUG_ON(st->wsum == 0);
-+
-+		st->vtime += bfq_delta(served, st->wsum);
-+		bfq_forget_idle(st);
-+	}
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "bfqq_served %lu secs", served);
-+}
-+
-+/**
-+ * bfq_bfqq_charge_full_budget - set the service to the entity budget.
-+ * @bfqq: the queue that needs a service update.
-+ *
-+ * When it's not possible to be fair in the service domain, because
-+ * a queue is not consuming its budget fast enough (the meaning of
-+ * fast depends on the timeout parameter), we charge it a full
-+ * budget.  In this way we should obtain a sort of time-domain
-+ * fairness among all the seeky/slow queues.
-+ */
-+static inline void bfq_bfqq_charge_full_budget(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "charge_full_budget");
-+
-+	bfq_bfqq_served(bfqq, entity->budget - entity->service);
-+}
-+
-+/**
-+ * __bfq_activate_entity - activate an entity.
-+ * @entity: the entity being activated.
-+ *
-+ * Called whenever an entity is activated, i.e., it is not active and one
-+ * of its children receives a new request, or has to be reactivated due to
-+ * budget exhaustion.  It uses the current budget of the entity (and the
-+ * service received if @entity is active) of the queue to calculate its
-+ * timestamps.
-+ */
-+static void __bfq_activate_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sd = entity->sched_data;
-+	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+
-+	if (entity == sd->in_service_entity) {
-+		BUG_ON(entity->tree != NULL);
-+		/*
-+		 * If we are requeueing the current entity we have
-+		 * to take care of not charging to it service it has
-+		 * not received.
-+		 */
-+		bfq_calc_finish(entity, entity->service);
-+		entity->start = entity->finish;
-+		sd->in_service_entity = NULL;
-+	} else if (entity->tree == &st->active) {
-+		/*
-+		 * Requeueing an entity due to a change of some
-+		 * next_in_service entity below it.  We reuse the
-+		 * old start time.
-+		 */
-+		bfq_active_extract(st, entity);
-+	} else if (entity->tree == &st->idle) {
-+		/*
-+		 * Must be on the idle tree, bfq_idle_extract() will
-+		 * check for that.
-+		 */
-+		bfq_idle_extract(st, entity);
-+		entity->start = bfq_gt(st->vtime, entity->finish) ?
-+				       st->vtime : entity->finish;
-+	} else {
-+		/*
-+		 * The finish time of the entity may be invalid, and
-+		 * it is in the past for sure, otherwise the queue
-+		 * would have been on the idle tree.
-+		 */
-+		entity->start = st->vtime;
-+		st->wsum += entity->weight;
-+		bfq_get_entity(entity);
-+
-+		BUG_ON(entity->on_st);
-+		entity->on_st = 1;
-+	}
-+
-+	st = __bfq_entity_update_weight_prio(st, entity);
-+	bfq_calc_finish(entity, entity->budget);
-+	bfq_active_insert(st, entity);
-+}
-+
-+/**
-+ * bfq_activate_entity - activate an entity and its ancestors if necessary.
-+ * @entity: the entity to activate.
-+ *
-+ * Activate @entity and all the entities on the path from it to the root.
-+ */
-+static void bfq_activate_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sd;
-+
-+	for_each_entity(entity) {
-+		__bfq_activate_entity(entity);
-+
-+		sd = entity->sched_data;
-+		if (!bfq_update_next_in_service(sd))
-+			/*
-+			 * No need to propagate the activation to the
-+			 * upper entities, as they will be updated when
-+			 * the in-service entity is rescheduled.
-+			 */
-+			break;
-+	}
-+}
-+
-+/**
-+ * __bfq_deactivate_entity - deactivate an entity from its service tree.
-+ * @entity: the entity to deactivate.
-+ * @requeue: if false, the entity will not be put into the idle tree.
-+ *
-+ * Deactivate an entity, independently from its previous state.  If the
-+ * entity was not on a service tree just return, otherwise if it is on
-+ * any scheduler tree, extract it from that tree, and if necessary
-+ * and if the caller did not specify @requeue, put it on the idle tree.
-+ *
-+ * Return %1 if the caller should update the entity hierarchy, i.e.,
-+ * if the entity was in service or if it was the next_in_service for
-+ * its sched_data; return %0 otherwise.
-+ */
-+static int __bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
-+{
-+	struct bfq_sched_data *sd = entity->sched_data;
-+	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+	int was_in_service = entity == sd->in_service_entity;
-+	int ret = 0;
-+
-+	if (!entity->on_st)
-+		return 0;
-+
-+	BUG_ON(was_in_service && entity->tree != NULL);
-+
-+	if (was_in_service) {
-+		bfq_calc_finish(entity, entity->service);
-+		sd->in_service_entity = NULL;
-+	} else if (entity->tree == &st->active)
-+		bfq_active_extract(st, entity);
-+	else if (entity->tree == &st->idle)
-+		bfq_idle_extract(st, entity);
-+	else if (entity->tree != NULL)
-+		BUG();
-+
-+	if (was_in_service || sd->next_in_service == entity)
-+		ret = bfq_update_next_in_service(sd);
-+
-+	if (!requeue || !bfq_gt(entity->finish, st->vtime))
-+		bfq_forget_entity(st, entity);
-+	else
-+		bfq_idle_insert(st, entity);
-+
-+	BUG_ON(sd->in_service_entity == entity);
-+	BUG_ON(sd->next_in_service == entity);
-+
-+	return ret;
-+}
-+
-+/**
-+ * bfq_deactivate_entity - deactivate an entity.
-+ * @entity: the entity to deactivate.
-+ * @requeue: true if the entity can be put on the idle tree
-+ */
-+static void bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
-+{
-+	struct bfq_sched_data *sd;
-+	struct bfq_entity *parent;
-+
-+	for_each_entity_safe(entity, parent) {
-+		sd = entity->sched_data;
-+
-+		if (!__bfq_deactivate_entity(entity, requeue))
-+			/*
-+			 * The parent entity is still backlogged, and
-+			 * we don't need to update it as it is still
-+			 * in service.
-+			 */
-+			break;
-+
-+		if (sd->next_in_service != NULL)
-+			/*
-+			 * The parent entity is still backlogged and
-+			 * the budgets on the path towards the root
-+			 * need to be updated.
-+			 */
-+			goto update;
-+
-+		/*
-+		 * If we reach there the parent is no more backlogged and
-+		 * we want to propagate the dequeue upwards.
-+		 */
-+		requeue = 1;
-+	}
-+
-+	return;
-+
-+update:
-+	entity = parent;
-+	for_each_entity(entity) {
-+		__bfq_activate_entity(entity);
-+
-+		sd = entity->sched_data;
-+		if (!bfq_update_next_in_service(sd))
-+			break;
-+	}
-+}
-+
-+/**
-+ * bfq_update_vtime - update vtime if necessary.
-+ * @st: the service tree to act upon.
-+ *
-+ * If necessary update the service tree vtime to have at least one
-+ * eligible entity, skipping to its start time.  Assumes that the
-+ * active tree of the device is not empty.
-+ *
-+ * NOTE: this hierarchical implementation updates vtimes quite often,
-+ * we may end up with reactivated processes getting timestamps after a
-+ * vtime skip done because we needed a ->first_active entity on some
-+ * intermediate node.
-+ */
-+static void bfq_update_vtime(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entry;
-+	struct rb_node *node = st->active.rb_node;
-+
-+	entry = rb_entry(node, struct bfq_entity, rb_node);
-+	if (bfq_gt(entry->min_start, st->vtime)) {
-+		st->vtime = entry->min_start;
-+		bfq_forget_idle(st);
-+	}
-+}
-+
-+/**
-+ * bfq_first_active_entity - find the eligible entity with
-+ *                           the smallest finish time
-+ * @st: the service tree to select from.
-+ *
-+ * This function searches the first schedulable entity, starting from the
-+ * root of the tree and going on the left every time on this side there is
-+ * a subtree with at least one eligible (start >= vtime) entity. The path on
-+ * the right is followed only if a) the left subtree contains no eligible
-+ * entities and b) no eligible entity has been found yet.
-+ */
-+static struct bfq_entity *bfq_first_active_entity(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entry, *first = NULL;
-+	struct rb_node *node = st->active.rb_node;
-+
-+	while (node != NULL) {
-+		entry = rb_entry(node, struct bfq_entity, rb_node);
-+left:
-+		if (!bfq_gt(entry->start, st->vtime))
-+			first = entry;
-+
-+		BUG_ON(bfq_gt(entry->min_start, st->vtime));
-+
-+		if (node->rb_left != NULL) {
-+			entry = rb_entry(node->rb_left,
-+					 struct bfq_entity, rb_node);
-+			if (!bfq_gt(entry->min_start, st->vtime)) {
-+				node = node->rb_left;
-+				goto left;
-+			}
-+		}
-+		if (first != NULL)
-+			break;
-+		node = node->rb_right;
-+	}
-+
-+	BUG_ON(first == NULL && !RB_EMPTY_ROOT(&st->active));
-+	return first;
-+}
-+
-+/**
-+ * __bfq_lookup_next_entity - return the first eligible entity in @st.
-+ * @st: the service tree.
-+ *
-+ * Update the virtual time in @st and return the first eligible entity
-+ * it contains.
-+ */
-+static struct bfq_entity *__bfq_lookup_next_entity(struct bfq_service_tree *st,
-+						   bool force)
-+{
-+	struct bfq_entity *entity, *new_next_in_service = NULL;
-+
-+	if (RB_EMPTY_ROOT(&st->active))
-+		return NULL;
-+
-+	bfq_update_vtime(st);
-+	entity = bfq_first_active_entity(st);
-+	BUG_ON(bfq_gt(entity->start, st->vtime));
-+
-+	/*
-+	 * If the chosen entity does not match with the sched_data's
-+	 * next_in_service and we are forcedly serving the IDLE priority
-+	 * class tree, bubble up budget update.
-+	 */
-+	if (unlikely(force && entity != entity->sched_data->next_in_service)) {
-+		new_next_in_service = entity;
-+		for_each_entity(new_next_in_service)
-+			bfq_update_budget(new_next_in_service);
-+	}
-+
-+	return entity;
-+}
-+
-+/**
-+ * bfq_lookup_next_entity - return the first eligible entity in @sd.
-+ * @sd: the sched_data.
-+ * @extract: if true the returned entity will be also extracted from @sd.
-+ *
-+ * NOTE: since we cache the next_in_service entity at each level of the
-+ * hierarchy, the complexity of the lookup can be decreased with
-+ * absolutely no effort just returning the cached next_in_service value;
-+ * we prefer to do full lookups to test the consistency of * the data
-+ * structures.
-+ */
-+static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
-+						 int extract,
-+						 struct bfq_data *bfqd)
-+{
-+	struct bfq_service_tree *st = sd->service_tree;
-+	struct bfq_entity *entity;
-+	int i = 0;
-+
-+	BUG_ON(sd->in_service_entity != NULL);
-+
-+	if (bfqd != NULL &&
-+	    jiffies - bfqd->bfq_class_idle_last_service > BFQ_CL_IDLE_TIMEOUT) {
-+		entity = __bfq_lookup_next_entity(st + BFQ_IOPRIO_CLASSES - 1,
-+						  true);
-+		if (entity != NULL) {
-+			i = BFQ_IOPRIO_CLASSES - 1;
-+			bfqd->bfq_class_idle_last_service = jiffies;
-+			sd->next_in_service = entity;
-+		}
-+	}
-+	for (; i < BFQ_IOPRIO_CLASSES; i++) {
-+		entity = __bfq_lookup_next_entity(st + i, false);
-+		if (entity != NULL) {
-+			if (extract) {
-+				bfq_check_next_in_service(sd, entity);
-+				bfq_active_extract(st + i, entity);
-+				sd->in_service_entity = entity;
-+				sd->next_in_service = NULL;
-+			}
-+			break;
-+		}
-+	}
-+
-+	return entity;
-+}
-+
-+/*
-+ * Get next queue for service.
-+ */
-+static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_entity *entity = NULL;
-+	struct bfq_sched_data *sd;
-+	struct bfq_queue *bfqq;
-+
-+	BUG_ON(bfqd->in_service_queue != NULL);
-+
-+	if (bfqd->busy_queues == 0)
-+		return NULL;
-+
-+	sd = &bfqd->root_group->sched_data;
-+	for (; sd != NULL; sd = entity->my_sched_data) {
-+		entity = bfq_lookup_next_entity(sd, 1, bfqd);
-+		BUG_ON(entity == NULL);
-+		entity->service = 0;
-+	}
-+
-+	bfqq = bfq_entity_to_bfqq(entity);
-+	BUG_ON(bfqq == NULL);
-+
-+	return bfqq;
-+}
-+
-+/*
-+ * Forced extraction of the given queue.
-+ */
-+static void bfq_get_next_queue_forced(struct bfq_data *bfqd,
-+				      struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity;
-+	struct bfq_sched_data *sd;
-+
-+	BUG_ON(bfqd->in_service_queue != NULL);
-+
-+	entity = &bfqq->entity;
-+	/*
-+	 * Bubble up extraction/update from the leaf to the root.
-+	*/
-+	for_each_entity(entity) {
-+		sd = entity->sched_data;
-+		bfq_update_budget(entity);
-+		bfq_update_vtime(bfq_entity_service_tree(entity));
-+		bfq_active_extract(bfq_entity_service_tree(entity), entity);
-+		sd->in_service_entity = entity;
-+		sd->next_in_service = NULL;
-+		entity->service = 0;
-+	}
-+
-+	return;
-+}
-+
-+static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)
-+{
-+	if (bfqd->in_service_bic != NULL) {
-+		put_io_context(bfqd->in_service_bic->icq.ioc);
-+		bfqd->in_service_bic = NULL;
-+	}
-+
-+	bfqd->in_service_queue = NULL;
-+	del_timer(&bfqd->idle_slice_timer);
-+}
-+
-+static void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				int requeue)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	if (bfqq == bfqd->in_service_queue)
-+		__bfq_bfqd_reset_in_service(bfqd);
-+
-+	bfq_deactivate_entity(entity, requeue);
-+}
-+
-+static void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	bfq_activate_entity(entity);
-+}
-+
-+/*
-+ * Called when the bfqq no longer has requests pending, remove it from
-+ * the service tree.
-+ */
-+static void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			      int requeue)
-+{
-+	BUG_ON(!bfq_bfqq_busy(bfqq));
-+	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	bfq_log_bfqq(bfqd, bfqq, "del from busy");
-+
-+	bfq_clear_bfqq_busy(bfqq);
-+
-+	BUG_ON(bfqd->busy_queues == 0);
-+	bfqd->busy_queues--;
-+
-+	if (!bfqq->dispatched) {
-+		bfq_weights_tree_remove(bfqd, &bfqq->entity,
-+					&bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->busy_in_flight_queues);
-+			bfqd->busy_in_flight_queues--;
-+			if (bfq_bfqq_constantly_seeky(bfqq)) {
-+				BUG_ON(!bfqd->
-+					const_seeky_busy_in_flight_queues);
-+				bfqd->const_seeky_busy_in_flight_queues--;
-+			}
-+		}
-+	}
-+	if (bfqq->wr_coeff > 1)
-+		bfqd->wr_busy_queues--;
-+
-+	bfq_deactivate_bfqq(bfqd, bfqq, requeue);
-+}
-+
-+/*
-+ * Called when an inactive queue receives a new request.
-+ */
-+static void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	BUG_ON(bfq_bfqq_busy(bfqq));
-+	BUG_ON(bfqq == bfqd->in_service_queue);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "add to busy");
-+
-+	bfq_activate_bfqq(bfqd, bfqq);
-+
-+	bfq_mark_bfqq_busy(bfqq);
-+	bfqd->busy_queues++;
-+
-+	if (!bfqq->dispatched) {
-+		if (bfqq->wr_coeff == 1)
-+			bfq_weights_tree_add(bfqd, &bfqq->entity,
-+					     &bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			bfqd->busy_in_flight_queues++;
-+			if (bfq_bfqq_constantly_seeky(bfqq))
-+				bfqd->const_seeky_busy_in_flight_queues++;
-+		}
-+	}
-+	if (bfqq->wr_coeff > 1)
-+		bfqd->wr_busy_queues++;
-+}
-diff --git a/block/bfq.h b/block/bfq.h
-new file mode 100644
-index 0000000..00feff7
---- /dev/null
-+++ b/block/bfq.h
-@@ -0,0 +1,771 @@
-+/*
-+ * BFQ-v7r8 for 4.1.0: data structures and common functions prototypes.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+#ifndef _BFQ_H
-+#define _BFQ_H
-+
-+#include <linux/blktrace_api.h>
-+#include <linux/hrtimer.h>
-+#include <linux/ioprio.h>
-+#include <linux/rbtree.h>
-+
-+#define BFQ_IOPRIO_CLASSES	3
-+#define BFQ_CL_IDLE_TIMEOUT	(HZ/5)
-+
-+#define BFQ_MIN_WEIGHT	1
-+#define BFQ_MAX_WEIGHT	1000
-+
-+#define BFQ_DEFAULT_QUEUE_IOPRIO	4
-+
-+#define BFQ_DEFAULT_GRP_WEIGHT	10
-+#define BFQ_DEFAULT_GRP_IOPRIO	0
-+#define BFQ_DEFAULT_GRP_CLASS	IOPRIO_CLASS_BE
-+
-+struct bfq_entity;
-+
-+/**
-+ * struct bfq_service_tree - per ioprio_class service tree.
-+ * @active: tree for active entities (i.e., those backlogged).
-+ * @idle: tree for idle entities (i.e., those not backlogged, with V <= F_i).
-+ * @first_idle: idle entity with minimum F_i.
-+ * @last_idle: idle entity with maximum F_i.
-+ * @vtime: scheduler virtual time.
-+ * @wsum: scheduler weight sum; active and idle entities contribute to it.
-+ *
-+ * Each service tree represents a B-WF2Q+ scheduler on its own.  Each
-+ * ioprio_class has its own independent scheduler, and so its own
-+ * bfq_service_tree.  All the fields are protected by the queue lock
-+ * of the containing bfqd.
-+ */
-+struct bfq_service_tree {
-+	struct rb_root active;
-+	struct rb_root idle;
-+
-+	struct bfq_entity *first_idle;
-+	struct bfq_entity *last_idle;
-+
-+	u64 vtime;
-+	unsigned long wsum;
-+};
-+
-+/**
-+ * struct bfq_sched_data - multi-class scheduler.
-+ * @in_service_entity: entity in service.
-+ * @next_in_service: head-of-the-line entity in the scheduler.
-+ * @service_tree: array of service trees, one per ioprio_class.
-+ *
-+ * bfq_sched_data is the basic scheduler queue.  It supports three
-+ * ioprio_classes, and can be used either as a toplevel queue or as
-+ * an intermediate queue on a hierarchical setup.
-+ * @next_in_service points to the active entity of the sched_data
-+ * service trees that will be scheduled next.
-+ *
-+ * The supported ioprio_classes are the same as in CFQ, in descending
-+ * priority order, IOPRIO_CLASS_RT, IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE.
-+ * Requests from higher priority queues are served before all the
-+ * requests from lower priority queues; among requests of the same
-+ * queue requests are served according to B-WF2Q+.
-+ * All the fields are protected by the queue lock of the containing bfqd.
-+ */
-+struct bfq_sched_data {
-+	struct bfq_entity *in_service_entity;
-+	struct bfq_entity *next_in_service;
-+	struct bfq_service_tree service_tree[BFQ_IOPRIO_CLASSES];
-+};
-+
-+/**
-+ * struct bfq_weight_counter - counter of the number of all active entities
-+ *                             with a given weight.
-+ * @weight: weight of the entities that this counter refers to.
-+ * @num_active: number of active entities with this weight.
-+ * @weights_node: weights tree member (see bfq_data's @queue_weights_tree
-+ *                and @group_weights_tree).
-+ */
-+struct bfq_weight_counter {
-+	short int weight;
-+	unsigned int num_active;
-+	struct rb_node weights_node;
-+};
-+
-+/**
-+ * struct bfq_entity - schedulable entity.
-+ * @rb_node: service_tree member.
-+ * @weight_counter: pointer to the weight counter associated with this entity.
-+ * @on_st: flag, true if the entity is on a tree (either the active or
-+ *         the idle one of its service_tree).
-+ * @finish: B-WF2Q+ finish timestamp (aka F_i).
-+ * @start: B-WF2Q+ start timestamp (aka S_i).
-+ * @tree: tree the entity is enqueued into; %NULL if not on a tree.
-+ * @min_start: minimum start time of the (active) subtree rooted at
-+ *             this entity; used for O(log N) lookups into active trees.
-+ * @service: service received during the last round of service.
-+ * @budget: budget used to calculate F_i; F_i = S_i + @budget / @weight.
-+ * @weight: weight of the queue
-+ * @parent: parent entity, for hierarchical scheduling.
-+ * @my_sched_data: for non-leaf nodes in the cgroup hierarchy, the
-+ *                 associated scheduler queue, %NULL on leaf nodes.
-+ * @sched_data: the scheduler queue this entity belongs to.
-+ * @ioprio: the ioprio in use.
-+ * @new_weight: when a weight change is requested, the new weight value.
-+ * @orig_weight: original weight, used to implement weight boosting
-+ * @new_ioprio: when an ioprio change is requested, the new ioprio value.
-+ * @ioprio_class: the ioprio_class in use.
-+ * @new_ioprio_class: when an ioprio_class change is requested, the new
-+ *                    ioprio_class value.
-+ * @ioprio_changed: flag, true when the user requested a weight, ioprio or
-+ *                  ioprio_class change.
-+ *
-+ * A bfq_entity is used to represent either a bfq_queue (leaf node in the
-+ * cgroup hierarchy) or a bfq_group into the upper level scheduler.  Each
-+ * entity belongs to the sched_data of the parent group in the cgroup
-+ * hierarchy.  Non-leaf entities have also their own sched_data, stored
-+ * in @my_sched_data.
-+ *
-+ * Each entity stores independently its priority values; this would
-+ * allow different weights on different devices, but this
-+ * functionality is not exported to userspace by now.  Priorities and
-+ * weights are updated lazily, first storing the new values into the
-+ * new_* fields, then setting the @ioprio_changed flag.  As soon as
-+ * there is a transition in the entity state that allows the priority
-+ * update to take place the effective and the requested priority
-+ * values are synchronized.
-+ *
-+ * Unless cgroups are used, the weight value is calculated from the
-+ * ioprio to export the same interface as CFQ.  When dealing with
-+ * ``well-behaved'' queues (i.e., queues that do not spend too much
-+ * time to consume their budget and have true sequential behavior, and
-+ * when there are no external factors breaking anticipation) the
-+ * relative weights at each level of the cgroups hierarchy should be
-+ * guaranteed.  All the fields are protected by the queue lock of the
-+ * containing bfqd.
-+ */
-+struct bfq_entity {
-+	struct rb_node rb_node;
-+	struct bfq_weight_counter *weight_counter;
-+
-+	int on_st;
-+
-+	u64 finish;
-+	u64 start;
-+
-+	struct rb_root *tree;
-+
-+	u64 min_start;
-+
-+	unsigned long service, budget;
-+	unsigned short weight, new_weight;
-+	unsigned short orig_weight;
-+
-+	struct bfq_entity *parent;
-+
-+	struct bfq_sched_data *my_sched_data;
-+	struct bfq_sched_data *sched_data;
-+
-+	unsigned short ioprio, new_ioprio;
-+	unsigned short ioprio_class, new_ioprio_class;
-+
-+	int ioprio_changed;
-+};
-+
-+struct bfq_group;
-+
-+/**
-+ * struct bfq_queue - leaf schedulable entity.
-+ * @ref: reference counter.
-+ * @bfqd: parent bfq_data.
-+ * @new_bfqq: shared bfq_queue if queue is cooperating with
-+ *           one or more other queues.
-+ * @pos_node: request-position tree member (see bfq_data's @rq_pos_tree).
-+ * @pos_root: request-position tree root (see bfq_data's @rq_pos_tree).
-+ * @sort_list: sorted list of pending requests.
-+ * @next_rq: if fifo isn't expired, next request to serve.
-+ * @queued: nr of requests queued in @sort_list.
-+ * @allocated: currently allocated requests.
-+ * @meta_pending: pending metadata requests.
-+ * @fifo: fifo list of requests in sort_list.
-+ * @entity: entity representing this queue in the scheduler.
-+ * @max_budget: maximum budget allowed from the feedback mechanism.
-+ * @budget_timeout: budget expiration (in jiffies).
-+ * @dispatched: number of requests on the dispatch list or inside driver.
-+ * @flags: status flags.
-+ * @bfqq_list: node for active/idle bfqq list inside our bfqd.
-+ * @burst_list_node: node for the device's burst list.
-+ * @seek_samples: number of seeks sampled
-+ * @seek_total: sum of the distances of the seeks sampled
-+ * @seek_mean: mean seek distance
-+ * @last_request_pos: position of the last request enqueued
-+ * @requests_within_timer: number of consecutive pairs of request completion
-+ *                         and arrival, such that the queue becomes idle
-+ *                         after the completion, but the next request arrives
-+ *                         within an idle time slice; used only if the queue's
-+ *                         IO_bound has been cleared.
-+ * @pid: pid of the process owning the queue, used for logging purposes.
-+ * @last_wr_start_finish: start time of the current weight-raising period if
-+ *                        the @bfq-queue is being weight-raised, otherwise
-+ *                        finish time of the last weight-raising period
-+ * @wr_cur_max_time: current max raising time for this queue
-+ * @soft_rt_next_start: minimum time instant such that, only if a new
-+ *                      request is enqueued after this time instant in an
-+ *                      idle @bfq_queue with no outstanding requests, then
-+ *                      the task associated with the queue it is deemed as
-+ *                      soft real-time (see the comments to the function
-+ *                      bfq_bfqq_softrt_next_start()).
-+ * @last_idle_bklogged: time of the last transition of the @bfq_queue from
-+ *                      idle to backlogged
-+ * @service_from_backlogged: cumulative service received from the @bfq_queue
-+ *                           since the last transition from idle to
-+ *                           backlogged
-+ *
-+ * A bfq_queue is a leaf request queue; it can be associated with an io_context
-+ * or more, if it is async or shared between cooperating processes. @cgroup
-+ * holds a reference to the cgroup, to be sure that it does not disappear while
-+ * a bfqq still references it (mostly to avoid races between request issuing and
-+ * task migration followed by cgroup destruction).
-+ * All the fields are protected by the queue lock of the containing bfqd.
-+ */
-+struct bfq_queue {
-+	atomic_t ref;
-+	struct bfq_data *bfqd;
-+
-+	/* fields for cooperating queues handling */
-+	struct bfq_queue *new_bfqq;
-+	struct rb_node pos_node;
-+	struct rb_root *pos_root;
-+
-+	struct rb_root sort_list;
-+	struct request *next_rq;
-+	int queued[2];
-+	int allocated[2];
-+	int meta_pending;
-+	struct list_head fifo;
-+
-+	struct bfq_entity entity;
-+
-+	unsigned long max_budget;
-+	unsigned long budget_timeout;
-+
-+	int dispatched;
-+
-+	unsigned int flags;
-+
-+	struct list_head bfqq_list;
-+
-+	struct hlist_node burst_list_node;
-+
-+	unsigned int seek_samples;
-+	u64 seek_total;
-+	sector_t seek_mean;
-+	sector_t last_request_pos;
-+
-+	unsigned int requests_within_timer;
-+
-+	pid_t pid;
-+
-+	/* weight-raising fields */
-+	unsigned long wr_cur_max_time;
-+	unsigned long soft_rt_next_start;
-+	unsigned long last_wr_start_finish;
-+	unsigned int wr_coeff;
-+	unsigned long last_idle_bklogged;
-+	unsigned long service_from_backlogged;
-+};
-+
-+/**
-+ * struct bfq_ttime - per process thinktime stats.
-+ * @ttime_total: total process thinktime
-+ * @ttime_samples: number of thinktime samples
-+ * @ttime_mean: average process thinktime
-+ */
-+struct bfq_ttime {
-+	unsigned long last_end_request;
-+
-+	unsigned long ttime_total;
-+	unsigned long ttime_samples;
-+	unsigned long ttime_mean;
-+};
-+
-+/**
-+ * struct bfq_io_cq - per (request_queue, io_context) structure.
-+ * @icq: associated io_cq structure
-+ * @bfqq: array of two process queues, the sync and the async
-+ * @ttime: associated @bfq_ttime struct
-+ */
-+struct bfq_io_cq {
-+	struct io_cq icq; /* must be the first member */
-+	struct bfq_queue *bfqq[2];
-+	struct bfq_ttime ttime;
-+	int ioprio;
-+};
-+
-+enum bfq_device_speed {
-+	BFQ_BFQD_FAST,
-+	BFQ_BFQD_SLOW,
-+};
-+
-+/**
-+ * struct bfq_data - per device data structure.
-+ * @queue: request queue for the managed device.
-+ * @root_group: root bfq_group for the device.
-+ * @rq_pos_tree: rbtree sorted by next_request position, used when
-+ *               determining if two or more queues have interleaving
-+ *               requests (see bfq_close_cooperator()).
-+ * @active_numerous_groups: number of bfq_groups containing more than one
-+ *                          active @bfq_entity.
-+ * @queue_weights_tree: rbtree of weight counters of @bfq_queues, sorted by
-+ *                      weight. Used to keep track of whether all @bfq_queues
-+ *                     have the same weight. The tree contains one counter
-+ *                     for each distinct weight associated to some active
-+ *                     and not weight-raised @bfq_queue (see the comments to
-+ *                      the functions bfq_weights_tree_[add|remove] for
-+ *                     further details).
-+ * @group_weights_tree: rbtree of non-queue @bfq_entity weight counters, sorted
-+ *                      by weight. Used to keep track of whether all
-+ *                     @bfq_groups have the same weight. The tree contains
-+ *                     one counter for each distinct weight associated to
-+ *                     some active @bfq_group (see the comments to the
-+ *                     functions bfq_weights_tree_[add|remove] for further
-+ *                     details).
-+ * @busy_queues: number of bfq_queues containing requests (including the
-+ *		 queue in service, even if it is idling).
-+ * @busy_in_flight_queues: number of @bfq_queues containing pending or
-+ *                         in-flight requests, plus the @bfq_queue in
-+ *                         service, even if idle but waiting for the
-+ *                         possible arrival of its next sync request. This
-+ *                         field is updated only if the device is rotational,
-+ *                         but used only if the device is also NCQ-capable.
-+ *                         The reason why the field is updated also for non-
-+ *                         NCQ-capable rotational devices is related to the
-+ *                         fact that the value of @hw_tag may be set also
-+ *                         later than when busy_in_flight_queues may need to
-+ *                         be incremented for the first time(s). Taking also
-+ *                         this possibility into account, to avoid unbalanced
-+ *                         increments/decrements, would imply more overhead
-+ *                         than just updating busy_in_flight_queues
-+ *                         regardless of the value of @hw_tag.
-+ * @const_seeky_busy_in_flight_queues: number of constantly-seeky @bfq_queues
-+ *                                     (that is, seeky queues that expired
-+ *                                     for budget timeout at least once)
-+ *                                     containing pending or in-flight
-+ *                                     requests, including the in-service
-+ *                                     @bfq_queue if constantly seeky. This
-+ *                                     field is updated only if the device
-+ *                                     is rotational, but used only if the
-+ *                                     device is also NCQ-capable (see the
-+ *                                     comments to @busy_in_flight_queues).
-+ * @wr_busy_queues: number of weight-raised busy @bfq_queues.
-+ * @queued: number of queued requests.
-+ * @rq_in_driver: number of requests dispatched and waiting for completion.
-+ * @sync_flight: number of sync requests in the driver.
-+ * @max_rq_in_driver: max number of reqs in driver in the last
-+ *                    @hw_tag_samples completed requests.
-+ * @hw_tag_samples: nr of samples used to calculate hw_tag.
-+ * @hw_tag: flag set to one if the driver is showing a queueing behavior.
-+ * @budgets_assigned: number of budgets assigned.
-+ * @idle_slice_timer: timer set when idling for the next sequential request
-+ *                    from the queue in service.
-+ * @unplug_work: delayed work to restart dispatching on the request queue.
-+ * @in_service_queue: bfq_queue in service.
-+ * @in_service_bic: bfq_io_cq (bic) associated with the @in_service_queue.
-+ * @last_position: on-disk position of the last served request.
-+ * @last_budget_start: beginning of the last budget.
-+ * @last_idling_start: beginning of the last idle slice.
-+ * @peak_rate: peak transfer rate observed for a budget.
-+ * @peak_rate_samples: number of samples used to calculate @peak_rate.
-+ * @bfq_max_budget: maximum budget allotted to a bfq_queue before
-+ *                  rescheduling.
-+ * @group_list: list of all the bfq_groups active on the device.
-+ * @active_list: list of all the bfq_queues active on the device.
-+ * @idle_list: list of all the bfq_queues idle on the device.
-+ * @bfq_fifo_expire: timeout for async/sync requests; when it expires
-+ *                   requests are served in fifo order.
-+ * @bfq_back_penalty: weight of backward seeks wrt forward ones.
-+ * @bfq_back_max: maximum allowed backward seek.
-+ * @bfq_slice_idle: maximum idling time.
-+ * @bfq_user_max_budget: user-configured max budget value
-+ *                       (0 for auto-tuning).
-+ * @bfq_max_budget_async_rq: maximum budget (in nr of requests) allotted to
-+ *                           async queues.
-+ * @bfq_timeout: timeout for bfq_queues to consume their budget; used to
-+ *               to prevent seeky queues to impose long latencies to well
-+ *               behaved ones (this also implies that seeky queues cannot
-+ *               receive guarantees in the service domain; after a timeout
-+ *               they are charged for the whole allocated budget, to try
-+ *               to preserve a behavior reasonably fair among them, but
-+ *               without service-domain guarantees).
-+ * @bfq_coop_thresh: number of queue merges after which a @bfq_queue is
-+ *                   no more granted any weight-raising.
-+ * @bfq_failed_cooperations: number of consecutive failed cooperation
-+ *                           chances after which weight-raising is restored
-+ *                           to a queue subject to more than bfq_coop_thresh
-+ *                           queue merges.
-+ * @bfq_requests_within_timer: number of consecutive requests that must be
-+ *                             issued within the idle time slice to set
-+ *                             again idling to a queue which was marked as
-+ *                             non-I/O-bound (see the definition of the
-+ *                             IO_bound flag for further details).
-+ * @last_ins_in_burst: last time at which a queue entered the current
-+ *                     burst of queues being activated shortly after
-+ *                     each other; for more details about this and the
-+ *                     following parameters related to a burst of
-+ *                     activations, see the comments to the function
-+ *                     @bfq_handle_burst.
-+ * @bfq_burst_interval: reference time interval used to decide whether a
-+ *                      queue has been activated shortly after
-+ *                      @last_ins_in_burst.
-+ * @burst_size: number of queues in the current burst of queue activations.
-+ * @bfq_large_burst_thresh: maximum burst size above which the current
-+ * 			    queue-activation burst is deemed as 'large'.
-+ * @large_burst: true if a large queue-activation burst is in progress.
-+ * @burst_list: head of the burst list (as for the above fields, more details
-+ * 		in the comments to the function bfq_handle_burst).
-+ * @low_latency: if set to true, low-latency heuristics are enabled.
-+ * @bfq_wr_coeff: maximum factor by which the weight of a weight-raised
-+ *                queue is multiplied.
-+ * @bfq_wr_max_time: maximum duration of a weight-raising period (jiffies).
-+ * @bfq_wr_rt_max_time: maximum duration for soft real-time processes.
-+ * @bfq_wr_min_idle_time: minimum idle period after which weight-raising
-+ *			  may be reactivated for a queue (in jiffies).
-+ * @bfq_wr_min_inter_arr_async: minimum period between request arrivals
-+ *				after which weight-raising may be
-+ *				reactivated for an already busy queue
-+ *				(in jiffies).
-+ * @bfq_wr_max_softrt_rate: max service-rate for a soft real-time queue,
-+ *			    sectors per seconds.
-+ * @RT_prod: cached value of the product R*T used for computing the maximum
-+ *	     duration of the weight raising automatically.
-+ * @device_speed: device-speed class for the low-latency heuristic.
-+ * @oom_bfqq: fallback dummy bfqq for extreme OOM conditions.
-+ *
-+ * All the fields are protected by the @queue lock.
-+ */
-+struct bfq_data {
-+	struct request_queue *queue;
-+
-+	struct bfq_group *root_group;
-+	struct rb_root rq_pos_tree;
-+
-+#ifdef CONFIG_CGROUP_BFQIO
-+	int active_numerous_groups;
-+#endif
-+
-+	struct rb_root queue_weights_tree;
-+	struct rb_root group_weights_tree;
-+
-+	int busy_queues;
-+	int busy_in_flight_queues;
-+	int const_seeky_busy_in_flight_queues;
-+	int wr_busy_queues;
-+	int queued;
-+	int rq_in_driver;
-+	int sync_flight;
-+
-+	int max_rq_in_driver;
-+	int hw_tag_samples;
-+	int hw_tag;
-+
-+	int budgets_assigned;
-+
-+	struct timer_list idle_slice_timer;
-+	struct work_struct unplug_work;
-+
-+	struct bfq_queue *in_service_queue;
-+	struct bfq_io_cq *in_service_bic;
-+
-+	sector_t last_position;
-+
-+	ktime_t last_budget_start;
-+	ktime_t last_idling_start;
-+	int peak_rate_samples;
-+	u64 peak_rate;
-+	unsigned long bfq_max_budget;
-+
-+	struct hlist_head group_list;
-+	struct list_head active_list;
-+	struct list_head idle_list;
-+
-+	unsigned int bfq_fifo_expire[2];
-+	unsigned int bfq_back_penalty;
-+	unsigned int bfq_back_max;
-+	unsigned int bfq_slice_idle;
-+	u64 bfq_class_idle_last_service;
-+
-+	unsigned int bfq_user_max_budget;
-+	unsigned int bfq_max_budget_async_rq;
-+	unsigned int bfq_timeout[2];
-+
-+	unsigned int bfq_coop_thresh;
-+	unsigned int bfq_failed_cooperations;
-+	unsigned int bfq_requests_within_timer;
-+
-+	unsigned long last_ins_in_burst;
-+	unsigned long bfq_burst_interval;
-+	int burst_size;
-+	unsigned long bfq_large_burst_thresh;
-+	bool large_burst;
-+	struct hlist_head burst_list;
-+
-+	bool low_latency;
-+
-+	/* parameters of the low_latency heuristics */
-+	unsigned int bfq_wr_coeff;
-+	unsigned int bfq_wr_max_time;
-+	unsigned int bfq_wr_rt_max_time;
-+	unsigned int bfq_wr_min_idle_time;
-+	unsigned long bfq_wr_min_inter_arr_async;
-+	unsigned int bfq_wr_max_softrt_rate;
-+	u64 RT_prod;
-+	enum bfq_device_speed device_speed;
-+
-+	struct bfq_queue oom_bfqq;
-+};
-+
-+enum bfqq_state_flags {
-+	BFQ_BFQQ_FLAG_busy = 0,		/* has requests or is in service */
-+	BFQ_BFQQ_FLAG_wait_request,	/* waiting for a request */
-+	BFQ_BFQQ_FLAG_must_alloc,	/* must be allowed rq alloc */
-+	BFQ_BFQQ_FLAG_fifo_expire,	/* FIFO checked in this slice */
-+	BFQ_BFQQ_FLAG_idle_window,	/* slice idling enabled */
-+	BFQ_BFQQ_FLAG_sync,		/* synchronous queue */
-+	BFQ_BFQQ_FLAG_budget_new,	/* no completion with this budget */
-+	BFQ_BFQQ_FLAG_IO_bound,         /*
-+					 * bfqq has timed-out at least once
-+					 * having consumed at most 2/10 of
-+					 * its budget
-+					 */
-+	BFQ_BFQQ_FLAG_in_large_burst,	/*
-+					 * bfqq activated in a large burst,
-+					 * see comments to bfq_handle_burst.
-+					 */
-+	BFQ_BFQQ_FLAG_constantly_seeky,	/*
-+					 * bfqq has proved to be slow and
-+					 * seeky until budget timeout
-+					 */
-+	BFQ_BFQQ_FLAG_softrt_update,    /*
-+					 * may need softrt-next-start
-+					 * update
-+					 */
-+	BFQ_BFQQ_FLAG_coop,		/* bfqq is shared */
-+	BFQ_BFQQ_FLAG_split_coop,	/* shared bfqq will be splitted */
-+};
-+
-+#define BFQ_BFQQ_FNS(name)						\
-+static inline void bfq_mark_bfqq_##name(struct bfq_queue *bfqq)		\
-+{									\
-+	(bfqq)->flags |= (1 << BFQ_BFQQ_FLAG_##name);			\
-+}									\
-+static inline void bfq_clear_bfqq_##name(struct bfq_queue *bfqq)	\
-+{									\
-+	(bfqq)->flags &= ~(1 << BFQ_BFQQ_FLAG_##name);			\
-+}									\
-+static inline int bfq_bfqq_##name(const struct bfq_queue *bfqq)		\
-+{									\
-+	return ((bfqq)->flags & (1 << BFQ_BFQQ_FLAG_##name)) != 0;	\
-+}
-+
-+BFQ_BFQQ_FNS(busy);
-+BFQ_BFQQ_FNS(wait_request);
-+BFQ_BFQQ_FNS(must_alloc);
-+BFQ_BFQQ_FNS(fifo_expire);
-+BFQ_BFQQ_FNS(idle_window);
-+BFQ_BFQQ_FNS(sync);
-+BFQ_BFQQ_FNS(budget_new);
-+BFQ_BFQQ_FNS(IO_bound);
-+BFQ_BFQQ_FNS(in_large_burst);
-+BFQ_BFQQ_FNS(constantly_seeky);
-+BFQ_BFQQ_FNS(coop);
-+BFQ_BFQQ_FNS(split_coop);
-+BFQ_BFQQ_FNS(softrt_update);
-+#undef BFQ_BFQQ_FNS
-+
-+/* Logging facilities. */
-+#define bfq_log_bfqq(bfqd, bfqq, fmt, args...) \
-+	blk_add_trace_msg((bfqd)->queue, "bfq%d " fmt, (bfqq)->pid, ##args)
-+
-+#define bfq_log(bfqd, fmt, args...) \
-+	blk_add_trace_msg((bfqd)->queue, "bfq " fmt, ##args)
-+
-+/* Expiration reasons. */
-+enum bfqq_expiration {
-+	BFQ_BFQQ_TOO_IDLE = 0,		/*
-+					 * queue has been idling for
-+					 * too long
-+					 */
-+	BFQ_BFQQ_BUDGET_TIMEOUT,	/* budget took too long to be used */
-+	BFQ_BFQQ_BUDGET_EXHAUSTED,	/* budget consumed */
-+	BFQ_BFQQ_NO_MORE_REQUESTS,	/* the queue has no more requests */
-+};
-+
-+#ifdef CONFIG_CGROUP_BFQIO
-+/**
-+ * struct bfq_group - per (device, cgroup) data structure.
-+ * @entity: schedulable entity to insert into the parent group sched_data.
-+ * @sched_data: own sched_data, to contain child entities (they may be
-+ *              both bfq_queues and bfq_groups).
-+ * @group_node: node to be inserted into the bfqio_cgroup->group_data
-+ *              list of the containing cgroup's bfqio_cgroup.
-+ * @bfqd_node: node to be inserted into the @bfqd->group_list list
-+ *             of the groups active on the same device; used for cleanup.
-+ * @bfqd: the bfq_data for the device this group acts upon.
-+ * @async_bfqq: array of async queues for all the tasks belonging to
-+ *              the group, one queue per ioprio value per ioprio_class,
-+ *              except for the idle class that has only one queue.
-+ * @async_idle_bfqq: async queue for the idle class (ioprio is ignored).
-+ * @my_entity: pointer to @entity, %NULL for the toplevel group; used
-+ *             to avoid too many special cases during group creation/
-+ *             migration.
-+ * @active_entities: number of active entities belonging to the group;
-+ *                   unused for the root group. Used to know whether there
-+ *                   are groups with more than one active @bfq_entity
-+ *                   (see the comments to the function
-+ *                   bfq_bfqq_must_not_expire()).
-+ *
-+ * Each (device, cgroup) pair has its own bfq_group, i.e., for each cgroup
-+ * there is a set of bfq_groups, each one collecting the lower-level
-+ * entities belonging to the group that are acting on the same device.
-+ *
-+ * Locking works as follows:
-+ *    o @group_node is protected by the bfqio_cgroup lock, and is accessed
-+ *      via RCU from its readers.
-+ *    o @bfqd is protected by the queue lock, RCU is used to access it
-+ *      from the readers.
-+ *    o All the other fields are protected by the @bfqd queue lock.
-+ */
-+struct bfq_group {
-+	struct bfq_entity entity;
-+	struct bfq_sched_data sched_data;
-+
-+	struct hlist_node group_node;
-+	struct hlist_node bfqd_node;
-+
-+	void *bfqd;
-+
-+	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
-+	struct bfq_queue *async_idle_bfqq;
-+
-+	struct bfq_entity *my_entity;
-+
-+	int active_entities;
-+};
-+
-+/**
-+ * struct bfqio_cgroup - bfq cgroup data structure.
-+ * @css: subsystem state for bfq in the containing cgroup.
-+ * @online: flag marked when the subsystem is inserted.
-+ * @weight: cgroup weight.
-+ * @ioprio: cgroup ioprio.
-+ * @ioprio_class: cgroup ioprio_class.
-+ * @lock: spinlock that protects @ioprio, @ioprio_class and @group_data.
-+ * @group_data: list containing the bfq_group belonging to this cgroup.
-+ *
-+ * @group_data is accessed using RCU, with @lock protecting the updates,
-+ * @ioprio and @ioprio_class are protected by @lock.
-+ */
-+struct bfqio_cgroup {
-+	struct cgroup_subsys_state css;
-+	bool online;
-+
-+	unsigned short weight, ioprio, ioprio_class;
-+
-+	spinlock_t lock;
-+	struct hlist_head group_data;
-+};
-+#else
-+struct bfq_group {
-+	struct bfq_sched_data sched_data;
-+
-+	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
-+	struct bfq_queue *async_idle_bfqq;
-+};
-+#endif
-+
-+static inline struct bfq_service_tree *
-+bfq_entity_service_tree(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sched_data = entity->sched_data;
-+	unsigned int idx = entity->ioprio_class - 1;
-+
-+	BUG_ON(idx >= BFQ_IOPRIO_CLASSES);
-+	BUG_ON(sched_data == NULL);
-+
-+	return sched_data->service_tree + idx;
-+}
-+
-+static inline struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic,
-+					    bool is_sync)
-+{
-+	return bic->bfqq[is_sync];
-+}
-+
-+static inline void bic_set_bfqq(struct bfq_io_cq *bic,
-+				struct bfq_queue *bfqq, bool is_sync)
-+{
-+	bic->bfqq[is_sync] = bfqq;
-+}
-+
-+static inline struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic)
-+{
-+	return bic->icq.q->elevator->elevator_data;
-+}
-+
-+/**
-+ * bfq_get_bfqd_locked - get a lock to a bfqd using a RCU protected pointer.
-+ * @ptr: a pointer to a bfqd.
-+ * @flags: storage for the flags to be saved.
-+ *
-+ * This function allows bfqg->bfqd to be protected by the
-+ * queue lock of the bfqd they reference; the pointer is dereferenced
-+ * under RCU, so the storage for bfqd is assured to be safe as long
-+ * as the RCU read side critical section does not end.  After the
-+ * bfqd->queue->queue_lock is taken the pointer is rechecked, to be
-+ * sure that no other writer accessed it.  If we raced with a writer,
-+ * the function returns NULL, with the queue unlocked, otherwise it
-+ * returns the dereferenced pointer, with the queue locked.
-+ */
-+static inline struct bfq_data *bfq_get_bfqd_locked(void **ptr,
-+						   unsigned long *flags)
-+{
-+	struct bfq_data *bfqd;
-+
-+	rcu_read_lock();
-+	bfqd = rcu_dereference(*(struct bfq_data **)ptr);
-+
-+	if (bfqd != NULL) {
-+		spin_lock_irqsave(bfqd->queue->queue_lock, *flags);
-+		if (*ptr == bfqd)
-+			goto out;
-+		spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
-+	}
-+
-+	bfqd = NULL;
-+out:
-+	rcu_read_unlock();
-+	return bfqd;
-+}
-+
-+static inline void bfq_put_bfqd_unlock(struct bfq_data *bfqd,
-+				       unsigned long *flags)
-+{
-+	spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
-+}
-+
-+static void bfq_check_ioprio_change(struct bfq_io_cq *bic);
-+static void bfq_put_queue(struct bfq_queue *bfqq);
-+static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
-+static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
-+				       struct bfq_group *bfqg, int is_sync,
-+				       struct bfq_io_cq *bic, gfp_t gfp_mask);
-+static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
-+				    struct bfq_group *bfqg);
-+static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg);
-+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
-+
-+#endif /* _BFQ_H */
--- 
-2.1.4
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch
deleted file mode 100644
index 384f6c1cf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch
+++ /dev/null
@@ -1,1221 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From 0a52c636b77988d8aa0d24bf36144e4228d43df9 Mon Sep 17 00:00:00 2001
-From: Mauro Andreolini <mauro.andreolini@unimore.it>
-Date: Fri, 5 Jun 2015 17:45:40 +0200
-Subject: [PATCH 3/3] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r8 for
- 4.1.0
-
-A set of processes may happen  to  perform interleaved reads, i.e.,requests
-whose union would give rise to a  sequential read  pattern.  There are two
-typical  cases: in the first  case,   processes  read  fixed-size chunks of
-data at a fixed distance from each other, while in the second case processes
-may read variable-size chunks at  variable distances. The latter case occurs
-for  example with  QEMU, which  splits the  I/O generated  by the  guest into
-multiple chunks,  and lets these chunks  be served by a  pool of cooperating
-processes,  iteratively  assigning  the  next  chunk of  I/O  to  the first
-available  process. CFQ  uses actual  queue merging  for the  first type of
-rocesses, whereas it  uses preemption to get a sequential  read pattern out
-of the read requests  performed by the second type of  processes. In the end
-it uses  two different  mechanisms to  achieve the  same goal: boosting the
-throughput with interleaved I/O.
-
-This patch introduces  Early Queue Merge (EQM), a unified mechanism to get a
-sequential  read pattern  with both  types of  processes. The  main idea is
-checking newly arrived requests against the next request of the active queue
-both in case of actual request insert and in case of request merge. By doing
-so, both the types of processes can be handled by just merging their queues.
-EQM is  then simpler and  more compact than the  pair of mechanisms used in
-CFQ.
-
-Finally, EQM  also preserves the  typical low-latency properties of BFQ, by
-properly restoring the weight-raising state of a queue when it gets back to
-a non-merged state.
-
-Signed-off-by: Mauro Andreolini <mauro.andreolini@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
----
- block/bfq-iosched.c | 750 +++++++++++++++++++++++++++++++++++++---------------
- block/bfq-sched.c   |  28 --
- block/bfq.h         |  54 +++-
- 3 files changed, 580 insertions(+), 252 deletions(-)
-
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index 773b2ee..71b51c1 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -573,6 +573,57 @@ static inline unsigned int bfq_wr_duration(struct bfq_data *bfqd)
- 	return dur;
- }
- 
-+static inline unsigned
-+bfq_bfqq_cooperations(struct bfq_queue *bfqq)
-+{
-+	return bfqq->bic ? bfqq->bic->cooperations : 0;
-+}
-+
-+static inline void
-+bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
-+{
-+	if (bic->saved_idle_window)
-+		bfq_mark_bfqq_idle_window(bfqq);
-+	else
-+		bfq_clear_bfqq_idle_window(bfqq);
-+	if (bic->saved_IO_bound)
-+		bfq_mark_bfqq_IO_bound(bfqq);
-+	else
-+		bfq_clear_bfqq_IO_bound(bfqq);
-+	/* Assuming that the flag in_large_burst is already correctly set */
-+	if (bic->wr_time_left && bfqq->bfqd->low_latency &&
-+	    !bfq_bfqq_in_large_burst(bfqq) &&
-+	    bic->cooperations < bfqq->bfqd->bfq_coop_thresh) {
-+		/*
-+		 * Start a weight raising period with the duration given by
-+		 * the raising_time_left snapshot.
-+		 */
-+		if (bfq_bfqq_busy(bfqq))
-+			bfqq->bfqd->wr_busy_queues++;
-+		bfqq->wr_coeff = bfqq->bfqd->bfq_wr_coeff;
-+		bfqq->wr_cur_max_time = bic->wr_time_left;
-+		bfqq->last_wr_start_finish = jiffies;
-+		bfqq->entity.ioprio_changed = 1;
-+	}
-+	/*
-+	 * Clear wr_time_left to prevent bfq_bfqq_save_state() from
-+	 * getting confused about the queue's need of a weight-raising
-+	 * period.
-+	 */
-+	bic->wr_time_left = 0;
-+}
-+
-+/* Must be called with the queue_lock held. */
-+static int bfqq_process_refs(struct bfq_queue *bfqq)
-+{
-+	int process_refs, io_refs;
-+
-+	io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE];
-+	process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st;
-+	BUG_ON(process_refs < 0);
-+	return process_refs;
-+}
-+
- /* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */
- static inline void bfq_reset_burst_list(struct bfq_data *bfqd,
- 					struct bfq_queue *bfqq)
-@@ -817,7 +868,7 @@ static void bfq_add_request(struct request *rq)
- 		bfq_rq_pos_tree_add(bfqd, bfqq);
- 
- 	if (!bfq_bfqq_busy(bfqq)) {
--		bool soft_rt,
-+		bool soft_rt, coop_or_in_burst,
- 		     idle_for_long_time = time_is_before_jiffies(
- 						bfqq->budget_timeout +
- 						bfqd->bfq_wr_min_idle_time);
-@@ -841,11 +892,12 @@ static void bfq_add_request(struct request *rq)
- 				bfqd->last_ins_in_burst = jiffies;
- 		}
- 
-+		coop_or_in_burst = bfq_bfqq_in_large_burst(bfqq) ||
-+			bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh;
- 		soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
--			!bfq_bfqq_in_large_burst(bfqq) &&
-+			!coop_or_in_burst &&
- 			time_is_before_jiffies(bfqq->soft_rt_next_start);
--		interactive = !bfq_bfqq_in_large_burst(bfqq) &&
--			      idle_for_long_time;
-+		interactive = !coop_or_in_burst && idle_for_long_time;
- 		entity->budget = max_t(unsigned long, bfqq->max_budget,
- 				       bfq_serv_to_charge(next_rq, bfqq));
- 
-@@ -864,11 +916,20 @@ static void bfq_add_request(struct request *rq)
- 		if (!bfqd->low_latency)
- 			goto add_bfqq_busy;
- 
-+		if (bfq_bfqq_just_split(bfqq))
-+			goto set_ioprio_changed;
-+
- 		/*
--		 * If the queue is not being boosted and has been idle
--		 * for enough time, start a weight-raising period
-+		 * If the queue:
-+		 * - is not being boosted,
-+		 * - has been idle for enough time,
-+		 * - is not a sync queue or is linked to a bfq_io_cq (it is
-+		 *   shared "for its nature" or it is not shared and its
-+		 *   requests have not been redirected to a shared queue)
-+		 * start a weight-raising period.
- 		 */
--		if (old_wr_coeff == 1 && (interactive || soft_rt)) {
-+		if (old_wr_coeff == 1 && (interactive || soft_rt) &&
-+		    (!bfq_bfqq_sync(bfqq) || bfqq->bic != NULL)) {
- 			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
- 			if (interactive)
- 				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-@@ -882,7 +943,7 @@ static void bfq_add_request(struct request *rq)
- 		} else if (old_wr_coeff > 1) {
- 			if (interactive)
- 				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
--			else if (bfq_bfqq_in_large_burst(bfqq) ||
-+			else if (coop_or_in_burst ||
- 				 (bfqq->wr_cur_max_time ==
- 				  bfqd->bfq_wr_rt_max_time &&
- 				  !soft_rt)) {
-@@ -901,18 +962,18 @@ static void bfq_add_request(struct request *rq)
- 				/*
- 				 *
- 				 * The remaining weight-raising time is lower
--				 * than bfqd->bfq_wr_rt_max_time, which
--				 * means that the application is enjoying
--				 * weight raising either because deemed soft-
--				 * rt in the near past, or because deemed
--				 * interactive a long ago. In both cases,
--				 * resetting now the current remaining weight-
--				 * raising time for the application to the
--				 * weight-raising duration for soft rt
--				 * applications would not cause any latency
--				 * increase for the application (as the new
--				 * duration would be higher than the remaining
--				 * time).
-+				 * than bfqd->bfq_wr_rt_max_time, which means
-+				 * that the application is enjoying weight
-+				 * raising either because deemed soft-rt in
-+				 * the near past, or because deemed interactive
-+				 * a long ago.
-+				 * In both cases, resetting now the current
-+				 * remaining weight-raising time for the
-+				 * application to the weight-raising duration
-+				 * for soft rt applications would not cause any
-+				 * latency increase for the application (as the
-+				 * new duration would be higher than the
-+				 * remaining time).
- 				 *
- 				 * In addition, the application is now meeting
- 				 * the requirements for being deemed soft rt.
-@@ -947,6 +1008,7 @@ static void bfq_add_request(struct request *rq)
- 					bfqd->bfq_wr_rt_max_time;
- 			}
- 		}
-+set_ioprio_changed:
- 		if (old_wr_coeff != bfqq->wr_coeff)
- 			entity->ioprio_changed = 1;
- add_bfqq_busy:
-@@ -1167,90 +1229,35 @@ static void bfq_end_wr(struct bfq_data *bfqd)
- 	spin_unlock_irq(bfqd->queue->queue_lock);
- }
- 
--static int bfq_allow_merge(struct request_queue *q, struct request *rq,
--			   struct bio *bio)
-+static inline sector_t bfq_io_struct_pos(void *io_struct, bool request)
- {
--	struct bfq_data *bfqd = q->elevator->elevator_data;
--	struct bfq_io_cq *bic;
--	struct bfq_queue *bfqq;
--
--	/*
--	 * Disallow merge of a sync bio into an async request.
--	 */
--	if (bfq_bio_sync(bio) && !rq_is_sync(rq))
--		return 0;
--
--	/*
--	 * Lookup the bfqq that this bio will be queued with. Allow
--	 * merge only if rq is queued there.
--	 * Queue lock is held here.
--	 */
--	bic = bfq_bic_lookup(bfqd, current->io_context);
--	if (bic == NULL)
--		return 0;
--
--	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
--	return bfqq == RQ_BFQQ(rq);
--}
--
--static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
--				       struct bfq_queue *bfqq)
--{
--	if (bfqq != NULL) {
--		bfq_mark_bfqq_must_alloc(bfqq);
--		bfq_mark_bfqq_budget_new(bfqq);
--		bfq_clear_bfqq_fifo_expire(bfqq);
--
--		bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8;
--
--		bfq_log_bfqq(bfqd, bfqq,
--			     "set_in_service_queue, cur-budget = %lu",
--			     bfqq->entity.budget);
--	}
--
--	bfqd->in_service_queue = bfqq;
--}
--
--/*
-- * Get and set a new queue for service.
-- */
--static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd,
--						  struct bfq_queue *bfqq)
--{
--	if (!bfqq)
--		bfqq = bfq_get_next_queue(bfqd);
-+	if (request)
-+		return blk_rq_pos(io_struct);
- 	else
--		bfq_get_next_queue_forced(bfqd, bfqq);
--
--	__bfq_set_in_service_queue(bfqd, bfqq);
--	return bfqq;
-+		return ((struct bio *)io_struct)->bi_iter.bi_sector;
- }
- 
--static inline sector_t bfq_dist_from_last(struct bfq_data *bfqd,
--					  struct request *rq)
-+static inline sector_t bfq_dist_from(sector_t pos1,
-+				     sector_t pos2)
- {
--	if (blk_rq_pos(rq) >= bfqd->last_position)
--		return blk_rq_pos(rq) - bfqd->last_position;
-+	if (pos1 >= pos2)
-+		return pos1 - pos2;
- 	else
--		return bfqd->last_position - blk_rq_pos(rq);
-+		return pos2 - pos1;
- }
- 
--/*
-- * Return true if bfqq has no request pending and rq is close enough to
-- * bfqd->last_position, or if rq is closer to bfqd->last_position than
-- * bfqq->next_rq
-- */
--static inline int bfq_rq_close(struct bfq_data *bfqd, struct request *rq)
-+static inline int bfq_rq_close_to_sector(void *io_struct, bool request,
-+					 sector_t sector)
- {
--	return bfq_dist_from_last(bfqd, rq) <= BFQQ_SEEK_THR;
-+	return bfq_dist_from(bfq_io_struct_pos(io_struct, request), sector) <=
-+	       BFQQ_SEEK_THR;
- }
- 
--static struct bfq_queue *bfqq_close(struct bfq_data *bfqd)
-+static struct bfq_queue *bfqq_close(struct bfq_data *bfqd, sector_t sector)
- {
- 	struct rb_root *root = &bfqd->rq_pos_tree;
- 	struct rb_node *parent, *node;
- 	struct bfq_queue *__bfqq;
--	sector_t sector = bfqd->last_position;
- 
- 	if (RB_EMPTY_ROOT(root))
- 		return NULL;
-@@ -1269,7 +1276,7 @@ static struct bfq_queue *bfqq_close(struct bfq_data *bfqd)
- 	 * next_request position).
- 	 */
- 	__bfqq = rb_entry(parent, struct bfq_queue, pos_node);
--	if (bfq_rq_close(bfqd, __bfqq->next_rq))
-+	if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector))
- 		return __bfqq;
- 
- 	if (blk_rq_pos(__bfqq->next_rq) < sector)
-@@ -1280,7 +1287,7 @@ static struct bfq_queue *bfqq_close(struct bfq_data *bfqd)
- 		return NULL;
- 
- 	__bfqq = rb_entry(node, struct bfq_queue, pos_node);
--	if (bfq_rq_close(bfqd, __bfqq->next_rq))
-+	if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector))
- 		return __bfqq;
- 
- 	return NULL;
-@@ -1289,14 +1296,12 @@ static struct bfq_queue *bfqq_close(struct bfq_data *bfqd)
- /*
-  * bfqd - obvious
-  * cur_bfqq - passed in so that we don't decide that the current queue
-- *            is closely cooperating with itself.
-- *
-- * We are assuming that cur_bfqq has dispatched at least one request,
-- * and that bfqd->last_position reflects a position on the disk associated
-- * with the I/O issued by cur_bfqq.
-+ *            is closely cooperating with itself
-+ * sector - used as a reference point to search for a close queue
-  */
- static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd,
--					      struct bfq_queue *cur_bfqq)
-+					      struct bfq_queue *cur_bfqq,
-+					      sector_t sector)
- {
- 	struct bfq_queue *bfqq;
- 
-@@ -1316,7 +1321,7 @@ static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd,
- 	 * working closely on the same area of the disk. In that case,
- 	 * we can group them together and don't waste time idling.
- 	 */
--	bfqq = bfqq_close(bfqd);
-+	bfqq = bfqq_close(bfqd, sector);
- 	if (bfqq == NULL || bfqq == cur_bfqq)
- 		return NULL;
- 
-@@ -1343,6 +1348,315 @@ static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd,
- 	return bfqq;
- }
- 
-+static struct bfq_queue *
-+bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
-+{
-+	int process_refs, new_process_refs;
-+	struct bfq_queue *__bfqq;
-+
-+	/*
-+	 * If there are no process references on the new_bfqq, then it is
-+	 * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain
-+	 * may have dropped their last reference (not just their last process
-+	 * reference).
-+	 */
-+	if (!bfqq_process_refs(new_bfqq))
-+		return NULL;
-+
-+	/* Avoid a circular list and skip interim queue merges. */
-+	while ((__bfqq = new_bfqq->new_bfqq)) {
-+		if (__bfqq == bfqq)
-+			return NULL;
-+		new_bfqq = __bfqq;
-+	}
-+
-+	process_refs = bfqq_process_refs(bfqq);
-+	new_process_refs = bfqq_process_refs(new_bfqq);
-+	/*
-+	 * If the process for the bfqq has gone away, there is no
-+	 * sense in merging the queues.
-+	 */
-+	if (process_refs == 0 || new_process_refs == 0)
-+		return NULL;
-+
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d",
-+		new_bfqq->pid);
-+
-+	/*
-+	 * Merging is just a redirection: the requests of the process
-+	 * owning one of the two queues are redirected to the other queue.
-+	 * The latter queue, in its turn, is set as shared if this is the
-+	 * first time that the requests of some process are redirected to
-+	 * it.
-+	 *
-+	 * We redirect bfqq to new_bfqq and not the opposite, because we
-+	 * are in the context of the process owning bfqq, hence we have
-+	 * the io_cq of this process. So we can immediately configure this
-+	 * io_cq to redirect the requests of the process to new_bfqq.
-+	 *
-+	 * NOTE, even if new_bfqq coincides with the in-service queue, the
-+	 * io_cq of new_bfqq is not available, because, if the in-service
-+	 * queue is shared, bfqd->in_service_bic may not point to the
-+	 * io_cq of the in-service queue.
-+	 * Redirecting the requests of the process owning bfqq to the
-+	 * currently in-service queue is in any case the best option, as
-+	 * we feed the in-service queue with new requests close to the
-+	 * last request served and, by doing so, hopefully increase the
-+	 * throughput.
-+	 */
-+	bfqq->new_bfqq = new_bfqq;
-+	atomic_add(process_refs, &new_bfqq->ref);
-+	return new_bfqq;
-+}
-+
-+/*
-+ * Attempt to schedule a merge of bfqq with the currently in-service queue
-+ * or with a close queue among the scheduled queues.
-+ * Return NULL if no merge was scheduled, a pointer to the shared bfq_queue
-+ * structure otherwise.
-+ *
-+ * The OOM queue is not allowed to participate to cooperation: in fact, since
-+ * the requests temporarily redirected to the OOM queue could be redirected
-+ * again to dedicated queues at any time, the state needed to correctly
-+ * handle merging with the OOM queue would be quite complex and expensive
-+ * to maintain. Besides, in such a critical condition as an out of memory,
-+ * the benefits of queue merging may be little relevant, or even negligible.
-+ */
-+static struct bfq_queue *
-+bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+		     void *io_struct, bool request)
-+{
-+	struct bfq_queue *in_service_bfqq, *new_bfqq;
-+
-+	if (bfqq->new_bfqq)
-+		return bfqq->new_bfqq;
-+
-+	if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq))
-+		return NULL;
-+
-+	in_service_bfqq = bfqd->in_service_queue;
-+
-+	if (in_service_bfqq == NULL || in_service_bfqq == bfqq ||
-+	    !bfqd->in_service_bic ||
-+	    unlikely(in_service_bfqq == &bfqd->oom_bfqq))
-+		goto check_scheduled;
-+
-+	if (bfq_class_idle(in_service_bfqq) || bfq_class_idle(bfqq))
-+		goto check_scheduled;
-+
-+	if (bfq_class_rt(in_service_bfqq) != bfq_class_rt(bfqq))
-+		goto check_scheduled;
-+
-+	if (in_service_bfqq->entity.parent != bfqq->entity.parent)
-+		goto check_scheduled;
-+
-+	if (bfq_rq_close_to_sector(io_struct, request, bfqd->last_position) &&
-+	    bfq_bfqq_sync(in_service_bfqq) && bfq_bfqq_sync(bfqq)) {
-+		new_bfqq = bfq_setup_merge(bfqq, in_service_bfqq);
-+		if (new_bfqq != NULL)
-+			return new_bfqq; /* Merge with in-service queue */
-+	}
-+
-+	/*
-+	 * Check whether there is a cooperator among currently scheduled
-+	 * queues. The only thing we need is that the bio/request is not
-+	 * NULL, as we need it to establish whether a cooperator exists.
-+	 */
-+check_scheduled:
-+	new_bfqq = bfq_close_cooperator(bfqd, bfqq,
-+					bfq_io_struct_pos(io_struct, request));
-+	if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq))
-+		return bfq_setup_merge(bfqq, new_bfqq);
-+
-+	return NULL;
-+}
-+
-+static inline void
-+bfq_bfqq_save_state(struct bfq_queue *bfqq)
-+{
-+	/*
-+	 * If bfqq->bic == NULL, the queue is already shared or its requests
-+	 * have already been redirected to a shared queue; both idle window
-+	 * and weight raising state have already been saved. Do nothing.
-+	 */
-+	if (bfqq->bic == NULL)
-+		return;
-+	if (bfqq->bic->wr_time_left)
-+		/*
-+		 * This is the queue of a just-started process, and would
-+		 * deserve weight raising: we set wr_time_left to the full
-+		 * weight-raising duration to trigger weight-raising when
-+		 * and if the queue is split and the first request of the
-+		 * queue is enqueued.
-+		 */
-+		bfqq->bic->wr_time_left = bfq_wr_duration(bfqq->bfqd);
-+	else if (bfqq->wr_coeff > 1) {
-+		unsigned long wr_duration =
-+			jiffies - bfqq->last_wr_start_finish;
-+		/*
-+		 * It may happen that a queue's weight raising period lasts
-+		 * longer than its wr_cur_max_time, as weight raising is
-+		 * handled only when a request is enqueued or dispatched (it
-+		 * does not use any timer). If the weight raising period is
-+		 * about to end, don't save it.
-+		 */
-+		if (bfqq->wr_cur_max_time <= wr_duration)
-+			bfqq->bic->wr_time_left = 0;
-+		else
-+			bfqq->bic->wr_time_left =
-+				bfqq->wr_cur_max_time - wr_duration;
-+		/*
-+		 * The bfq_queue is becoming shared or the requests of the
-+		 * process owning the queue are being redirected to a shared
-+		 * queue. Stop the weight raising period of the queue, as in
-+		 * both cases it should not be owned by an interactive or
-+		 * soft real-time application.
-+		 */
-+		bfq_bfqq_end_wr(bfqq);
-+	} else
-+		bfqq->bic->wr_time_left = 0;
-+	bfqq->bic->saved_idle_window = bfq_bfqq_idle_window(bfqq);
-+	bfqq->bic->saved_IO_bound = bfq_bfqq_IO_bound(bfqq);
-+	bfqq->bic->saved_in_large_burst = bfq_bfqq_in_large_burst(bfqq);
-+	bfqq->bic->was_in_burst_list = !hlist_unhashed(&bfqq->burst_list_node);
-+	bfqq->bic->cooperations++;
-+	bfqq->bic->failed_cooperations = 0;
-+}
-+
-+static inline void
-+bfq_get_bic_reference(struct bfq_queue *bfqq)
-+{
-+	/*
-+	 * If bfqq->bic has a non-NULL value, the bic to which it belongs
-+	 * is about to begin using a shared bfq_queue.
-+	 */
-+	if (bfqq->bic)
-+		atomic_long_inc(&bfqq->bic->icq.ioc->refcount);
-+}
-+
-+static void
-+bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
-+		struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
-+{
-+	bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu",
-+		(long unsigned)new_bfqq->pid);
-+	/* Save weight raising and idle window of the merged queues */
-+	bfq_bfqq_save_state(bfqq);
-+	bfq_bfqq_save_state(new_bfqq);
-+	if (bfq_bfqq_IO_bound(bfqq))
-+		bfq_mark_bfqq_IO_bound(new_bfqq);
-+	bfq_clear_bfqq_IO_bound(bfqq);
-+	/*
-+	 * Grab a reference to the bic, to prevent it from being destroyed
-+	 * before being possibly touched by a bfq_split_bfqq().
-+	 */
-+	bfq_get_bic_reference(bfqq);
-+	bfq_get_bic_reference(new_bfqq);
-+	/*
-+	 * Merge queues (that is, let bic redirect its requests to new_bfqq)
-+	 */
-+	bic_set_bfqq(bic, new_bfqq, 1);
-+	bfq_mark_bfqq_coop(new_bfqq);
-+	/*
-+	 * new_bfqq now belongs to at least two bics (it is a shared queue):
-+	 * set new_bfqq->bic to NULL. bfqq either:
-+	 * - does not belong to any bic any more, and hence bfqq->bic must
-+	 *   be set to NULL, or
-+	 * - is a queue whose owning bics have already been redirected to a
-+	 *   different queue, hence the queue is destined to not belong to
-+	 *   any bic soon and bfqq->bic is already NULL (therefore the next
-+	 *   assignment causes no harm).
-+	 */
-+	new_bfqq->bic = NULL;
-+	bfqq->bic = NULL;
-+	bfq_put_queue(bfqq);
-+}
-+
-+static inline void bfq_bfqq_increase_failed_cooperations(struct bfq_queue *bfqq)
-+{
-+	struct bfq_io_cq *bic = bfqq->bic;
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+
-+	if (bic && bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh) {
-+		bic->failed_cooperations++;
-+		if (bic->failed_cooperations >= bfqd->bfq_failed_cooperations)
-+			bic->cooperations = 0;
-+	}
-+}
-+
-+static int bfq_allow_merge(struct request_queue *q, struct request *rq,
-+			   struct bio *bio)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq, *new_bfqq;
-+
-+	/*
-+	 * Disallow merge of a sync bio into an async request.
-+	 */
-+	if (bfq_bio_sync(bio) && !rq_is_sync(rq))
-+		return 0;
-+
-+	/*
-+	 * Lookup the bfqq that this bio will be queued with. Allow
-+	 * merge only if rq is queued there.
-+	 * Queue lock is held here.
-+	 */
-+	bic = bfq_bic_lookup(bfqd, current->io_context);
-+	if (bic == NULL)
-+		return 0;
-+
-+	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
-+	/*
-+	 * We take advantage of this function to perform an early merge
-+	 * of the queues of possible cooperating processes.
-+	 */
-+	if (bfqq != NULL) {
-+		new_bfqq = bfq_setup_cooperator(bfqd, bfqq, bio, false);
-+		if (new_bfqq != NULL) {
-+			bfq_merge_bfqqs(bfqd, bic, bfqq, new_bfqq);
-+			/*
-+			 * If we get here, the bio will be queued in the
-+			 * shared queue, i.e., new_bfqq, so use new_bfqq
-+			 * to decide whether bio and rq can be merged.
-+			 */
-+			bfqq = new_bfqq;
-+		} else
-+			bfq_bfqq_increase_failed_cooperations(bfqq);
-+	}
-+
-+	return bfqq == RQ_BFQQ(rq);
-+}
-+
-+static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
-+				       struct bfq_queue *bfqq)
-+{
-+	if (bfqq != NULL) {
-+		bfq_mark_bfqq_must_alloc(bfqq);
-+		bfq_mark_bfqq_budget_new(bfqq);
-+		bfq_clear_bfqq_fifo_expire(bfqq);
-+
-+		bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8;
-+
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "set_in_service_queue, cur-budget = %lu",
-+			     bfqq->entity.budget);
-+	}
-+
-+	bfqd->in_service_queue = bfqq;
-+}
-+
-+/*
-+ * Get and set a new queue for service.
-+ */
-+static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfq_get_next_queue(bfqd);
-+
-+	__bfq_set_in_service_queue(bfqd, bfqq);
-+	return bfqq;
-+}
-+
- /*
-  * If enough samples have been computed, return the current max budget
-  * stored in bfqd, which is dynamically updated according to the
-@@ -1488,61 +1802,6 @@ static struct request *bfq_check_fifo(struct bfq_queue *bfqq)
- 	return rq;
- }
- 
--/* Must be called with the queue_lock held. */
--static int bfqq_process_refs(struct bfq_queue *bfqq)
--{
--	int process_refs, io_refs;
--
--	io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE];
--	process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st;
--	BUG_ON(process_refs < 0);
--	return process_refs;
--}
--
--static void bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
--{
--	int process_refs, new_process_refs;
--	struct bfq_queue *__bfqq;
--
--	/*
--	 * If there are no process references on the new_bfqq, then it is
--	 * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain
--	 * may have dropped their last reference (not just their last process
--	 * reference).
--	 */
--	if (!bfqq_process_refs(new_bfqq))
--		return;
--
--	/* Avoid a circular list and skip interim queue merges. */
--	while ((__bfqq = new_bfqq->new_bfqq)) {
--		if (__bfqq == bfqq)
--			return;
--		new_bfqq = __bfqq;
--	}
--
--	process_refs = bfqq_process_refs(bfqq);
--	new_process_refs = bfqq_process_refs(new_bfqq);
--	/*
--	 * If the process for the bfqq has gone away, there is no
--	 * sense in merging the queues.
--	 */
--	if (process_refs == 0 || new_process_refs == 0)
--		return;
--
--	/*
--	 * Merge in the direction of the lesser amount of work.
--	 */
--	if (new_process_refs >= process_refs) {
--		bfqq->new_bfqq = new_bfqq;
--		atomic_add(process_refs, &new_bfqq->ref);
--	} else {
--		new_bfqq->new_bfqq = bfqq;
--		atomic_add(new_process_refs, &bfqq->ref);
--	}
--	bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d",
--		new_bfqq->pid);
--}
--
- static inline unsigned long bfq_bfqq_budget_left(struct bfq_queue *bfqq)
- {
- 	struct bfq_entity *entity = &bfqq->entity;
-@@ -2269,7 +2528,7 @@ static inline bool bfq_bfqq_must_idle(struct bfq_queue *bfqq)
-  */
- static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- {
--	struct bfq_queue *bfqq, *new_bfqq = NULL;
-+	struct bfq_queue *bfqq;
- 	struct request *next_rq;
- 	enum bfqq_expiration reason = BFQ_BFQQ_BUDGET_TIMEOUT;
- 
-@@ -2279,17 +2538,6 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- 
- 	bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue");
- 
--	/*
--         * If another queue has a request waiting within our mean seek
--         * distance, let it run. The expire code will check for close
--         * cooperators and put the close queue at the front of the
--         * service tree. If possible, merge the expiring queue with the
--         * new bfqq.
--         */
--        new_bfqq = bfq_close_cooperator(bfqd, bfqq);
--        if (new_bfqq != NULL && bfqq->new_bfqq == NULL)
--                bfq_setup_merge(bfqq, new_bfqq);
--
- 	if (bfq_may_expire_for_budg_timeout(bfqq) &&
- 	    !timer_pending(&bfqd->idle_slice_timer) &&
- 	    !bfq_bfqq_must_idle(bfqq))
-@@ -2328,10 +2576,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- 				bfq_clear_bfqq_wait_request(bfqq);
- 				del_timer(&bfqd->idle_slice_timer);
- 			}
--			if (new_bfqq == NULL)
--				goto keep_queue;
--			else
--				goto expire;
-+			goto keep_queue;
- 		}
- 	}
- 
-@@ -2340,40 +2585,30 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- 	 * for a new request, or has requests waiting for a completion and
- 	 * may idle after their completion, then keep it anyway.
- 	 */
--	if (new_bfqq == NULL && (timer_pending(&bfqd->idle_slice_timer) ||
--	    (bfqq->dispatched != 0 && bfq_bfqq_must_not_expire(bfqq)))) {
-+	if (timer_pending(&bfqd->idle_slice_timer) ||
-+	    (bfqq->dispatched != 0 && bfq_bfqq_must_not_expire(bfqq))) {
- 		bfqq = NULL;
- 		goto keep_queue;
--	} else if (new_bfqq != NULL && timer_pending(&bfqd->idle_slice_timer)) {
--		/*
--		 * Expiring the queue because there is a close cooperator,
--		 * cancel timer.
--		 */
--		bfq_clear_bfqq_wait_request(bfqq);
--		del_timer(&bfqd->idle_slice_timer);
- 	}
- 
- 	reason = BFQ_BFQQ_NO_MORE_REQUESTS;
- expire:
- 	bfq_bfqq_expire(bfqd, bfqq, 0, reason);
- new_queue:
--	bfqq = bfq_set_in_service_queue(bfqd, new_bfqq);
-+	bfqq = bfq_set_in_service_queue(bfqd);
- 	bfq_log(bfqd, "select_queue: new queue %d returned",
- 		bfqq != NULL ? bfqq->pid : 0);
- keep_queue:
- 	return bfqq;
- }
- 
--static void bfq_update_wr_data(struct bfq_data *bfqd,
--			       struct bfq_queue *bfqq)
-+static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
--	if (bfqq->wr_coeff > 1) { /* queue is being boosted */
--		struct bfq_entity *entity = &bfqq->entity;
--
-+	struct bfq_entity *entity = &bfqq->entity;
-+	if (bfqq->wr_coeff > 1) { /* queue is being weight-raised */
- 		bfq_log_bfqq(bfqd, bfqq,
- 			"raising period dur %u/%u msec, old coeff %u, w %d(%d)",
--			jiffies_to_msecs(jiffies -
--				bfqq->last_wr_start_finish),
-+			jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish),
- 			jiffies_to_msecs(bfqq->wr_cur_max_time),
- 			bfqq->wr_coeff,
- 			bfqq->entity.weight, bfqq->entity.orig_weight);
-@@ -2382,12 +2617,16 @@ static void bfq_update_wr_data(struct bfq_data *bfqd,
- 		       entity->orig_weight * bfqq->wr_coeff);
- 		if (entity->ioprio_changed)
- 			bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change");
-+
- 		/*
- 		 * If the queue was activated in a burst, or
- 		 * too much time has elapsed from the beginning
--		 * of this weight-raising, then end weight raising.
-+		 * of this weight-raising period, or the queue has
-+		 * exceeded the acceptable number of cooperations,
-+		 * then end weight raising.
- 		 */
- 		if (bfq_bfqq_in_large_burst(bfqq) ||
-+		    bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh ||
- 		    time_is_before_jiffies(bfqq->last_wr_start_finish +
- 					   bfqq->wr_cur_max_time)) {
- 			bfqq->last_wr_start_finish = jiffies;
-@@ -2396,11 +2635,13 @@ static void bfq_update_wr_data(struct bfq_data *bfqd,
- 				     bfqq->last_wr_start_finish,
- 				     jiffies_to_msecs(bfqq->wr_cur_max_time));
- 			bfq_bfqq_end_wr(bfqq);
--			__bfq_entity_update_weight_prio(
--				bfq_entity_service_tree(entity),
--				entity);
- 		}
- 	}
-+	/* Update weight both if it must be raised and if it must be lowered */
-+	if ((entity->weight > entity->orig_weight) != (bfqq->wr_coeff > 1))
-+		__bfq_entity_update_weight_prio(
-+			bfq_entity_service_tree(entity),
-+			entity);
- }
- 
- /*
-@@ -2647,6 +2888,25 @@ static inline void bfq_init_icq(struct io_cq *icq)
- 	struct bfq_io_cq *bic = icq_to_bic(icq);
- 
- 	bic->ttime.last_end_request = jiffies;
-+	/*
-+	 * A newly created bic indicates that the process has just
-+	 * started doing I/O, and is probably mapping into memory its
-+	 * executable and libraries: it definitely needs weight raising.
-+	 * There is however the possibility that the process performs,
-+	 * for a while, I/O close to some other process. EQM intercepts
-+	 * this behavior and may merge the queue corresponding to the
-+	 * process  with some other queue, BEFORE the weight of the queue
-+	 * is raised. Merged queues are not weight-raised (they are assumed
-+	 * to belong to processes that benefit only from high throughput).
-+	 * If the merge is basically the consequence of an accident, then
-+	 * the queue will be split soon and will get back its old weight.
-+	 * It is then important to write down somewhere that this queue
-+	 * does need weight raising, even if it did not make it to get its
-+	 * weight raised before being merged. To this purpose, we overload
-+	 * the field raising_time_left and assign 1 to it, to mark the queue
-+	 * as needing weight raising.
-+	 */
-+	bic->wr_time_left = 1;
- }
- 
- static void bfq_exit_icq(struct io_cq *icq)
-@@ -2660,6 +2920,13 @@ static void bfq_exit_icq(struct io_cq *icq)
- 	}
- 
- 	if (bic->bfqq[BLK_RW_SYNC]) {
-+		/*
-+		 * If the bic is using a shared queue, put the reference
-+		 * taken on the io_context when the bic started using a
-+		 * shared bfq_queue.
-+		 */
-+		if (bfq_bfqq_coop(bic->bfqq[BLK_RW_SYNC]))
-+			put_io_context(icq->ioc);
- 		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]);
- 		bic->bfqq[BLK_RW_SYNC] = NULL;
- 	}
-@@ -2952,6 +3219,10 @@ static void bfq_update_idle_window(struct bfq_data *bfqd,
- 	if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq))
- 		return;
- 
-+	/* Idle window just restored, statistics are meaningless. */
-+	if (bfq_bfqq_just_split(bfqq))
-+		return;
-+
- 	enable_idle = bfq_bfqq_idle_window(bfqq);
- 
- 	if (atomic_read(&bic->icq.ioc->active_ref) == 0 ||
-@@ -2999,6 +3270,7 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 ||
- 	    !BFQQ_SEEKY(bfqq))
- 		bfq_update_idle_window(bfqd, bfqq, bic);
-+	bfq_clear_bfqq_just_split(bfqq);
- 
- 	bfq_log_bfqq(bfqd, bfqq,
- 		     "rq_enqueued: idle_window=%d (seeky %d, mean %llu)",
-@@ -3059,12 +3331,47 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- static void bfq_insert_request(struct request_queue *q, struct request *rq)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
--	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq), *new_bfqq;
- 
- 	assert_spin_locked(bfqd->queue->queue_lock);
- 
-+	/*
-+	 * An unplug may trigger a requeue of a request from the device
-+	 * driver: make sure we are in process context while trying to
-+	 * merge two bfq_queues.
-+	 */
-+	if (!in_interrupt()) {
-+		new_bfqq = bfq_setup_cooperator(bfqd, bfqq, rq, true);
-+		if (new_bfqq != NULL) {
-+			if (bic_to_bfqq(RQ_BIC(rq), 1) != bfqq)
-+				new_bfqq = bic_to_bfqq(RQ_BIC(rq), 1);
-+			/*
-+			 * Release the request's reference to the old bfqq
-+			 * and make sure one is taken to the shared queue.
-+			 */
-+			new_bfqq->allocated[rq_data_dir(rq)]++;
-+			bfqq->allocated[rq_data_dir(rq)]--;
-+			atomic_inc(&new_bfqq->ref);
-+			bfq_put_queue(bfqq);
-+			if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq)
-+				bfq_merge_bfqqs(bfqd, RQ_BIC(rq),
-+						bfqq, new_bfqq);
-+			rq->elv.priv[1] = new_bfqq;
-+			bfqq = new_bfqq;
-+		} else
-+			bfq_bfqq_increase_failed_cooperations(bfqq);
-+	}
-+
- 	bfq_add_request(rq);
- 
-+	/*
-+	 * Here a newly-created bfq_queue has already started a weight-raising
-+	 * period: clear raising_time_left to prevent bfq_bfqq_save_state()
-+	 * from assigning it a full weight-raising period. See the detailed
-+	 * comments about this field in bfq_init_icq().
-+	 */
-+	if (bfqq->bic != NULL)
-+		bfqq->bic->wr_time_left = 0;
- 	rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)];
- 	list_add_tail(&rq->queuelist, &bfqq->fifo);
- 
-@@ -3226,18 +3533,6 @@ static void bfq_put_request(struct request *rq)
- 	}
- }
- 
--static struct bfq_queue *
--bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
--		struct bfq_queue *bfqq)
--{
--	bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu",
--		(long unsigned)bfqq->new_bfqq->pid);
--	bic_set_bfqq(bic, bfqq->new_bfqq, 1);
--	bfq_mark_bfqq_coop(bfqq->new_bfqq);
--	bfq_put_queue(bfqq);
--	return bic_to_bfqq(bic, 1);
--}
--
- /*
-  * Returns NULL if a new bfqq should be allocated, or the old bfqq if this
-  * was the last process referring to said bfqq.
-@@ -3246,6 +3541,9 @@ static struct bfq_queue *
- bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
- {
- 	bfq_log_bfqq(bfqq->bfqd, bfqq, "splitting queue");
-+
-+	put_io_context(bic->icq.ioc);
-+
- 	if (bfqq_process_refs(bfqq) == 1) {
- 		bfqq->pid = current->pid;
- 		bfq_clear_bfqq_coop(bfqq);
-@@ -3274,6 +3572,7 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	struct bfq_queue *bfqq;
- 	struct bfq_group *bfqg;
- 	unsigned long flags;
-+	bool split = false;
- 
- 	might_sleep_if(gfp_mask & __GFP_WAIT);
- 
-@@ -3291,25 +3590,26 @@ new_queue:
- 	if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) {
- 		bfqq = bfq_get_queue(bfqd, bfqg, is_sync, bic, gfp_mask);
- 		bic_set_bfqq(bic, bfqq, is_sync);
-+		if (split && is_sync) {
-+			if ((bic->was_in_burst_list && bfqd->large_burst) ||
-+			    bic->saved_in_large_burst)
-+				bfq_mark_bfqq_in_large_burst(bfqq);
-+			else {
-+			    bfq_clear_bfqq_in_large_burst(bfqq);
-+			    if (bic->was_in_burst_list)
-+			       hlist_add_head(&bfqq->burst_list_node,
-+				              &bfqd->burst_list);
-+			}
-+		}
- 	} else {
--		/*
--		 * If the queue was seeky for too long, break it apart.
--		 */
-+		/* If the queue was seeky for too long, break it apart. */
- 		if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) {
- 			bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq");
- 			bfqq = bfq_split_bfqq(bic, bfqq);
-+			split = true;
- 			if (!bfqq)
- 				goto new_queue;
- 		}
--
--		/*
--		 * Check to see if this queue is scheduled to merge with
--		 * another closely cooperating queue. The merging of queues
--		 * happens here as it must be done in process context.
--		 * The reference on new_bfqq was taken in merge_bfqqs.
--		 */
--		if (bfqq->new_bfqq != NULL)
--			bfqq = bfq_merge_bfqqs(bfqd, bic, bfqq);
- 	}
- 
- 	bfqq->allocated[rw]++;
-@@ -3320,6 +3620,26 @@ new_queue:
- 	rq->elv.priv[0] = bic;
- 	rq->elv.priv[1] = bfqq;
- 
-+	/*
-+	 * If a bfq_queue has only one process reference, it is owned
-+	 * by only one bfq_io_cq: we can set the bic field of the
-+	 * bfq_queue to the address of that structure. Also, if the
-+	 * queue has just been split, mark a flag so that the
-+	 * information is available to the other scheduler hooks.
-+	 */
-+	if (likely(bfqq != &bfqd->oom_bfqq) && bfqq_process_refs(bfqq) == 1) {
-+		bfqq->bic = bic;
-+		if (split) {
-+			bfq_mark_bfqq_just_split(bfqq);
-+			/*
-+			 * If the queue has just been split from a shared
-+			 * queue, restore the idle window and the possible
-+			 * weight raising period.
-+			 */
-+			bfq_bfqq_resume_state(bfqq, bic);
-+		}
-+	}
-+
- 	spin_unlock_irqrestore(q->queue_lock, flags);
- 
- 	return 0;
-diff --git a/block/bfq-sched.c b/block/bfq-sched.c
-index c343099..d0890c6 100644
---- a/block/bfq-sched.c
-+++ b/block/bfq-sched.c
-@@ -1085,34 +1085,6 @@ static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd)
- 	return bfqq;
- }
- 
--/*
-- * Forced extraction of the given queue.
-- */
--static void bfq_get_next_queue_forced(struct bfq_data *bfqd,
--				      struct bfq_queue *bfqq)
--{
--	struct bfq_entity *entity;
--	struct bfq_sched_data *sd;
--
--	BUG_ON(bfqd->in_service_queue != NULL);
--
--	entity = &bfqq->entity;
--	/*
--	 * Bubble up extraction/update from the leaf to the root.
--	*/
--	for_each_entity(entity) {
--		sd = entity->sched_data;
--		bfq_update_budget(entity);
--		bfq_update_vtime(bfq_entity_service_tree(entity));
--		bfq_active_extract(bfq_entity_service_tree(entity), entity);
--		sd->in_service_entity = entity;
--		sd->next_in_service = NULL;
--		entity->service = 0;
--	}
--
--	return;
--}
--
- static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)
- {
- 	if (bfqd->in_service_bic != NULL) {
-diff --git a/block/bfq.h b/block/bfq.h
-index 00feff7..96ffbf7 100644
---- a/block/bfq.h
-+++ b/block/bfq.h
-@@ -218,18 +218,21 @@ struct bfq_group;
-  *                      idle @bfq_queue with no outstanding requests, then
-  *                      the task associated with the queue it is deemed as
-  *                      soft real-time (see the comments to the function
-- *                      bfq_bfqq_softrt_next_start()).
-+ *                      bfq_bfqq_softrt_next_start())
-  * @last_idle_bklogged: time of the last transition of the @bfq_queue from
-  *                      idle to backlogged
-  * @service_from_backlogged: cumulative service received from the @bfq_queue
-  *                           since the last transition from idle to
-  *                           backlogged
-+ * @bic: pointer to the bfq_io_cq owning the bfq_queue, set to %NULL if the
-+ *	 queue is shared
-  *
-- * A bfq_queue is a leaf request queue; it can be associated with an io_context
-- * or more, if it is async or shared between cooperating processes. @cgroup
-- * holds a reference to the cgroup, to be sure that it does not disappear while
-- * a bfqq still references it (mostly to avoid races between request issuing and
-- * task migration followed by cgroup destruction).
-+ * A bfq_queue is a leaf request queue; it can be associated with an
-+ * io_context or more, if it  is  async or shared  between  cooperating
-+ * processes. @cgroup holds a reference to the cgroup, to be sure that it
-+ * does not disappear while a bfqq still references it (mostly to avoid
-+ * races between request issuing and task migration followed by cgroup
-+ * destruction).
-  * All the fields are protected by the queue lock of the containing bfqd.
-  */
- struct bfq_queue {
-@@ -269,6 +272,7 @@ struct bfq_queue {
- 	unsigned int requests_within_timer;
- 
- 	pid_t pid;
-+	struct bfq_io_cq *bic;
- 
- 	/* weight-raising fields */
- 	unsigned long wr_cur_max_time;
-@@ -298,12 +302,42 @@ struct bfq_ttime {
-  * @icq: associated io_cq structure
-  * @bfqq: array of two process queues, the sync and the async
-  * @ttime: associated @bfq_ttime struct
-+ * @wr_time_left: snapshot of the time left before weight raising ends
-+ *                for the sync queue associated to this process; this
-+ *		  snapshot is taken to remember this value while the weight
-+ *		  raising is suspended because the queue is merged with a
-+ *		  shared queue, and is used to set @raising_cur_max_time
-+ *		  when the queue is split from the shared queue and its
-+ *		  weight is raised again
-+ * @saved_idle_window: same purpose as the previous field for the idle
-+ *                     window
-+ * @saved_IO_bound: same purpose as the previous two fields for the I/O
-+ *                  bound classification of a queue
-+ * @saved_in_large_burst: same purpose as the previous fields for the
-+ *                        value of the field keeping the queue's belonging
-+ *                        to a large burst
-+ * @was_in_burst_list: true if the queue belonged to a burst list
-+ *                     before its merge with another cooperating queue
-+ * @cooperations: counter of consecutive successful queue merges underwent
-+ *                by any of the process' @bfq_queues
-+ * @failed_cooperations: counter of consecutive failed queue merges of any
-+ *                       of the process' @bfq_queues
-  */
- struct bfq_io_cq {
- 	struct io_cq icq; /* must be the first member */
- 	struct bfq_queue *bfqq[2];
- 	struct bfq_ttime ttime;
- 	int ioprio;
-+
-+	unsigned int wr_time_left;
-+	bool saved_idle_window;
-+	bool saved_IO_bound;
-+
-+	bool saved_in_large_burst;
-+	bool was_in_burst_list;
-+
-+	unsigned int cooperations;
-+	unsigned int failed_cooperations;
- };
- 
- enum bfq_device_speed {
-@@ -536,7 +570,7 @@ enum bfqq_state_flags {
- 	BFQ_BFQQ_FLAG_idle_window,	/* slice idling enabled */
- 	BFQ_BFQQ_FLAG_sync,		/* synchronous queue */
- 	BFQ_BFQQ_FLAG_budget_new,	/* no completion with this budget */
--	BFQ_BFQQ_FLAG_IO_bound,         /*
-+	BFQ_BFQQ_FLAG_IO_bound,		/*
- 					 * bfqq has timed-out at least once
- 					 * having consumed at most 2/10 of
- 					 * its budget
-@@ -549,12 +583,13 @@ enum bfqq_state_flags {
- 					 * bfqq has proved to be slow and
- 					 * seeky until budget timeout
- 					 */
--	BFQ_BFQQ_FLAG_softrt_update,    /*
-+	BFQ_BFQQ_FLAG_softrt_update,	/*
- 					 * may need softrt-next-start
- 					 * update
- 					 */
- 	BFQ_BFQQ_FLAG_coop,		/* bfqq is shared */
--	BFQ_BFQQ_FLAG_split_coop,	/* shared bfqq will be splitted */
-+	BFQ_BFQQ_FLAG_split_coop,	/* shared bfqq will be split */
-+	BFQ_BFQQ_FLAG_just_split,	/* queue has just been split */
- };
- 
- #define BFQ_BFQQ_FNS(name)						\
-@@ -583,6 +618,7 @@ BFQ_BFQQ_FNS(in_large_burst);
- BFQ_BFQQ_FNS(constantly_seeky);
- BFQ_BFQQ_FNS(coop);
- BFQ_BFQQ_FNS(split_coop);
-+BFQ_BFQQ_FNS(just_split);
- BFQ_BFQQ_FNS(softrt_update);
- #undef BFQ_BFQQ_FNS
- 
--- 
-2.1.4
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/10-calculate-x86-4.1 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/10-calculate-x86-4.1
deleted file mode 100644
index 6a2a068d5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/10-calculate-x86-4.1
+++ /dev/null
@@ -1,3268 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==i686
-CONFIG_3C515=m
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_IPMI is not set
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-# CONFIG_ALIENWARE_WMI is not set
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-CONFIG_APM_ALLOW_INTS=y
-CONFIG_APM_CPU_IDLE=y
-CONFIG_APM_DISPLAY_BLANK=y
-CONFIG_APM_DO_ENABLE=y
-CONFIG_APM_IGNORE_USER_SUSPEND=y
-CONFIG_APM=m
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_CARDS=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMGENET=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET=m
-CONFIG_BE2NET_VXLAN=y
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BINFMT_AOUT=y
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-# CONFIG_CARL9170 is not set
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-# CONFIG_CC10001_ADC is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_CGROUP_FREEZER is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPUSETS is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CS89x0=m
-CONFIG_CS89x0_PLATFORM=y
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCA=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DGAP is not set
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DMA_ENGINE=y
-# CONFIG_DMATEST is not set
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-# CONFIG_DTLK is not set
-CONFIG_DUMMY=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
-# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CXD2820R=m
-# CONFIG_DVB_DDBRIDGE is not set
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-# CONFIG_DVB_NGENE is not set
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_PLL=m
-# CONFIG_DVB_PLUTO2 is not set
-# CONFIG_DVB_PT1 is not set
-# CONFIG_DVB_PT3 is not set
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_SI2168=m
-# CONFIG_DVB_SMIPCIE is not set
-CONFIG_DVB_SP2=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-# CONFIG_DVB_TTUSB_BUDGET is not set
-# CONFIG_DVB_TTUSB_DEC is not set
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_STUB=y
-# CONFIG_EFI_VARS is not set
-CONFIG_EISA_NAMES=y
-CONFIG_EISA_PCI_EISA=y
-CONFIG_EISA_VIRTUAL_ROOT=y
-# CONFIG_EISA_VLB_PRIMING is not set
-CONFIG_EISA=y
-CONFIG_EL3=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_EFI is not set
-# CONFIG_FB_SM750 is not set
-# CONFIG_FB_SM7XX is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FT1000 is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_PHY=y
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GENERIC=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-# CONFIG_HID_SENSOR_IIO_TRIGGER is not set
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-# CONFIG_HIGHPTE is not set
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HP100=m
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-CONFIG_HSU_DMA=m
-CONFIG_HSU_DMA_PCI=m
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_EG20T=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-# CONFIG_I2C_MUX_PCA9541 is not set
-# CONFIG_I2C_MUX_PINCTRL is not set
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-# CONFIG_I2C_PCA_ISA is not set
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_BUS is not set
-# CONFIG_I2O_CONFIG is not set
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O=m
-# CONFIG_I2O_PROC is not set
-# CONFIG_I2O_SCSI is not set
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I40E_VXLAN=y
-CONFIG_I6300ESB_WDT=m
-CONFIG_I82092=m
-# CONFIG_I82365 is not set
-CONFIG_I8K=m
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER is not set
-CONFIG_IIO=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_IIO_TRIGGER is not set
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_LRO=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-# CONFIG_INV_MPU6050_IIO is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=m
-CONFIG_IP1000=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_ISAPNP=y
-CONFIG_ISA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_UAPSD is not set
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_KERNEL_XZ=y
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_ASYNC_PF=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-CONFIG_LANCE=m
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_PM8941_WLED=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-# CONFIG_LGUEST_GUEST is not set
-CONFIG_LGUEST=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-CONFIG_LLC=m
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-# CONFIG_MEMCG_KMEM is not set
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DLN2=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIXCOMWD is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-# CONFIG_MLX90614 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_CLKGATE is not set
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMU_NOTIFIER=y
-CONFIG_MODULE_COMPRESS_GZIP=y
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-# CONFIG_MPL115 is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_NEED_BOUNCE_POOL=y
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_VENDOR_CIRRUS=y
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NI65=m
-CONFIG_NILFS2_FS=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-CONFIG_PACKET=m
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_ISAPNP is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_QDI is not set
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-# CONFIG_PATA_WINBOND_VLB is not set
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCH_DMA=m
-CONFIG_PCH_GBE=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-# CONFIG_PCWATCHDOG is not set
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHYSICAL_ALIGN=0x100000
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-# CONFIG_PM_TRACE_RTC is not set
-# CONFIG_PNPBIOS is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PVPANIC=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-# CONFIG_QLCNIC_VXLAN is not set
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_R8723AU=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-# CONFIG_RD_XZ is not set
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC7240_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-# CONFIG_SCSI_DTC3280 is not set
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IN2000 is not set
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS_LOGGING=y
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_LOGGING=y
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SIM710 is not set
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-# CONFIG_SCSI_SYM53C416 is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SCx200_ACB=m
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMC9194=m
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_SMS_SIANO_MDTV=m
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_AD1889=m
-CONFIG_SND_ADLIB=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_MSND_PINNACLE=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_SCS1X=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_SSCAPE=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TC1100_WMI=m
-# CONFIG_TCIC is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-# CONFIG_TI_ADC081C is not set
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TTPCI_EEPROM is not set
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TYPHOON=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_ULTRA=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_USB_ACM=m
-# CONFIG_USB_AIRSPY is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-CONFIG_USB_FUSB300=m
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-# CONFIG_USB_HACKRF is not set
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSO=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-# CONFIG_USB_WPAN_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_RING=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-# CONFIG_VIDEO_CX25821 is not set
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_CONSOLE is not set
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_VMWARE_BALLOON is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WD80x3=m
-# CONFIG_WDT is not set
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_WIMAX_GDM72XX_USB=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_X86_APM_BOOT=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_CPUID=m
-CONFIG_X86_E_POWERSAVER=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_PMEM_LEGACY=y
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_PPRO_FENCE=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_ZPOOL=y
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZRAM_LZ4_COMPRESS=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_HIGHMEM=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RODATA=
-!CONFIG_DEBUG_RODATA_TEST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DECOMPRESS_BZIP2=
-!CONFIG_DECOMPRESS_LZMA=
-!CONFIG_DECOMPRESS_LZO=
-!CONFIG_DECOMPRESS_XZ=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_DRM_I810=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MCE_INJ=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT23=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HPET_MMAP=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTEL_SOC_PMIC=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM800=
-!CONFIG_MFD_88PM805=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_AXP20X=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_DA9063=
-!CONFIG_MFD_DA9150=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX14577=
-!CONFIG_MFD_MAX77693=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8907=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_RT5033=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MMIOTRACE=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_PID_CPUSET=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_CPU_STALL_INFO=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GOODIX=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_X86_32_NON_STANDARD=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_STATIC_CPU_HAS=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_INTEL_MID=
-!CONFIG_X86_INTEL_QUARK=
-!CONFIG_X86_INTEL_USERCOPY=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_RDC321X=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/10-calculate-x86_64-4.1 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/10-calculate-x86_64-4.1
deleted file mode 100644
index f3bb6446b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/10-calculate-x86_64-4.1
+++ /dev/null
@@ -1,3123 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==x86_64
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AMD8111_ETH=m
-# CONFIG_AMD_IOMMU is not set
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_CARDS=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMGENET=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET=m
-CONFIG_BE2NET_VXLAN=y
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-# CONFIG_CARL9170 is not set
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-# CONFIG_CC10001_ADC is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_CGROUP_FREEZER is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB2 is not set
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPUSETS is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA1_MB=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-# CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCA=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-# CONFIG_DEVFREQ_GOV_USERSPACE is not set
-# CONFIG_DGAP is not set
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DMA_ENGINE=y
-# CONFIG_DMATEST is not set
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-CONFIG_DUMMY=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
-# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CXD2820R=m
-# CONFIG_DVB_DDBRIDGE is not set
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-# CONFIG_DVB_NGENE is not set
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_PLL=m
-# CONFIG_DVB_PLUTO2 is not set
-# CONFIG_DVB_PT1 is not set
-# CONFIG_DVB_PT3 is not set
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_SI2168=m
-# CONFIG_DVB_SMIPCIE is not set
-CONFIG_DVB_SP2=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-# CONFIG_DVB_TTUSB_BUDGET is not set
-# CONFIG_DVB_TTUSB_DEC is not set
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_MIXED=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_VARS=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SM750 is not set
-# CONFIG_FB_SM7XX is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FT1000 is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-CONFIG_GART_IOMMU=y
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_PHY=y
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-# CONFIG_HID_SENSOR_IIO_TRIGGER is not set
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HP100=m
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-CONFIG_HSU_DMA=m
-CONFIG_HSU_DMA_PCI=m
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-# CONFIG_I2C_MUX_PCA9541 is not set
-# CONFIG_I2C_MUX_PINCTRL is not set
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_BUS is not set
-# CONFIG_I2O_CONFIG is not set
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O=m
-# CONFIG_I2O_PROC is not set
-# CONFIG_I2O_SCSI is not set
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I40E_VXLAN=y
-CONFIG_I6300ESB_WDT=m
-CONFIG_I82092=m
-CONFIG_I8K=m
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER is not set
-CONFIG_IIO=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_IIO_TRIGGER is not set
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_LRO=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_IOATDMA=m
-# CONFIG_INTEL_IOMMU is not set
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_MIC_BUS=m
-# CONFIG_INTEL_MIC_CARD is not set
-# CONFIG_INTEL_MIC_HOST is not set
-# CONFIG_INTEL_MIC_X100_DMA is not set
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-# CONFIG_INV_MPU6050_IIO is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=m
-CONFIG_IP1000=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_UAPSD is not set
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_KERNEL_XZ=y
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_ASYNC_PF=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_PM8941_WLED=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-CONFIG_LLC=m
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-# CONFIG_MEMCG_KMEM is not set
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DLN2=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-# CONFIG_MLX90614 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_CLKGATE is not set
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMU_NOTIFIER=y
-CONFIG_MODULE_COMPRESS_GZIP=y
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-# CONFIG_MPL115 is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_NE2K_PCI=m
-CONFIG_NEED_BOUNCE_POOL=y
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NILFS2_FS=m
-CONFIG_NIU=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-# CONFIG_NO_HZ is not set
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-# CONFIG_NTP_PPS is not set
-# CONFIG_NUMA is not set
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-# CONFIG_PCI_PASID is not set
-CONFIG_PCIPCWATCHDOG=m
-# CONFIG_PCI_PRI is not set
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHYSICAL_ALIGN=0x1000000
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PVPANIC=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-# CONFIG_QLCNIC_VXLAN is not set
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_R8723AU=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-CONFIG_RCU_FANOUT=32
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS_LOGGING=y
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_LOGGING=y
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_SMS_SIANO_MDTV=m
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_JACK=y
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SCS1X=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SONICVIBES=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-# CONFIG_TI_ADC081C is not set
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TTPCI_EEPROM is not set
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TYPHOON=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_USB_ACM=m
-# CONFIG_USB_AIRSPY is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_PRINTER=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-# CONFIG_USB_HACKRF is not set
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSO=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-# CONFIG_USB_WPAN_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_RING=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-# CONFIG_VIDEO_CX25821 is not set
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_CONSOLE is not set
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_VMWARE_BALLOON is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_WIMAX_GDM72XX_USB=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUID=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_PMEM_LEGACY=y
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_X32=y
-# CONFIG_XEN is not set
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_ZPOOL=y
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZRAM_LZ4_COMPRESS=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_ACPI_NUMA=
-!CONFIG_AMD_IOMMU_STATS=
-!CONFIG_AMD_IOMMU_V2=
-!CONFIG_AMD_NUMA=
-!CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RODATA=
-!CONFIG_DEBUG_RODATA_TEST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_DMAR_TABLE=
-!CONFIG_DRM_I810=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MCE_INJ=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT23=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HAVE_INTEL_TXT=
-!CONFIG_HPET_MMAP=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTEL_IOMMU_DEFAULT_ON=
-!CONFIG_INTEL_IOMMU_FLOPPY_WA=
-!CONFIG_INTEL_SOC_PMIC=
-!CONFIG_INTEL_TXT=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IOMMU_API=
-!CONFIG_IOMMU_IOVA=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MAXSMP=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM800=
-!CONFIG_MFD_88PM805=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_AXP20X=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_DA9063=
-!CONFIG_MFD_DA9150=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX14577=
-!CONFIG_MFD_MAX77693=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8907=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_RT5033=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MMIOTRACE=
-!CONFIG_MOVABLE_NODE=
-!CONFIG_NEED_MULTIPLE_NODES=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NODES_SHIFT=
-!CONFIG_NODES_SPAN_OTHER_NODES=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_NUMA_BALANCING=
-!CONFIG_NUMA_EMU=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_ATS=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_PID_CPUSET=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_CPU_STALL_INFO=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GOODIX=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_USE_PERCPU_NUMA_NODE_ID=
-!CONFIG_VFIO=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_X86_64_ACPI_NUMA=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_STATIC_CPU_HAS=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_VSMP=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/20-server b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/20-server
deleted file mode 100644
index c47d3785f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/20-server
+++ /dev/null
@@ -1,59 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-# CONFIG_DRM_I810 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_HZ_300=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-!CONFIG_DEBUG_PREEMPT=
-!CONFIG_JOYSTICK_A3D=
-!CONFIG_JOYSTICK_ADI=
-!CONFIG_JOYSTICK_ANALOG=
-!CONFIG_JOYSTICK_AS5011=
-!CONFIG_JOYSTICK_COBRA=
-!CONFIG_JOYSTICK_DB9=
-!CONFIG_JOYSTICK_GAMECON=
-!CONFIG_JOYSTICK_GF2K=
-!CONFIG_JOYSTICK_GRIP=
-!CONFIG_JOYSTICK_GRIP_MP=
-!CONFIG_JOYSTICK_GUILLEMOT=
-!CONFIG_JOYSTICK_IFORCE=
-!CONFIG_JOYSTICK_IFORCE_232=
-!CONFIG_JOYSTICK_IFORCE_USB=
-!CONFIG_JOYSTICK_INTERACT=
-!CONFIG_JOYSTICK_JOYDUMP=
-!CONFIG_JOYSTICK_MAGELLAN=
-!CONFIG_JOYSTICK_SIDEWINDER=
-!CONFIG_JOYSTICK_SPACEBALL=
-!CONFIG_JOYSTICK_SPACEORB=
-!CONFIG_JOYSTICK_STINGER=
-!CONFIG_JOYSTICK_TMDC=
-!CONFIG_JOYSTICK_TURBOGRAFX=
-!CONFIG_JOYSTICK_TWIDJOY=
-!CONFIG_JOYSTICK_WALKERA0701=
-!CONFIG_JOYSTICK_WARRIOR=
-!CONFIG_JOYSTICK_XPAD=
-!CONFIG_JOYSTICK_XPAD_FF=
-!CONFIG_JOYSTICK_XPAD_LEDS=
-!CONFIG_JOYSTICK_ZHENHUA=
-!CONFIG_PREEMPT_COUNT=
-!CONFIG_RCU_BOOST=
-!CONFIG_RCU_CPU_STALL_VERBOSE=
-!CONFIG_TABLET_SERIAL_WACOM4=
-!CONFIG_TABLET_USB_ACECAD=
-!CONFIG_TABLET_USB_AIPTEK=
-!CONFIG_TABLET_USB_GTCO=
-!CONFIG_TABLET_USB_HANWANG=
-!CONFIG_TABLET_USB_KBTAB=
-!CONFIG_TREE_PREEMPT_RCU=
-!CONFIG_UNINLINE_SPIN_UNLOCK=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/30-bfq b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/30-bfq
deleted file mode 100644
index 083b5c2a7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/30-bfq
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==desktop
-# CONFIG_CGROUP_BFQIO is not set
-CONFIG_DEFAULT_BFQ=y
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_IOSCHED="bfq"
-CONFIG_IOSCHED_BFQ=y
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/30-hyperv b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/30-hyperv
deleted file mode 100644
index b499ead54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/30-hyperv
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-CONFIG_FB_HYPERV=m
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_UTILS=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
deleted file mode 100644
index b7ef63ce1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.1/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-# Calculate format=diff pkg(sys-devel/gcc)>=4.9
-WARNING - this version of the patch works with version 4.9+ of gcc and with
-kernel version 3.15.x+ and should NOT be applied when compiling on older
-versions due to name changes of the flags with the 4.9 release of gcc.
-Use the older version of this patch hosted on the same github for older
-versions of gcc. For example:
-
-corei7 --> nehalem
-corei7-avx --> sandybridge
-core-avx-i --> ivybridge
-core-avx2 --> haswell
-
-For more, see: https://gcc.gnu.org/gcc-4.9/changes.html
-
-It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes.
-Note that upstream is using the deprecated 'match=atom' flags when I believe it
-should use the newer 'march=bonnell' flag for atom processors.
-
-I have made that change to this patch set as well.  See the following kernel
-bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461
-
-This patch will expand the number of microarchitectures to include new
-processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family
-14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD
-Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core
-i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen
-Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th
-Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag.
-
-Small but real speed increases are measurable using a make endpoint comparing
-a generic kernel to one built with one of the respective microarchs.
-
-See the following experimental evidence supporting this statement:
-https://github.com/graysky2/kernel_gcc_patch
-
-REQUIREMENTS
-linux version >=3.15
-gcc version >=4.9
-
---- a/arch/x86/include/asm/module.h	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/include/asm/module.h	2014-09-13 09:37:16.721385247 -0400
-@@ -15,6 +15,20 @@
- #define MODULE_PROC_FAMILY "586MMX "
- #elif defined CONFIG_MCORE2
- #define MODULE_PROC_FAMILY "CORE2 "
-+#elif defined CONFIG_MNATIVE
-+#define MODULE_PROC_FAMILY "NATIVE "
-+#elif defined CONFIG_MNEHALEM
-+#define MODULE_PROC_FAMILY "NEHALEM "
-+#elif defined CONFIG_MWESTMERE
-+#define MODULE_PROC_FAMILY "WESTMERE "
-+#elif defined CONFIG_MSANDYBRIDGE
-+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
-+#elif defined CONFIG_MIVYBRIDGE
-+#define MODULE_PROC_FAMILY "IVYBRIDGE "
-+#elif defined CONFIG_MHASWELL
-+#define MODULE_PROC_FAMILY "HASWELL "
-+#elif defined CONFIG_MBROADWELL
-+#define MODULE_PROC_FAMILY "BROADWELL "
- #elif defined CONFIG_MATOM
- #define MODULE_PROC_FAMILY "ATOM "
- #elif defined CONFIG_M686
-@@ -33,6 +47,20 @@
- #define MODULE_PROC_FAMILY "K7 "
- #elif defined CONFIG_MK8
- #define MODULE_PROC_FAMILY "K8 "
-+#elif defined CONFIG_MK8SSE3
-+#define MODULE_PROC_FAMILY "K8SSE3 "
-+#elif defined CONFIG_MK10
-+#define MODULE_PROC_FAMILY "K10 "
-+#elif defined CONFIG_MBARCELONA
-+#define MODULE_PROC_FAMILY "BARCELONA "
-+#elif defined CONFIG_MBOBCAT
-+#define MODULE_PROC_FAMILY "BOBCAT "
-+#elif defined CONFIG_MBULLDOZER
-+#define MODULE_PROC_FAMILY "BULLDOZER "
-+#elif defined CONFIG_MPILEDRIVER
-+#define MODULE_PROC_FAMILY "PILEDRIVER "
-+#elif defined CONFIG_MJAGUAR
-+#define MODULE_PROC_FAMILY "JAGUAR "
- #elif defined CONFIG_MELAN
- #define MODULE_PROC_FAMILY "ELAN "
- #elif defined CONFIG_MCRUSOE
---- a/arch/x86/Kconfig.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Kconfig.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -137,9 +137,8 @@ config MPENTIUM4
- 		-Paxville
- 		-Dempsey
- 
--
- config MK6
--	bool "K6/K6-II/K6-III"
-+	bool "AMD K6/K6-II/K6-III"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD K6-family processor.  Enables use of
-@@ -147,7 +146,7 @@ config MK6
- 	  flags to GCC.
- 
- config MK7
--	bool "Athlon/Duron/K7"
-+	bool "AMD Athlon/Duron/K7"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD Athlon K7-family processor.  Enables use of
-@@ -155,12 +154,62 @@ config MK7
- 	  flags to GCC.
- 
- config MK8
--	bool "Opteron/Athlon64/Hammer/K8"
-+	bool "AMD Opteron/Athlon64/Hammer/K8"
- 	---help---
- 	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
- 	  Enables use of some extended instructions, and passes appropriate
- 	  optimization flags to GCC.
- 
-+config MK8SSE3
-+	bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
-+	---help---
-+	  Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MK10
-+	bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
-+	---help---
-+	  Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
-+		Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MBARCELONA
-+	bool "AMD Barcelona"
-+	---help---
-+	  Select this for AMD Barcelona and newer processors.
-+
-+	  Enables -march=barcelona
-+
-+config MBOBCAT
-+	bool "AMD Bobcat"
-+	---help---
-+	  Select this for AMD Bobcat processors.
-+
-+	  Enables -march=btver1
-+
-+config MBULLDOZER
-+	bool "AMD Bulldozer"
-+	---help---
-+	  Select this for AMD Bulldozer processors.
-+
-+	  Enables -march=bdver1
-+
-+config MPILEDRIVER
-+	bool "AMD Piledriver"
-+	---help---
-+	  Select this for AMD Piledriver processors.
-+
-+	  Enables -march=bdver2
-+
-+config MJAGUAR
-+	bool "AMD Jaguar"
-+	---help---
-+	  Select this for AMD Jaguar processors.
-+
-+	  Enables -march=btver2
-+
- config MCRUSOE
- 	bool "Crusoe"
- 	depends on X86_32
-@@ -251,8 +300,17 @@ config MPSC
- 	  using the cpu family field
- 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
- 
-+config MATOM
-+	bool "Intel Atom"
-+	---help---
-+
-+	  Select this for the Intel Atom platform. Intel Atom CPUs have an
-+	  in-order pipelining architecture and thus can benefit from
-+	  accordingly optimized code. Use a recent GCC with specific Atom
-+	  support in order to fully benefit from selecting this option.
-+
- config MCORE2
--	bool "Core 2/newer Xeon"
-+	bool "Intel Core 2"
- 	---help---
- 
- 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
-@@ -260,14 +318,55 @@ config MCORE2
- 	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
- 	  (not a typo)
- 
--config MATOM
--	bool "Intel Atom"
-+	  Enables -march=core2
-+
-+config MNEHALEM
-+	bool "Intel Nehalem"
- 	---help---
- 
--	  Select this for the Intel Atom platform. Intel Atom CPUs have an
--	  in-order pipelining architecture and thus can benefit from
--	  accordingly optimized code. Use a recent GCC with specific Atom
--	  support in order to fully benefit from selecting this option.
-+	  Select this for 1st Gen Core processors in the Nehalem family.
-+
-+	  Enables -march=nehalem
-+
-+config MWESTMERE
-+	bool "Intel Westmere"
-+	---help---
-+
-+	  Select this for the Intel Westmere formerly Nehalem-C family.
-+
-+	  Enables -march=westmere
-+
-+config MSANDYBRIDGE
-+	bool "Intel Sandy Bridge"
-+	---help---
-+
-+	  Select this for 2nd Gen Core processors in the Sandy Bridge family.
-+
-+	  Enables -march=sandybridge
-+
-+config MIVYBRIDGE
-+	bool "Intel Ivy Bridge"
-+	---help---
-+
-+	  Select this for 3rd Gen Core processors in the Ivy Bridge family.
-+
-+	  Enables -march=ivybridge
-+
-+config MHASWELL
-+	bool "Intel Haswell"
-+	---help---
-+
-+	  Select this for 4th Gen Core processors in the Haswell family.
-+
-+	  Enables -march=haswell
-+
-+config MBROADWELL
-+	bool "Intel Broadwell"
-+	---help---
-+
-+	  Select this for 5th Gen Core processors in the Broadwell family.
-+
-+	  Enables -march=broadwell
- 
- config GENERIC_CPU
- 	bool "Generic-x86-64"
-@@ -276,6 +375,19 @@ config GENERIC_CPU
- 	  Generic x86-64 CPU.
- 	  Run equally well on all x86-64 CPUs.
- 
-+config MNATIVE
-+ bool "Native optimizations autodetected by GCC"
-+ ---help---
-+
-+   GCC 4.2 and above support -march=native, which automatically detects
-+   the optimum settings to use based on your processor. -march=native 
-+   also detects and applies additional settings beyond -march specific
-+   to your CPU, (eg. -msse4). Unless you have a specific reason not to
-+   (e.g. distcc cross-compiling), you should probably be using
-+   -march=native rather than anything listed below.
-+
-+   Enables -march=native
-+
- endchoice
- 
- config X86_GENERIC
-@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT
- config X86_L1_CACHE_SHIFT
- 	int
- 	default "7" if MPENTIUM4 || MPSC
--	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
-+	default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
- 	default "4" if MELAN || M486 || MGEODEGX1
- 	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
- 
-@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16
- 
- config X86_INTEL_USERCOPY
- 	def_bool y
--	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
-+	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE
- 
- config X86_USE_PPRO_CHECKSUM
- 	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE
- 
- config X86_USE_3DNOW
- 	def_bool y
-@@ -359,17 +471,17 @@ config X86_P6_NOP
- 
- config X86_TSC
- 	def_bool y
--	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
-+	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64
- 
- config X86_CMPXCHG64
- 	def_bool y
--	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
-+	depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE
- 
- # this should be set for all -march=.. options where the compiler
- # generates cmov.
- config X86_CMOV
- 	def_bool y
--	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
-+	depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX)
- 
- config X86_MINIMUM_CPU_FAMILY
- 	int
---- a/arch/x86/Makefile	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile	2014-09-13 09:37:16.721385247 -0400
-@@ -92,13 +92,33 @@ else
- 	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
- 
-         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
-+        cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
-         cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
-+        cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8)
-+        cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
-+        cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
-+        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
-+        cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
-+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
-+        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
-         cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
- 
-         cflags-$(CONFIG_MCORE2) += \
--                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
--	cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
--		$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+                $(call cc-option,-march=core2,$(call cc-option,-mtune=core2))
-+        cflags-$(CONFIG_MNEHALEM) += \
-+                $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem))
-+        cflags-$(CONFIG_MWESTMERE) += \
-+                $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere))
-+        cflags-$(CONFIG_MSANDYBRIDGE) += \
-+                $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge))
-+        cflags-$(CONFIG_MIVYBRIDGE) += \
-+                $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge))
-+        cflags-$(CONFIG_MHASWELL) += \
-+                $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell))
-+        cflags-$(CONFIG_MBROADWELL) += \
-+                $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell))
-+        cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \
-+                $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
-         cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
-         KBUILD_CFLAGS += $(cflags-y)
- 
---- a/arch/x86/Makefile_32.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile_32.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6)		+= -march=k6
- # Please note, that patches that add -march=athlon-xp and friends are pointless.
- # They make zero difference whatsosever to performance at this time.
- cflags-$(CONFIG_MK7)		+= -march=athlon
-+cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
- cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)
-+cflags-$(CONFIG_MK8SSE3)		+= $(call cc-option,-march=k8-sse3,-march=athlon)
-+cflags-$(CONFIG_MK10)	+= $(call cc-option,-march=amdfam10,-march=athlon)
-+cflags-$(CONFIG_MBARCELONA)	+= $(call cc-option,-march=barcelona,-march=athlon)
-+cflags-$(CONFIG_MBOBCAT)	+= $(call cc-option,-march=btver1,-march=athlon)
-+cflags-$(CONFIG_MBULLDOZER)	+= $(call cc-option,-march=bdver1,-march=athlon)
-+cflags-$(CONFIG_MPILEDRIVER)	+= $(call cc-option,-march=bdver2,-march=athlon)
-+cflags-$(CONFIG_MJAGUAR)	+= $(call cc-option,-march=btver2,-march=athlon)
- cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)
-@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-
- cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)
- cflags-$(CONFIG_MVIAC7)		+= -march=i686
- cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)
--cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \
--	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+cflags-$(CONFIG_MNEHALEM)	+= -march=i686 $(call tune,nehalem)
-+cflags-$(CONFIG_MWESTMERE)	+= -march=i686 $(call tune,westmere)
-+cflags-$(CONFIG_MSANDYBRIDGE)	+= -march=i686 $(call tune,sandybridge)
-+cflags-$(CONFIG_MIVYBRIDGE)	+= -march=i686 $(call tune,ivybridge)
-+cflags-$(CONFIG_MHASWELL)	+= -march=i686 $(call tune,haswell)
-+cflags-$(CONFIG_MBROADWELL)	+= -march=i686 $(call tune,broadwell)
-+cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \
-+	$(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
- 
- # AMD Elan support
- cflags-$(CONFIG_MELAN)		+= -march=i486
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/.calculate_directory
deleted file mode 100644
index b16b7c8d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-kernel/calculate-sources)>=4.4&&merge(sys-kernel/calculate-sources)<4.5&&pkg(sys-apps/calculate-utils)>=3.3.0.16
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch
deleted file mode 100644
index 9c1283621..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From f54f3003586bf00ba0ee5974a92b732477b834e3 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Tue, 7 Apr 2015 13:39:12 +0200
-Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r11-4.4.0
-
-Update Kconfig.iosched and do the related Makefile changes to include
-kernel configuration options for BFQ. Also increase the number of
-policies supported by the blkio controller so that BFQ can add its
-own.
-
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini@google.com>
----
- block/Kconfig.iosched  | 32 ++++++++++++++++++++++++++++++++
- block/Makefile         |  1 +
- include/linux/blkdev.h |  2 +-
- 3 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
-index 421bef9..0ee5f0f 100644
---- a/block/Kconfig.iosched
-+++ b/block/Kconfig.iosched
-@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
- 	---help---
- 	  Enable group IO scheduling in CFQ.
- 
-+config IOSCHED_BFQ
-+	tristate "BFQ I/O scheduler"
-+	default n
-+	---help---
-+	  The BFQ I/O scheduler tries to distribute bandwidth among
-+	  all processes according to their weights.
-+	  It aims at distributing the bandwidth as desired, independently of
-+	  the disk parameters and with any workload. It also tries to
-+	  guarantee low latency to interactive and soft real-time
-+	  applications. If compiled built-in (saying Y here), BFQ can
-+	  be configured to support hierarchical scheduling.
-+
-+config CGROUP_BFQIO
-+	bool "BFQ hierarchical scheduling support"
-+	depends on CGROUPS && IOSCHED_BFQ=y
-+	default n
-+	---help---
-+	  Enable hierarchical scheduling in BFQ, using the cgroups
-+	  filesystem interface.  The name of the subsystem will be
-+	  bfqio.
-+
- choice
- 	prompt "Default I/O scheduler"
- 	default DEFAULT_CFQ
-@@ -52,6 +73,16 @@ choice
- 	config DEFAULT_CFQ
- 		bool "CFQ" if IOSCHED_CFQ=y
- 
-+	config DEFAULT_BFQ
-+		bool "BFQ" if IOSCHED_BFQ=y
-+		help
-+		  Selects BFQ as the default I/O scheduler which will be
-+		  used by default for all block devices.
-+		  The BFQ I/O scheduler aims at distributing the bandwidth
-+		  as desired, independently of the disk parameters and with
-+		  any workload. It also tries to guarantee low latency to
-+		  interactive and soft real-time applications.
-+
- 	config DEFAULT_NOOP
- 		bool "No-op"
- 
-@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
- 	string
- 	default "deadline" if DEFAULT_DEADLINE
- 	default "cfq" if DEFAULT_CFQ
-+	default "bfq" if DEFAULT_BFQ
- 	default "noop" if DEFAULT_NOOP
- 
- endmenu
-diff --git a/block/Makefile b/block/Makefile
-index 00ecc97..1ed86d5 100644
---- a/block/Makefile
-+++ b/block/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING)	+= blk-throttle.o
- obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
- obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
- obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
-+obj-$(CONFIG_IOSCHED_BFQ)	+= bfq-iosched.o
- 
- obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
- obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
-diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index c70e358..ae43492 100644
---- a/include/linux/blkdev.h
-+++ b/include/linux/blkdev.h
-@@ -44,7 +44,7 @@ struct pr_ops;
-  * Maximum number of blkcg policies allowed to be registered concurrently.
-  * Defined here to simplify include dependency.
-  */
--#define BLKCG_MAX_POLS		2
-+#define BLKCG_MAX_POLS		3
- 
- struct request;
- typedef void (rq_end_io_fn)(struct request *, int);
--- 
-1.9.1
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch
deleted file mode 100644
index 4915a7eb6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch
+++ /dev/null
@@ -1,7098 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From 03d30cc06a5436c05ee338bd21903802181bafe9 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Thu, 9 May 2013 19:10:02 +0200
-Subject: [PATCH 2/3] block: introduce the BFQ-v7r11 I/O sched for 4.4.0
-
-The general structure is borrowed from CFQ, as much of the code for
-handling I/O contexts. Over time, several useful features have been
-ported from CFQ as well (details in the changelog in README.BFQ). A
-(bfq_)queue is associated to each task doing I/O on a device, and each
-time a scheduling decision has to be made a queue is selected and served
-until it expires.
-
-    - Slices are given in the service domain: tasks are assigned
-      budgets, measured in number of sectors. Once got the disk, a task
-      must however consume its assigned budget within a configurable
-      maximum time (by default, the maximum possible value of the
-      budgets is automatically computed to comply with this timeout).
-      This allows the desired latency vs "throughput boosting" tradeoff
-      to be set.
-
-    - Budgets are scheduled according to a variant of WF2Q+, implemented
-      using an augmented rb-tree to take eligibility into account while
-      preserving an O(log N) overall complexity.
-
-    - A low-latency tunable is provided; if enabled, both interactive
-      and soft real-time applications are guaranteed a very low latency.
-
-    - Latency guarantees are preserved also in the presence of NCQ.
-
-    - Also with flash-based devices, a high throughput is achieved
-      while still preserving latency guarantees.
-
-    - BFQ features Early Queue Merge (EQM), a sort of fusion of the
-      cooperating-queue-merging and the preemption mechanisms present
-      in CFQ. EQM is in fact a unified mechanism that tries to get a
-      sequential read pattern, and hence a high throughput, with any
-      set of processes performing interleaved I/O over a contiguous
-      sequence of sectors.
-
-    - BFQ supports full hierarchical scheduling, exporting a cgroups
-      interface.  Since each node has a full scheduler, each group can
-      be assigned its own weight.
-
-    - If the cgroups interface is not used, only I/O priorities can be
-      assigned to processes, with ioprio values mapped to weights
-      with the relation weight = IOPRIO_BE_NR - ioprio.
-
-    - ioprio classes are served in strict priority order, i.e., lower
-      priority queues are not served as long as there are higher
-      priority queues.  Among queues in the same class the bandwidth is
-      distributed in proportion to the weight of each queue. A very
-      thin extra bandwidth is however guaranteed to the Idle class, to
-      prevent it from starving.
-
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini@google.com>
----
- block/Kconfig.iosched |    6 +-
- block/bfq-cgroup.c    | 1182 ++++++++++++++++
- block/bfq-ioc.c       |   36 +
- block/bfq-iosched.c   | 3754 +++++++++++++++++++++++++++++++++++++++++++++++++
- block/bfq-sched.c     | 1200 ++++++++++++++++
- block/bfq.h           |  801 +++++++++++
- 6 files changed, 6975 insertions(+), 4 deletions(-)
- create mode 100644 block/bfq-cgroup.c
- create mode 100644 block/bfq-ioc.c
- create mode 100644 block/bfq-iosched.c
- create mode 100644 block/bfq-sched.c
- create mode 100644 block/bfq.h
-
-diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
-index 0ee5f0f..f78cd1a 100644
---- a/block/Kconfig.iosched
-+++ b/block/Kconfig.iosched
-@@ -51,14 +51,12 @@ config IOSCHED_BFQ
- 	  applications. If compiled built-in (saying Y here), BFQ can
- 	  be configured to support hierarchical scheduling.
- 
--config CGROUP_BFQIO
-+config BFQ_GROUP_IOSCHED
- 	bool "BFQ hierarchical scheduling support"
- 	depends on CGROUPS && IOSCHED_BFQ=y
- 	default n
- 	---help---
--	  Enable hierarchical scheduling in BFQ, using the cgroups
--	  filesystem interface.  The name of the subsystem will be
--	  bfqio.
-+	  Enable hierarchical scheduling in BFQ, using the blkio controller.
- 
- choice
- 	prompt "Default I/O scheduler"
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-new file mode 100644
-index 0000000..8610cd6
---- /dev/null
-+++ b/block/bfq-cgroup.c
-@@ -0,0 +1,1182 @@
-+/*
-+ * BFQ: CGROUPS support.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-+ * file.
-+ */
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+
-+/* bfqg stats flags */
-+enum bfqg_stats_flags {
-+	BFQG_stats_waiting = 0,
-+	BFQG_stats_idling,
-+	BFQG_stats_empty,
-+};
-+
-+#define BFQG_FLAG_FNS(name)						\
-+static void bfqg_stats_mark_##name(struct bfqg_stats *stats)	\
-+{									\
-+	stats->flags |= (1 << BFQG_stats_##name);			\
-+}									\
-+static void bfqg_stats_clear_##name(struct bfqg_stats *stats)	\
-+{									\
-+	stats->flags &= ~(1 << BFQG_stats_##name);			\
-+}									\
-+static int bfqg_stats_##name(struct bfqg_stats *stats)		\
-+{									\
-+	return (stats->flags & (1 << BFQG_stats_##name)) != 0;		\
-+}									\
-+
-+BFQG_FLAG_FNS(waiting)
-+BFQG_FLAG_FNS(idling)
-+BFQG_FLAG_FNS(empty)
-+#undef BFQG_FLAG_FNS
-+
-+/* This should be called with the queue_lock held. */
-+static void bfqg_stats_update_group_wait_time(struct bfqg_stats *stats)
-+{
-+	unsigned long long now;
-+
-+	if (!bfqg_stats_waiting(stats))
-+		return;
-+
-+	now = sched_clock();
-+	if (time_after64(now, stats->start_group_wait_time))
-+		blkg_stat_add(&stats->group_wait_time,
-+			      now - stats->start_group_wait_time);
-+	bfqg_stats_clear_waiting(stats);
-+}
-+
-+/* This should be called with the queue_lock held. */
-+static void bfqg_stats_set_start_group_wait_time(struct bfq_group *bfqg,
-+						 struct bfq_group *curr_bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	if (bfqg_stats_waiting(stats))
-+		return;
-+	if (bfqg == curr_bfqg)
-+		return;
-+	stats->start_group_wait_time = sched_clock();
-+	bfqg_stats_mark_waiting(stats);
-+}
-+
-+/* This should be called with the queue_lock held. */
-+static void bfqg_stats_end_empty_time(struct bfqg_stats *stats)
-+{
-+	unsigned long long now;
-+
-+	if (!bfqg_stats_empty(stats))
-+		return;
-+
-+	now = sched_clock();
-+	if (time_after64(now, stats->start_empty_time))
-+		blkg_stat_add(&stats->empty_time,
-+			      now - stats->start_empty_time);
-+	bfqg_stats_clear_empty(stats);
-+}
-+
-+static void bfqg_stats_update_dequeue(struct bfq_group *bfqg)
-+{
-+	blkg_stat_add(&bfqg->stats.dequeue, 1);
-+}
-+
-+static void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	if (blkg_rwstat_total(&stats->queued))
-+		return;
-+
-+	/*
-+	 * group is already marked empty. This can happen if bfqq got new
-+	 * request in parent group and moved to this group while being added
-+	 * to service tree. Just ignore the event and move on.
-+	 */
-+	if (bfqg_stats_empty(stats))
-+		return;
-+
-+	stats->start_empty_time = sched_clock();
-+	bfqg_stats_mark_empty(stats);
-+}
-+
-+static void bfqg_stats_update_idle_time(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	if (bfqg_stats_idling(stats)) {
-+		unsigned long long now = sched_clock();
-+
-+		if (time_after64(now, stats->start_idle_time))
-+			blkg_stat_add(&stats->idle_time,
-+				      now - stats->start_idle_time);
-+		bfqg_stats_clear_idling(stats);
-+	}
-+}
-+
-+static void bfqg_stats_set_start_idle_time(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	stats->start_idle_time = sched_clock();
-+	bfqg_stats_mark_idling(stats);
-+}
-+
-+static void bfqg_stats_update_avg_queue_size(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	blkg_stat_add(&stats->avg_queue_size_sum,
-+		      blkg_rwstat_total(&stats->queued));
-+	blkg_stat_add(&stats->avg_queue_size_samples, 1);
-+	bfqg_stats_update_group_wait_time(stats);
-+}
-+
-+static struct blkcg_policy blkcg_policy_bfq;
-+
-+/*
-+ * blk-cgroup policy-related handlers
-+ * The following functions help in converting between blk-cgroup
-+ * internal structures and BFQ-specific structures.
-+ */
-+
-+static struct bfq_group *pd_to_bfqg(struct blkg_policy_data *pd)
-+{
-+	return pd ? container_of(pd, struct bfq_group, pd) : NULL;
-+}
-+
-+static struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg)
-+{
-+	return pd_to_blkg(&bfqg->pd);
-+}
-+
-+static struct bfq_group *blkg_to_bfqg(struct blkcg_gq *blkg)
-+{
-+	struct blkg_policy_data *pd = blkg_to_pd(blkg, &blkcg_policy_bfq);
-+	BUG_ON(!pd);
-+	return pd_to_bfqg(pd);
-+}
-+
-+/*
-+ * bfq_group handlers
-+ * The following functions help in navigating the bfq_group hierarchy
-+ * by allowing to find the parent of a bfq_group or the bfq_group
-+ * associated to a bfq_queue.
-+ */
-+
-+static struct bfq_group *bfqg_parent(struct bfq_group *bfqg)
-+{
-+	struct blkcg_gq *pblkg = bfqg_to_blkg(bfqg)->parent;
-+
-+	return pblkg ? blkg_to_bfqg(pblkg) : NULL;
-+}
-+
-+static struct bfq_group *bfqq_group(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *group_entity = bfqq->entity.parent;
-+
-+	return group_entity ? container_of(group_entity, struct bfq_group,
-+					   entity) :
-+			      bfqq->bfqd->root_group;
-+}
-+
-+/*
-+ * The following two functions handle get and put of a bfq_group by
-+ * wrapping the related blk-cgroup hooks.
-+ */
-+
-+static void bfqg_get(struct bfq_group *bfqg)
-+{
-+	return blkg_get(bfqg_to_blkg(bfqg));
-+}
-+
-+static void bfqg_put(struct bfq_group *bfqg)
-+{
-+	return blkg_put(bfqg_to_blkg(bfqg));
-+}
-+
-+static void bfqg_stats_update_io_add(struct bfq_group *bfqg,
-+				     struct bfq_queue *bfqq,
-+				     int rw)
-+{
-+	blkg_rwstat_add(&bfqg->stats.queued, rw, 1);
-+	bfqg_stats_end_empty_time(&bfqg->stats);
-+	if (!(bfqq == ((struct bfq_data *)bfqg->bfqd)->in_service_queue))
-+		bfqg_stats_set_start_group_wait_time(bfqg, bfqq_group(bfqq));
-+}
-+
-+static void bfqg_stats_update_io_remove(struct bfq_group *bfqg, int rw)
-+{
-+	blkg_rwstat_add(&bfqg->stats.queued, rw, -1);
-+}
-+
-+static void bfqg_stats_update_io_merged(struct bfq_group *bfqg, int rw)
-+{
-+	blkg_rwstat_add(&bfqg->stats.merged, rw, 1);
-+}
-+
-+static void bfqg_stats_update_dispatch(struct bfq_group *bfqg,
-+					      uint64_t bytes, int rw)
-+{
-+	blkg_stat_add(&bfqg->stats.sectors, bytes >> 9);
-+	blkg_rwstat_add(&bfqg->stats.serviced, rw, 1);
-+	blkg_rwstat_add(&bfqg->stats.service_bytes, rw, bytes);
-+}
-+
-+static void bfqg_stats_update_completion(struct bfq_group *bfqg,
-+			uint64_t start_time, uint64_t io_start_time, int rw)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+	unsigned long long now = sched_clock();
-+
-+	if (time_after64(now, io_start_time))
-+		blkg_rwstat_add(&stats->service_time, rw, now - io_start_time);
-+	if (time_after64(io_start_time, start_time))
-+		blkg_rwstat_add(&stats->wait_time, rw,
-+				io_start_time - start_time);
-+}
-+
-+/* @stats = 0 */
-+static void bfqg_stats_reset(struct bfqg_stats *stats)
-+{
-+	if (!stats)
-+		return;
-+
-+	/* queued stats shouldn't be cleared */
-+	blkg_rwstat_reset(&stats->service_bytes);
-+	blkg_rwstat_reset(&stats->serviced);
-+	blkg_rwstat_reset(&stats->merged);
-+	blkg_rwstat_reset(&stats->service_time);
-+	blkg_rwstat_reset(&stats->wait_time);
-+	blkg_stat_reset(&stats->time);
-+	blkg_stat_reset(&stats->unaccounted_time);
-+	blkg_stat_reset(&stats->avg_queue_size_sum);
-+	blkg_stat_reset(&stats->avg_queue_size_samples);
-+	blkg_stat_reset(&stats->dequeue);
-+	blkg_stat_reset(&stats->group_wait_time);
-+	blkg_stat_reset(&stats->idle_time);
-+	blkg_stat_reset(&stats->empty_time);
-+}
-+
-+/* @to += @from */
-+static void bfqg_stats_merge(struct bfqg_stats *to, struct bfqg_stats *from)
-+{
-+	if (!to || !from)
-+		return;
-+
-+	/* queued stats shouldn't be cleared */
-+	blkg_rwstat_add_aux(&to->service_bytes, &from->service_bytes);
-+	blkg_rwstat_add_aux(&to->serviced, &from->serviced);
-+	blkg_rwstat_add_aux(&to->merged, &from->merged);
-+	blkg_rwstat_add_aux(&to->service_time, &from->service_time);
-+	blkg_rwstat_add_aux(&to->wait_time, &from->wait_time);
-+	blkg_stat_add_aux(&from->time, &from->time);
-+	blkg_stat_add_aux(&to->unaccounted_time, &from->unaccounted_time);
-+	blkg_stat_add_aux(&to->avg_queue_size_sum, &from->avg_queue_size_sum);
-+	blkg_stat_add_aux(&to->avg_queue_size_samples, &from->avg_queue_size_samples);
-+	blkg_stat_add_aux(&to->dequeue, &from->dequeue);
-+	blkg_stat_add_aux(&to->group_wait_time, &from->group_wait_time);
-+	blkg_stat_add_aux(&to->idle_time, &from->idle_time);
-+	blkg_stat_add_aux(&to->empty_time, &from->empty_time);
-+}
-+
-+/*
-+ * Transfer @bfqg's stats to its parent's dead_stats so that the ancestors'
-+ * recursive stats can still account for the amount used by this bfqg after
-+ * it's gone.
-+ */
-+static void bfqg_stats_xfer_dead(struct bfq_group *bfqg)
-+{
-+	struct bfq_group *parent;
-+
-+	if (!bfqg) /* root_group */
-+		return;
-+
-+	parent = bfqg_parent(bfqg);
-+
-+	lockdep_assert_held(bfqg_to_blkg(bfqg)->q->queue_lock);
-+
-+	if (unlikely(!parent))
-+		return;
-+
-+	bfqg_stats_merge(&parent->dead_stats, &bfqg->stats);
-+	bfqg_stats_merge(&parent->dead_stats, &bfqg->dead_stats);
-+	bfqg_stats_reset(&bfqg->stats);
-+	bfqg_stats_reset(&bfqg->dead_stats);
-+}
-+
-+static void bfq_init_entity(struct bfq_entity *entity,
-+			    struct bfq_group *bfqg)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	entity->weight = entity->new_weight;
-+	entity->orig_weight = entity->new_weight;
-+	if (bfqq) {
-+		bfqq->ioprio = bfqq->new_ioprio;
-+		bfqq->ioprio_class = bfqq->new_ioprio_class;
-+		bfqg_get(bfqg);
-+	}
-+	entity->parent = bfqg->my_entity;
-+	entity->sched_data = &bfqg->sched_data;
-+}
-+
-+static void bfqg_stats_exit(struct bfqg_stats *stats)
-+{
-+	blkg_rwstat_exit(&stats->service_bytes);
-+	blkg_rwstat_exit(&stats->serviced);
-+	blkg_rwstat_exit(&stats->merged);
-+	blkg_rwstat_exit(&stats->service_time);
-+	blkg_rwstat_exit(&stats->wait_time);
-+	blkg_rwstat_exit(&stats->queued);
-+	blkg_stat_exit(&stats->sectors);
-+	blkg_stat_exit(&stats->time);
-+	blkg_stat_exit(&stats->unaccounted_time);
-+	blkg_stat_exit(&stats->avg_queue_size_sum);
-+	blkg_stat_exit(&stats->avg_queue_size_samples);
-+	blkg_stat_exit(&stats->dequeue);
-+	blkg_stat_exit(&stats->group_wait_time);
-+	blkg_stat_exit(&stats->idle_time);
-+	blkg_stat_exit(&stats->empty_time);
-+}
-+
-+static int bfqg_stats_init(struct bfqg_stats *stats, gfp_t gfp)
-+{
-+	if (blkg_rwstat_init(&stats->service_bytes, gfp) ||
-+	    blkg_rwstat_init(&stats->serviced, gfp) ||
-+	    blkg_rwstat_init(&stats->merged, gfp) ||
-+	    blkg_rwstat_init(&stats->service_time, gfp) ||
-+	    blkg_rwstat_init(&stats->wait_time, gfp) ||
-+	    blkg_rwstat_init(&stats->queued, gfp) ||
-+	    blkg_stat_init(&stats->sectors, gfp) ||
-+	    blkg_stat_init(&stats->time, gfp) ||
-+	    blkg_stat_init(&stats->unaccounted_time, gfp) ||
-+	    blkg_stat_init(&stats->avg_queue_size_sum, gfp) ||
-+	    blkg_stat_init(&stats->avg_queue_size_samples, gfp) ||
-+	    blkg_stat_init(&stats->dequeue, gfp) ||
-+	    blkg_stat_init(&stats->group_wait_time, gfp) ||
-+	    blkg_stat_init(&stats->idle_time, gfp) ||
-+	    blkg_stat_init(&stats->empty_time, gfp)) {
-+		bfqg_stats_exit(stats);
-+		return -ENOMEM;
-+	}
-+
-+	return 0;
-+}
-+
-+static struct bfq_group_data *cpd_to_bfqgd(struct blkcg_policy_data *cpd)
-+ {
-+	return cpd ? container_of(cpd, struct bfq_group_data, pd) : NULL;
-+ }
-+
-+static struct bfq_group_data *blkcg_to_bfqgd(struct blkcg *blkcg)
-+{
-+	return cpd_to_bfqgd(blkcg_to_cpd(blkcg, &blkcg_policy_bfq));
-+}
-+
-+static void bfq_cpd_init(struct blkcg_policy_data *cpd)
-+{
-+	struct bfq_group_data *d = cpd_to_bfqgd(cpd);
-+
-+	d->weight = BFQ_DEFAULT_GRP_WEIGHT;
-+}
-+
-+static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node)
-+{
-+	struct bfq_group *bfqg;
-+
-+	bfqg = kzalloc_node(sizeof(*bfqg), gfp, node);
-+	if (!bfqg)
-+		return NULL;
-+
-+	if (bfqg_stats_init(&bfqg->stats, gfp) ||
-+	    bfqg_stats_init(&bfqg->dead_stats, gfp)) {
-+		kfree(bfqg);
-+		return NULL;
-+	}
-+
-+	return &bfqg->pd;
-+}
-+
-+static void bfq_group_set_parent(struct bfq_group *bfqg,
-+					struct bfq_group *parent)
-+{
-+	struct bfq_entity *entity;
-+
-+	BUG_ON(!parent);
-+	BUG_ON(!bfqg);
-+	BUG_ON(bfqg == parent);
-+
-+	entity = &bfqg->entity;
-+	entity->parent = parent->my_entity;
-+	entity->sched_data = &parent->sched_data;
-+}
-+
-+static void bfq_pd_init(struct blkg_policy_data *pd)
-+{
-+	struct blkcg_gq *blkg = pd_to_blkg(pd);
-+	struct bfq_group *bfqg = blkg_to_bfqg(blkg);
-+	struct bfq_data *bfqd = blkg->q->elevator->elevator_data;
-+	struct bfq_entity *entity = &bfqg->entity;
-+	struct bfq_group_data *d = blkcg_to_bfqgd(blkg->blkcg);
-+
-+	entity->orig_weight = entity->weight = entity->new_weight = d->weight;
-+	entity->my_sched_data = &bfqg->sched_data;
-+	bfqg->my_entity = entity; /*
-+				   * the root_group's will be set to NULL
-+				   * in bfq_init_queue()
-+				   */
-+	bfqg->bfqd = bfqd;
-+	bfqg->active_entities = 0;
-+}
-+
-+static void bfq_pd_free(struct blkg_policy_data *pd)
-+{
-+	struct bfq_group *bfqg = pd_to_bfqg(pd);
-+
-+	bfqg_stats_exit(&bfqg->stats);
-+	bfqg_stats_exit(&bfqg->dead_stats);
-+
-+	return kfree(bfqg);
-+}
-+
-+/* offset delta from bfqg->stats to bfqg->dead_stats */
-+static const int dead_stats_off_delta = offsetof(struct bfq_group, dead_stats) -
-+					offsetof(struct bfq_group, stats);
-+
-+/* to be used by recursive prfill, sums live and dead stats recursively */
-+static u64 bfqg_stat_pd_recursive_sum(struct blkg_policy_data *pd, int off)
-+{
-+	u64 sum = 0;
-+
-+	sum += blkg_stat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off);
-+	sum += blkg_stat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq,
-+				       off + dead_stats_off_delta);
-+	return sum;
-+}
-+
-+/* to be used by recursive prfill, sums live and dead rwstats recursively */
-+static struct blkg_rwstat bfqg_rwstat_pd_recursive_sum(struct blkg_policy_data *pd,
-+						       int off)
-+{
-+	struct blkg_rwstat a, b;
-+
-+	a = blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off);
-+	b = blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq,
-+				      off + dead_stats_off_delta);
-+	blkg_rwstat_add_aux(&a, &b);
-+	return a;
-+}
-+
-+static void bfq_pd_reset_stats(struct blkg_policy_data *pd)
-+{
-+	struct bfq_group *bfqg = pd_to_bfqg(pd);
-+
-+	bfqg_stats_reset(&bfqg->stats);
-+	bfqg_stats_reset(&bfqg->dead_stats);
-+}
-+
-+static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
-+					      struct blkcg *blkcg)
-+{
-+	struct request_queue *q = bfqd->queue;
-+	struct bfq_group *bfqg = NULL, *parent;
-+	struct bfq_entity *entity = NULL;
-+
-+	assert_spin_locked(bfqd->queue->queue_lock);
-+
-+	/* avoid lookup for the common case where there's no blkcg */
-+	if (blkcg == &blkcg_root) {
-+		bfqg = bfqd->root_group;
-+	} else {
-+		struct blkcg_gq *blkg;
-+
-+		blkg = blkg_lookup_create(blkcg, q);
-+		if (!IS_ERR(blkg))
-+			bfqg = blkg_to_bfqg(blkg);
-+		else /* fallback to root_group */
-+			bfqg = bfqd->root_group;
-+	}
-+
-+	BUG_ON(!bfqg);
-+
-+	/*
-+	 * Update chain of bfq_groups as we might be handling a leaf group
-+	 * which, along with some of its relatives, has not been hooked yet
-+	 * to the private hierarchy of BFQ.
-+	 */
-+	entity = &bfqg->entity;
-+	for_each_entity(entity) {
-+		bfqg = container_of(entity, struct bfq_group, entity);
-+		BUG_ON(!bfqg);
-+		if (bfqg != bfqd->root_group) {
-+			parent = bfqg_parent(bfqg);
-+			if (!parent)
-+				parent = bfqd->root_group;
-+			BUG_ON(!parent);
-+			bfq_group_set_parent(bfqg, parent);
-+		}
-+	}
-+
-+	return bfqg;
-+}
-+
-+/**
-+ * bfq_bfqq_move - migrate @bfqq to @bfqg.
-+ * @bfqd: queue descriptor.
-+ * @bfqq: the queue to move.
-+ * @entity: @bfqq's entity.
-+ * @bfqg: the group to move to.
-+ *
-+ * Move @bfqq to @bfqg, deactivating it from its old group and reactivating
-+ * it on the new one.  Avoid putting the entity on the old group idle tree.
-+ *
-+ * Must be called under the queue lock; the cgroup owning @bfqg must
-+ * not disappear (by now this just means that we are called under
-+ * rcu_read_lock()).
-+ */
-+static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			  struct bfq_entity *entity, struct bfq_group *bfqg)
-+{
-+	int busy, resume;
-+
-+	busy = bfq_bfqq_busy(bfqq);
-+	resume = !RB_EMPTY_ROOT(&bfqq->sort_list);
-+
-+	BUG_ON(resume && !entity->on_st);
-+	BUG_ON(busy && !resume && entity->on_st &&
-+	       bfqq != bfqd->in_service_queue);
-+
-+	if (busy) {
-+		BUG_ON(atomic_read(&bfqq->ref) < 2);
-+
-+		if (!resume)
-+			bfq_del_bfqq_busy(bfqd, bfqq, 0);
-+		else
-+			bfq_deactivate_bfqq(bfqd, bfqq, 0);
-+	} else if (entity->on_st)
-+		bfq_put_idle_entity(bfq_entity_service_tree(entity), entity);
-+	bfqg_put(bfqq_group(bfqq));
-+
-+	/*
-+	 * Here we use a reference to bfqg.  We don't need a refcounter
-+	 * as the cgroup reference will not be dropped, so that its
-+	 * destroy() callback will not be invoked.
-+	 */
-+	entity->parent = bfqg->my_entity;
-+	entity->sched_data = &bfqg->sched_data;
-+	bfqg_get(bfqg);
-+
-+	if (busy) {
-+		if (resume)
-+			bfq_activate_bfqq(bfqd, bfqq);
-+	}
-+
-+	if (!bfqd->in_service_queue && !bfqd->rq_in_driver)
-+		bfq_schedule_dispatch(bfqd);
-+}
-+
-+/**
-+ * __bfq_bic_change_cgroup - move @bic to @cgroup.
-+ * @bfqd: the queue descriptor.
-+ * @bic: the bic to move.
-+ * @blkcg: the blk-cgroup to move to.
-+ *
-+ * Move bic to blkcg, assuming that bfqd->queue is locked; the caller
-+ * has to make sure that the reference to cgroup is valid across the call.
-+ *
-+ * NOTE: an alternative approach might have been to store the current
-+ * cgroup in bfqq and getting a reference to it, reducing the lookup
-+ * time here, at the price of slightly more complex code.
-+ */
-+static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
-+						struct bfq_io_cq *bic,
-+						struct blkcg *blkcg)
-+{
-+	struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0);
-+	struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1);
-+	struct bfq_group *bfqg;
-+	struct bfq_entity *entity;
-+
-+	lockdep_assert_held(bfqd->queue->queue_lock);
-+
-+	bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+	if (async_bfqq) {
-+		entity = &async_bfqq->entity;
-+
-+		if (entity->sched_data != &bfqg->sched_data) {
-+			bic_set_bfqq(bic, NULL, 0);
-+			bfq_log_bfqq(bfqd, async_bfqq,
-+				     "bic_change_group: %p %d",
-+				     async_bfqq, atomic_read(&async_bfqq->ref));
-+			bfq_put_queue(async_bfqq);
-+		}
-+	}
-+
-+	if (sync_bfqq) {
-+		entity = &sync_bfqq->entity;
-+		if (entity->sched_data != &bfqg->sched_data)
-+			bfq_bfqq_move(bfqd, sync_bfqq, entity, bfqg);
-+	}
-+
-+	return bfqg;
-+}
-+
-+static void bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio)
-+{
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+	struct blkcg *blkcg;
-+	struct bfq_group *bfqg = NULL;
-+	uint64_t id;
-+
-+	rcu_read_lock();
-+	blkcg = bio_blkcg(bio);
-+	id = blkcg->css.serial_nr;
-+	rcu_read_unlock();
-+
-+	/*
-+	 * Check whether blkcg has changed.  The condition may trigger
-+	 * spuriously on a newly created cic but there's no harm.
-+	 */
-+	if (unlikely(!bfqd) || likely(bic->blkcg_id == id))
-+		return;
-+
-+	bfqg = __bfq_bic_change_cgroup(bfqd, bic, blkcg);
-+	BUG_ON(!bfqg);
-+	bic->blkcg_id = id;
-+}
-+
-+/**
-+ * bfq_flush_idle_tree - deactivate any entity on the idle tree of @st.
-+ * @st: the service tree being flushed.
-+ */
-+static void bfq_flush_idle_tree(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entity = st->first_idle;
-+
-+	for (; entity ; entity = st->first_idle)
-+		__bfq_deactivate_entity(entity, 0);
-+}
-+
-+/**
-+ * bfq_reparent_leaf_entity - move leaf entity to the root_group.
-+ * @bfqd: the device data structure with the root group.
-+ * @entity: the entity to move.
-+ */
-+static void bfq_reparent_leaf_entity(struct bfq_data *bfqd,
-+				     struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	BUG_ON(!bfqq);
-+	bfq_bfqq_move(bfqd, bfqq, entity, bfqd->root_group);
-+	return;
-+}
-+
-+/**
-+ * bfq_reparent_active_entities - move to the root group all active
-+ *                                entities.
-+ * @bfqd: the device data structure with the root group.
-+ * @bfqg: the group to move from.
-+ * @st: the service tree with the entities.
-+ *
-+ * Needs queue_lock to be taken and reference to be valid over the call.
-+ */
-+static void bfq_reparent_active_entities(struct bfq_data *bfqd,
-+					 struct bfq_group *bfqg,
-+					 struct bfq_service_tree *st)
-+{
-+	struct rb_root *active = &st->active;
-+	struct bfq_entity *entity = NULL;
-+
-+	if (!RB_EMPTY_ROOT(&st->active))
-+		entity = bfq_entity_of(rb_first(active));
-+
-+	for (; entity ; entity = bfq_entity_of(rb_first(active)))
-+		bfq_reparent_leaf_entity(bfqd, entity);
-+
-+	if (bfqg->sched_data.in_service_entity)
-+		bfq_reparent_leaf_entity(bfqd,
-+			bfqg->sched_data.in_service_entity);
-+
-+	return;
-+}
-+
-+/**
-+ * bfq_destroy_group - destroy @bfqg.
-+ * @bfqg: the group being destroyed.
-+ *
-+ * Destroy @bfqg, making sure that it is not referenced from its parent.
-+ * blkio already grabs the queue_lock for us, so no need to use RCU-based magic
-+ */
-+static void bfq_pd_offline(struct blkg_policy_data *pd)
-+{
-+	struct bfq_service_tree *st;
-+	struct bfq_group *bfqg;
-+	struct bfq_data *bfqd;
-+	struct bfq_entity *entity;
-+	int i;
-+
-+	BUG_ON(!pd);
-+	bfqg = pd_to_bfqg(pd);
-+	BUG_ON(!bfqg);
-+	bfqd = bfqg->bfqd;
-+	BUG_ON(bfqd && !bfqd->root_group);
-+
-+	entity = bfqg->my_entity;
-+
-+	if (!entity) /* root group */
-+		return;
-+
-+	/*
-+	 * Empty all service_trees belonging to this group before
-+	 * deactivating the group itself.
-+	 */
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) {
-+		BUG_ON(!bfqg->sched_data.service_tree);
-+		st = bfqg->sched_data.service_tree + i;
-+		/*
-+		 * The idle tree may still contain bfq_queues belonging
-+		 * to exited task because they never migrated to a different
-+		 * cgroup from the one being destroyed now.  No one else
-+		 * can access them so it's safe to act without any lock.
-+		 */
-+		bfq_flush_idle_tree(st);
-+
-+		/*
-+		 * It may happen that some queues are still active
-+		 * (busy) upon group destruction (if the corresponding
-+		 * processes have been forced to terminate). We move
-+		 * all the leaf entities corresponding to these queues
-+		 * to the root_group.
-+		 * Also, it may happen that the group has an entity
-+		 * in service, which is disconnected from the active
-+		 * tree: it must be moved, too.
-+		 * There is no need to put the sync queues, as the
-+		 * scheduler has taken no reference.
-+		 */
-+		bfq_reparent_active_entities(bfqd, bfqg, st);
-+		BUG_ON(!RB_EMPTY_ROOT(&st->active));
-+		BUG_ON(!RB_EMPTY_ROOT(&st->idle));
-+	}
-+	BUG_ON(bfqg->sched_data.next_in_service);
-+	BUG_ON(bfqg->sched_data.in_service_entity);
-+
-+	__bfq_deactivate_entity(entity, 0);
-+	bfq_put_async_queues(bfqd, bfqg);
-+	BUG_ON(entity->tree);
-+
-+	bfqg_stats_xfer_dead(bfqg);
-+}
-+
-+static void bfq_end_wr_async(struct bfq_data *bfqd)
-+{
-+	struct blkcg_gq *blkg;
-+
-+	list_for_each_entry(blkg, &bfqd->queue->blkg_list, q_node) {
-+		struct bfq_group *bfqg = blkg_to_bfqg(blkg);
-+
-+		bfq_end_wr_async_queues(bfqd, bfqg);
-+	}
-+	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static u64 bfqio_cgroup_weight_read(struct cgroup_subsys_state *css,
-+				       struct cftype *cftype)
-+{
-+	struct blkcg *blkcg = css_to_blkcg(css);
-+	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
-+	int ret = -EINVAL;
-+
-+	spin_lock_irq(&blkcg->lock);
-+	ret = bfqgd->weight;
-+	spin_unlock_irq(&blkcg->lock);
-+
-+	return ret;
-+}
-+
-+static int bfqio_cgroup_weight_read_dfl(struct seq_file *sf, void *v)
-+{
-+	struct blkcg *blkcg = css_to_blkcg(seq_css(sf));
-+	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
-+
-+	spin_lock_irq(&blkcg->lock);
-+	seq_printf(sf, "%u\n", bfqgd->weight);
-+	spin_unlock_irq(&blkcg->lock);
-+
-+	return 0;
-+}
-+
-+static int bfqio_cgroup_weight_write(struct cgroup_subsys_state *css,
-+					struct cftype *cftype,
-+					u64 val)
-+{
-+	struct blkcg *blkcg = css_to_blkcg(css);
-+	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
-+	struct blkcg_gq *blkg;
-+	int ret = -EINVAL;
-+
-+	if (val < BFQ_MIN_WEIGHT || val > BFQ_MAX_WEIGHT)
-+		return ret;
-+
-+	ret = 0;
-+	spin_lock_irq(&blkcg->lock);
-+	bfqgd->weight = (unsigned short)val;
-+	hlist_for_each_entry(blkg, &blkcg->blkg_list, blkcg_node) {
-+		struct bfq_group *bfqg = blkg_to_bfqg(blkg);
-+		if (!bfqg)
-+			continue;
-+		/*
-+		 * Setting the prio_changed flag of the entity
-+		 * to 1 with new_weight == weight would re-set
-+		 * the value of the weight to its ioprio mapping.
-+		 * Set the flag only if necessary.
-+		 */
-+		if ((unsigned short)val != bfqg->entity.new_weight) {
-+			bfqg->entity.new_weight = (unsigned short)val;
-+			/*
-+			 * Make sure that the above new value has been
-+			 * stored in bfqg->entity.new_weight before
-+			 * setting the prio_changed flag. In fact,
-+			 * this flag may be read asynchronously (in
-+			 * critical sections protected by a different
-+			 * lock than that held here), and finding this
-+			 * flag set may cause the execution of the code
-+			 * for updating parameters whose value may
-+			 * depend also on bfqg->entity.new_weight (in
-+			 * __bfq_entity_update_weight_prio).
-+			 * This barrier makes sure that the new value
-+			 * of bfqg->entity.new_weight is correctly
-+			 * seen in that code.
-+			 */
-+			smp_wmb();
-+			bfqg->entity.prio_changed = 1;
-+		}
-+	}
-+	spin_unlock_irq(&blkcg->lock);
-+
-+	return ret;
-+}
-+
-+static ssize_t bfqio_cgroup_weight_write_dfl(struct kernfs_open_file *of,
-+					     char *buf, size_t nbytes,
-+					     loff_t off)
-+{
-+	/* First unsigned long found in the file is used */
-+	return bfqio_cgroup_weight_write(of_css(of), NULL,
-+					 simple_strtoull(strim(buf), NULL, 0));
-+}
-+
-+static int bfqg_print_stat(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_stat,
-+			  &blkcg_policy_bfq, seq_cft(sf)->private, false);
-+	return 0;
-+}
-+
-+static int bfqg_print_rwstat(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_rwstat,
-+			  &blkcg_policy_bfq, seq_cft(sf)->private, true);
-+	return 0;
-+}
-+
-+static u64 bfqg_prfill_stat_recursive(struct seq_file *sf,
-+				      struct blkg_policy_data *pd, int off)
-+{
-+	u64 sum = bfqg_stat_pd_recursive_sum(pd, off);
-+
-+	return __blkg_prfill_u64(sf, pd, sum);
-+}
-+
-+static u64 bfqg_prfill_rwstat_recursive(struct seq_file *sf,
-+					struct blkg_policy_data *pd, int off)
-+{
-+	struct blkg_rwstat sum = bfqg_rwstat_pd_recursive_sum(pd, off);
-+
-+	return __blkg_prfill_rwstat(sf, pd, &sum);
-+}
-+
-+static int bfqg_print_stat_recursive(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_stat_recursive, &blkcg_policy_bfq,
-+			  seq_cft(sf)->private, false);
-+	return 0;
-+}
-+
-+static int bfqg_print_rwstat_recursive(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_rwstat_recursive, &blkcg_policy_bfq,
-+			  seq_cft(sf)->private, true);
-+	return 0;
-+}
-+
-+static u64 bfqg_prfill_avg_queue_size(struct seq_file *sf,
-+				      struct blkg_policy_data *pd, int off)
-+{
-+	struct bfq_group *bfqg = pd_to_bfqg(pd);
-+	u64 samples = blkg_stat_read(&bfqg->stats.avg_queue_size_samples);
-+	u64 v = 0;
-+
-+	if (samples) {
-+		v = blkg_stat_read(&bfqg->stats.avg_queue_size_sum);
-+		v = div64_u64(v, samples);
-+	}
-+	__blkg_prfill_u64(sf, pd, v);
-+	return 0;
-+}
-+
-+/* print avg_queue_size */
-+static int bfqg_print_avg_queue_size(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_avg_queue_size, &blkcg_policy_bfq,
-+			  0, false);
-+	return 0;
-+}
-+
-+static struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
-+{
-+	int ret;
-+
-+	ret = blkcg_activate_policy(bfqd->queue, &blkcg_policy_bfq);
-+	if (ret)
-+		return NULL;
-+
-+        return blkg_to_bfqg(bfqd->queue->root_blkg);
-+}
-+
-+static struct blkcg_policy_data *bfq_cpd_alloc(gfp_t gfp)
-+{
-+        struct bfq_group_data *bgd;
-+
-+        bgd = kzalloc(sizeof(*bgd), GFP_KERNEL);
-+        if (!bgd)
-+                return NULL;
-+        return &bgd->pd;
-+}
-+
-+static void bfq_cpd_free(struct blkcg_policy_data *cpd)
-+{
-+        kfree(cpd_to_bfqgd(cpd));
-+}
-+
-+static struct cftype bfqio_files_dfl[] = {
-+	{
-+		.name = "weight",
-+		.flags = CFTYPE_NOT_ON_ROOT,
-+		.seq_show = bfqio_cgroup_weight_read_dfl,
-+		.write = bfqio_cgroup_weight_write_dfl,
-+	},
-+	{} /* terminate */
-+};
-+
-+static struct cftype bfqio_files[] = {
-+	{
-+		.name = "bfq.weight",
-+		.read_u64 = bfqio_cgroup_weight_read,
-+		.write_u64 = bfqio_cgroup_weight_write,
-+	},
-+	/* statistics, cover only the tasks in the bfqg */
-+	{
-+		.name = "bfq.time",
-+		.private = offsetof(struct bfq_group, stats.time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.sectors",
-+		.private = offsetof(struct bfq_group, stats.sectors),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.io_service_bytes",
-+		.private = offsetof(struct bfq_group, stats.service_bytes),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_serviced",
-+		.private = offsetof(struct bfq_group, stats.serviced),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_service_time",
-+		.private = offsetof(struct bfq_group, stats.service_time),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_wait_time",
-+		.private = offsetof(struct bfq_group, stats.wait_time),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_merged",
-+		.private = offsetof(struct bfq_group, stats.merged),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_queued",
-+		.private = offsetof(struct bfq_group, stats.queued),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+
-+	/* the same statictics which cover the bfqg and its descendants */
-+	{
-+		.name = "bfq.time_recursive",
-+		.private = offsetof(struct bfq_group, stats.time),
-+		.seq_show = bfqg_print_stat_recursive,
-+	},
-+	{
-+		.name = "bfq.sectors_recursive",
-+		.private = offsetof(struct bfq_group, stats.sectors),
-+		.seq_show = bfqg_print_stat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_service_bytes_recursive",
-+		.private = offsetof(struct bfq_group, stats.service_bytes),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_serviced_recursive",
-+		.private = offsetof(struct bfq_group, stats.serviced),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_service_time_recursive",
-+		.private = offsetof(struct bfq_group, stats.service_time),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_wait_time_recursive",
-+		.private = offsetof(struct bfq_group, stats.wait_time),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_merged_recursive",
-+		.private = offsetof(struct bfq_group, stats.merged),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_queued_recursive",
-+		.private = offsetof(struct bfq_group, stats.queued),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.avg_queue_size",
-+		.seq_show = bfqg_print_avg_queue_size,
-+	},
-+	{
-+		.name = "bfq.group_wait_time",
-+		.private = offsetof(struct bfq_group, stats.group_wait_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.idle_time",
-+		.private = offsetof(struct bfq_group, stats.idle_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.empty_time",
-+		.private = offsetof(struct bfq_group, stats.empty_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.dequeue",
-+		.private = offsetof(struct bfq_group, stats.dequeue),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.unaccounted_time",
-+		.private = offsetof(struct bfq_group, stats.unaccounted_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{ }	/* terminate */
-+};
-+
-+static struct blkcg_policy blkcg_policy_bfq = {
-+       .dfl_cftypes            = bfqio_files_dfl,
-+       .legacy_cftypes         = bfqio_files,
-+
-+       .pd_alloc_fn            = bfq_pd_alloc,
-+       .pd_init_fn             = bfq_pd_init,
-+       .pd_offline_fn          = bfq_pd_offline,
-+       .pd_free_fn             = bfq_pd_free,
-+       .pd_reset_stats_fn      = bfq_pd_reset_stats,
-+
-+       .cpd_alloc_fn           = bfq_cpd_alloc,
-+       .cpd_init_fn            = bfq_cpd_init,
-+       .cpd_bind_fn	       = bfq_cpd_init,
-+       .cpd_free_fn            = bfq_cpd_free,
-+
-+};
-+
-+#else
-+
-+static void bfq_init_entity(struct bfq_entity *entity,
-+			    struct bfq_group *bfqg)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	entity->weight = entity->new_weight;
-+	entity->orig_weight = entity->new_weight;
-+	if (bfqq) {
-+		bfqq->ioprio = bfqq->new_ioprio;
-+		bfqq->ioprio_class = bfqq->new_ioprio_class;
-+	}
-+	entity->sched_data = &bfqg->sched_data;
-+}
-+
-+static struct bfq_group *
-+bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio)
-+{
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+	return bfqd->root_group;
-+}
-+
-+static void bfq_bfqq_move(struct bfq_data *bfqd,
-+			  struct bfq_queue *bfqq,
-+			  struct bfq_entity *entity,
-+			  struct bfq_group *bfqg)
-+{
-+}
-+
-+static void bfq_end_wr_async(struct bfq_data *bfqd)
-+{
-+	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static void bfq_disconnect_groups(struct bfq_data *bfqd)
-+{
-+	bfq_put_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
-+                                              struct blkcg *blkcg)
-+{
-+	return bfqd->root_group;
-+}
-+
-+static struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
-+{
-+	struct bfq_group *bfqg;
-+	int i;
-+
-+	bfqg = kmalloc_node(sizeof(*bfqg), GFP_KERNEL | __GFP_ZERO, node);
-+	if (!bfqg)
-+		return NULL;
-+
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
-+		bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
-+
-+	return bfqg;
-+}
-+#endif
-diff --git a/block/bfq-ioc.c b/block/bfq-ioc.c
-new file mode 100644
-index 0000000..fb7bb8f
---- /dev/null
-+++ b/block/bfq-ioc.c
-@@ -0,0 +1,36 @@
-+/*
-+ * BFQ: I/O context handling.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+/**
-+ * icq_to_bic - convert iocontext queue structure to bfq_io_cq.
-+ * @icq: the iocontext queue.
-+ */
-+static struct bfq_io_cq *icq_to_bic(struct io_cq *icq)
-+{
-+	/* bic->icq is the first member, %NULL will convert to %NULL */
-+	return container_of(icq, struct bfq_io_cq, icq);
-+}
-+
-+/**
-+ * bfq_bic_lookup - search into @ioc a bic associated to @bfqd.
-+ * @bfqd: the lookup key.
-+ * @ioc: the io_context of the process doing I/O.
-+ *
-+ * Queue lock must be held.
-+ */
-+static struct bfq_io_cq *bfq_bic_lookup(struct bfq_data *bfqd,
-+					struct io_context *ioc)
-+{
-+	if (ioc)
-+		return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue));
-+	return NULL;
-+}
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-new file mode 100644
-index 0000000..f9787a6
---- /dev/null
-+++ b/block/bfq-iosched.c
-@@ -0,0 +1,3754 @@
-+/*
-+ * Budget Fair Queueing (BFQ) disk scheduler.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-+ * file.
-+ *
-+ * BFQ is a proportional-share storage-I/O scheduling algorithm based on
-+ * the slice-by-slice service scheme of CFQ. But BFQ assigns budgets,
-+ * measured in number of sectors, to processes instead of time slices. The
-+ * device is not granted to the in-service process for a given time slice,
-+ * but until it has exhausted its assigned budget. This change from the time
-+ * to the service domain allows BFQ to distribute the device throughput
-+ * among processes as desired, without any distortion due to ZBR, workload
-+ * fluctuations or other factors. BFQ uses an ad hoc internal scheduler,
-+ * called B-WF2Q+, to schedule processes according to their budgets. More
-+ * precisely, BFQ schedules queues associated to processes. Thanks to the
-+ * accurate policy of B-WF2Q+, BFQ can afford to assign high budgets to
-+ * I/O-bound processes issuing sequential requests (to boost the
-+ * throughput), and yet guarantee a low latency to interactive and soft
-+ * real-time applications.
-+ *
-+ * BFQ is described in [1], where also a reference to the initial, more
-+ * theoretical paper on BFQ can be found. The interested reader can find
-+ * in the latter paper full details on the main algorithm, as well as
-+ * formulas of the guarantees and formal proofs of all the properties.
-+ * With respect to the version of BFQ presented in these papers, this
-+ * implementation adds a few more heuristics, such as the one that
-+ * guarantees a low latency to soft real-time applications, and a
-+ * hierarchical extension based on H-WF2Q+.
-+ *
-+ * B-WF2Q+ is based on WF2Q+, that is described in [2], together with
-+ * H-WF2Q+, while the augmented tree used to implement B-WF2Q+ with O(log N)
-+ * complexity derives from the one introduced with EEVDF in [3].
-+ *
-+ * [1] P. Valente and M. Andreolini, ``Improving Application Responsiveness
-+ *     with the BFQ Disk I/O Scheduler'',
-+ *     Proceedings of the 5th Annual International Systems and Storage
-+ *     Conference (SYSTOR '12), June 2012.
-+ *
-+ * http://algogroup.unimo.it/people/paolo/disk_sched/bf1-v1-suite-results.pdf
-+ *
-+ * [2] Jon C.R. Bennett and H. Zhang, ``Hierarchical Packet Fair Queueing
-+ *     Algorithms,'' IEEE/ACM Transactions on Networking, 5(5):675-689,
-+ *     Oct 1997.
-+ *
-+ * http://www.cs.cmu.edu/~hzhang/papers/TON-97-Oct.ps.gz
-+ *
-+ * [3] I. Stoica and H. Abdel-Wahab, ``Earliest Eligible Virtual Deadline
-+ *     First: A Flexible and Accurate Mechanism for Proportional Share
-+ *     Resource Allocation,'' technical report.
-+ *
-+ * http://www.cs.berkeley.edu/~istoica/papers/eevdf-tr-95.pdf
-+ */
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/blkdev.h>
-+#include <linux/cgroup.h>
-+#include <linux/elevator.h>
-+#include <linux/jiffies.h>
-+#include <linux/rbtree.h>
-+#include <linux/ioprio.h>
-+#include "bfq.h"
-+#include "blk.h"
-+
-+/* Expiration time of sync (0) and async (1) requests, in jiffies. */
-+static const int bfq_fifo_expire[2] = { HZ / 4, HZ / 8 };
-+
-+/* Maximum backwards seek, in KiB. */
-+static const int bfq_back_max = 16 * 1024;
-+
-+/* Penalty of a backwards seek, in number of sectors. */
-+static const int bfq_back_penalty = 2;
-+
-+/* Idling period duration, in jiffies. */
-+static int bfq_slice_idle = HZ / 125;
-+
-+/* Minimum number of assigned budgets for which stats are safe to compute. */
-+static const int bfq_stats_min_budgets = 194;
-+
-+/* Default maximum budget values, in sectors and number of requests. */
-+static const int bfq_default_max_budget = 16 * 1024;
-+static const int bfq_max_budget_async_rq = 4;
-+
-+/*
-+ * Async to sync throughput distribution is controlled as follows:
-+ * when an async request is served, the entity is charged the number
-+ * of sectors of the request, multiplied by the factor below
-+ */
-+static const int bfq_async_charge_factor = 10;
-+
-+/* Default timeout values, in jiffies, approximating CFQ defaults. */
-+static const int bfq_timeout_sync = HZ / 8;
-+static int bfq_timeout_async = HZ / 25;
-+
-+struct kmem_cache *bfq_pool;
-+
-+/* Below this threshold (in ms), we consider thinktime immediate. */
-+#define BFQ_MIN_TT		2
-+
-+/* hw_tag detection: parallel requests threshold and min samples needed. */
-+#define BFQ_HW_QUEUE_THRESHOLD	4
-+#define BFQ_HW_QUEUE_SAMPLES	32
-+
-+#define BFQQ_SEEK_THR	 (sector_t)(8 * 1024)
-+#define BFQQ_SEEKY(bfqq) ((bfqq)->seek_mean > BFQQ_SEEK_THR)
-+
-+/* Min samples used for peak rate estimation (for autotuning). */
-+#define BFQ_PEAK_RATE_SAMPLES	32
-+
-+/* Shift used for peak rate fixed precision calculations. */
-+#define BFQ_RATE_SHIFT		16
-+
-+/*
-+ * By default, BFQ computes the duration of the weight raising for
-+ * interactive applications automatically, using the following formula:
-+ * duration = (R / r) * T, where r is the peak rate of the device, and
-+ * R and T are two reference parameters.
-+ * In particular, R is the peak rate of the reference device (see below),
-+ * and T is a reference time: given the systems that are likely to be
-+ * installed on the reference device according to its speed class, T is
-+ * about the maximum time needed, under BFQ and while reading two files in
-+ * parallel, to load typical large applications on these systems.
-+ * In practice, the slower/faster the device at hand is, the more/less it
-+ * takes to load applications with respect to the reference device.
-+ * Accordingly, the longer/shorter BFQ grants weight raising to interactive
-+ * applications.
-+ *
-+ * BFQ uses four different reference pairs (R, T), depending on:
-+ * . whether the device is rotational or non-rotational;
-+ * . whether the device is slow, such as old or portable HDDs, as well as
-+ *   SD cards, or fast, such as newer HDDs and SSDs.
-+ *
-+ * The device's speed class is dynamically (re)detected in
-+ * bfq_update_peak_rate() every time the estimated peak rate is updated.
-+ *
-+ * In the following definitions, R_slow[0]/R_fast[0] and T_slow[0]/T_fast[0]
-+ * are the reference values for a slow/fast rotational device, whereas
-+ * R_slow[1]/R_fast[1] and T_slow[1]/T_fast[1] are the reference values for
-+ * a slow/fast non-rotational device. Finally, device_speed_thresh are the
-+ * thresholds used to switch between speed classes.
-+ * Both the reference peak rates and the thresholds are measured in
-+ * sectors/usec, left-shifted by BFQ_RATE_SHIFT.
-+ */
-+static int R_slow[2] = {1536, 10752};
-+static int R_fast[2] = {17415, 34791};
-+/*
-+ * To improve readability, a conversion function is used to initialize the
-+ * following arrays, which entails that they can be initialized only in a
-+ * function.
-+ */
-+static int T_slow[2];
-+static int T_fast[2];
-+static int device_speed_thresh[2];
-+
-+#define BFQ_SERVICE_TREE_INIT	((struct bfq_service_tree)		\
-+				{ RB_ROOT, RB_ROOT, NULL, NULL, 0, 0 })
-+
-+#define RQ_BIC(rq)		((struct bfq_io_cq *) (rq)->elv.priv[0])
-+#define RQ_BFQQ(rq)		((rq)->elv.priv[1])
-+
-+static void bfq_schedule_dispatch(struct bfq_data *bfqd);
-+
-+#include "bfq-ioc.c"
-+#include "bfq-sched.c"
-+#include "bfq-cgroup.c"
-+
-+#define bfq_class_idle(bfqq)	((bfqq)->ioprio_class == IOPRIO_CLASS_IDLE)
-+#define bfq_class_rt(bfqq)	((bfqq)->ioprio_class == IOPRIO_CLASS_RT)
-+
-+#define bfq_sample_valid(samples)	((samples) > 80)
-+
-+/*
-+ * We regard a request as SYNC, if either it's a read or has the SYNC bit
-+ * set (in which case it could also be a direct WRITE).
-+ */
-+static int bfq_bio_sync(struct bio *bio)
-+{
-+	if (bio_data_dir(bio) == READ || (bio->bi_rw & REQ_SYNC))
-+		return 1;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Scheduler run of queue, if there are requests pending and no one in the
-+ * driver that will restart queueing.
-+ */
-+static void bfq_schedule_dispatch(struct bfq_data *bfqd)
-+{
-+	if (bfqd->queued != 0) {
-+		bfq_log(bfqd, "schedule dispatch");
-+		kblockd_schedule_work(&bfqd->unplug_work);
-+	}
-+}
-+
-+/*
-+ * Lifted from AS - choose which of rq1 and rq2 that is best served now.
-+ * We choose the request that is closesr to the head right now.  Distance
-+ * behind the head is penalized and only allowed to a certain extent.
-+ */
-+static struct request *bfq_choose_req(struct bfq_data *bfqd,
-+				      struct request *rq1,
-+				      struct request *rq2,
-+				      sector_t last)
-+{
-+	sector_t s1, s2, d1 = 0, d2 = 0;
-+	unsigned long back_max;
-+#define BFQ_RQ1_WRAP	0x01 /* request 1 wraps */
-+#define BFQ_RQ2_WRAP	0x02 /* request 2 wraps */
-+	unsigned wrap = 0; /* bit mask: requests behind the disk head? */
-+
-+	if (!rq1 || rq1 == rq2)
-+		return rq2;
-+	if (!rq2)
-+		return rq1;
-+
-+	if (rq_is_sync(rq1) && !rq_is_sync(rq2))
-+		return rq1;
-+	else if (rq_is_sync(rq2) && !rq_is_sync(rq1))
-+		return rq2;
-+	if ((rq1->cmd_flags & REQ_META) && !(rq2->cmd_flags & REQ_META))
-+		return rq1;
-+	else if ((rq2->cmd_flags & REQ_META) && !(rq1->cmd_flags & REQ_META))
-+		return rq2;
-+
-+	s1 = blk_rq_pos(rq1);
-+	s2 = blk_rq_pos(rq2);
-+
-+	/*
-+	 * By definition, 1KiB is 2 sectors.
-+	 */
-+	back_max = bfqd->bfq_back_max * 2;
-+
-+	/*
-+	 * Strict one way elevator _except_ in the case where we allow
-+	 * short backward seeks which are biased as twice the cost of a
-+	 * similar forward seek.
-+	 */
-+	if (s1 >= last)
-+		d1 = s1 - last;
-+	else if (s1 + back_max >= last)
-+		d1 = (last - s1) * bfqd->bfq_back_penalty;
-+	else
-+		wrap |= BFQ_RQ1_WRAP;
-+
-+	if (s2 >= last)
-+		d2 = s2 - last;
-+	else if (s2 + back_max >= last)
-+		d2 = (last - s2) * bfqd->bfq_back_penalty;
-+	else
-+		wrap |= BFQ_RQ2_WRAP;
-+
-+	/* Found required data */
-+
-+	/*
-+	 * By doing switch() on the bit mask "wrap" we avoid having to
-+	 * check two variables for all permutations: --> faster!
-+	 */
-+	switch (wrap) {
-+	case 0: /* common case for CFQ: rq1 and rq2 not wrapped */
-+		if (d1 < d2)
-+			return rq1;
-+		else if (d2 < d1)
-+			return rq2;
-+		else {
-+			if (s1 >= s2)
-+				return rq1;
-+			else
-+				return rq2;
-+		}
-+
-+	case BFQ_RQ2_WRAP:
-+		return rq1;
-+	case BFQ_RQ1_WRAP:
-+		return rq2;
-+	case (BFQ_RQ1_WRAP|BFQ_RQ2_WRAP): /* both rqs wrapped */
-+	default:
-+		/*
-+		 * Since both rqs are wrapped,
-+		 * start with the one that's further behind head
-+		 * (--> only *one* back seek required),
-+		 * since back seek takes more time than forward.
-+		 */
-+		if (s1 <= s2)
-+			return rq1;
-+		else
-+			return rq2;
-+	}
-+}
-+
-+/*
-+ * Tell whether there are active queues or groups with differentiated weights.
-+ */
-+static bool bfq_differentiated_weights(struct bfq_data *bfqd)
-+{
-+	/*
-+	 * For weights to differ, at least one of the trees must contain
-+	 * at least two nodes.
-+	 */
-+	return (!RB_EMPTY_ROOT(&bfqd->queue_weights_tree) &&
-+		(bfqd->queue_weights_tree.rb_node->rb_left ||
-+		 bfqd->queue_weights_tree.rb_node->rb_right)
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	       ) ||
-+	       (!RB_EMPTY_ROOT(&bfqd->group_weights_tree) &&
-+		(bfqd->group_weights_tree.rb_node->rb_left ||
-+		 bfqd->group_weights_tree.rb_node->rb_right)
-+#endif
-+	       );
-+}
-+
-+/*
-+ * The following function returns true if every queue must receive the
-+ * same share of the throughput (this condition is used when deciding
-+ * whether idling may be disabled, see the comments in the function
-+ * bfq_bfqq_may_idle()).
-+ *
-+ * Such a scenario occurs when:
-+ * 1) all active queues have the same weight,
-+ * 2) all active groups at the same level in the groups tree have the same
-+ *    weight,
-+ * 3) all active groups at the same level in the groups tree have the same
-+ *    number of children.
-+ *
-+ * Unfortunately, keeping the necessary state for evaluating exactly the
-+ * above symmetry conditions would be quite complex and time-consuming.
-+ * Therefore this function evaluates, instead, the following stronger
-+ * sub-conditions, for which it is much easier to maintain the needed
-+ * state:
-+ * 1) all active queues have the same weight,
-+ * 2) all active groups have the same weight,
-+ * 3) all active groups have at most one active child each.
-+ * In particular, the last two conditions are always true if hierarchical
-+ * support and the cgroups interface are not enabled, thus no state needs
-+ * to be maintained in this case.
-+ */
-+static bool bfq_symmetric_scenario(struct bfq_data *bfqd)
-+{
-+	return
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		!bfqd->active_numerous_groups &&
-+#endif
-+		!bfq_differentiated_weights(bfqd);
-+}
-+
-+/*
-+ * If the weight-counter tree passed as input contains no counter for
-+ * the weight of the input entity, then add that counter; otherwise just
-+ * increment the existing counter.
-+ *
-+ * Note that weight-counter trees contain few nodes in mostly symmetric
-+ * scenarios. For example, if all queues have the same weight, then the
-+ * weight-counter tree for the queues may contain at most one node.
-+ * This holds even if low_latency is on, because weight-raised queues
-+ * are not inserted in the tree.
-+ * In most scenarios, the rate at which nodes are created/destroyed
-+ * should be low too.
-+ */
-+static void bfq_weights_tree_add(struct bfq_data *bfqd,
-+				 struct bfq_entity *entity,
-+				 struct rb_root *root)
-+{
-+	struct rb_node **new = &(root->rb_node), *parent = NULL;
-+
-+	/*
-+	 * Do not insert if the entity is already associated with a
-+	 * counter, which happens if:
-+	 *   1) the entity is associated with a queue,
-+	 *   2) a request arrival has caused the queue to become both
-+	 *      non-weight-raised, and hence change its weight, and
-+	 *      backlogged; in this respect, each of the two events
-+	 *      causes an invocation of this function,
-+	 *   3) this is the invocation of this function caused by the
-+	 *      second event. This second invocation is actually useless,
-+	 *      and we handle this fact by exiting immediately. More
-+	 *      efficient or clearer solutions might possibly be adopted.
-+	 */
-+	if (entity->weight_counter)
-+		return;
-+
-+	while (*new) {
-+		struct bfq_weight_counter *__counter = container_of(*new,
-+						struct bfq_weight_counter,
-+						weights_node);
-+		parent = *new;
-+
-+		if (entity->weight == __counter->weight) {
-+			entity->weight_counter = __counter;
-+			goto inc_counter;
-+		}
-+		if (entity->weight < __counter->weight)
-+			new = &((*new)->rb_left);
-+		else
-+			new = &((*new)->rb_right);
-+	}
-+
-+	entity->weight_counter = kzalloc(sizeof(struct bfq_weight_counter),
-+					 GFP_ATOMIC);
-+	entity->weight_counter->weight = entity->weight;
-+	rb_link_node(&entity->weight_counter->weights_node, parent, new);
-+	rb_insert_color(&entity->weight_counter->weights_node, root);
-+
-+inc_counter:
-+	entity->weight_counter->num_active++;
-+}
-+
-+/*
-+ * Decrement the weight counter associated with the entity, and, if the
-+ * counter reaches 0, remove the counter from the tree.
-+ * See the comments to the function bfq_weights_tree_add() for considerations
-+ * about overhead.
-+ */
-+static void bfq_weights_tree_remove(struct bfq_data *bfqd,
-+				    struct bfq_entity *entity,
-+				    struct rb_root *root)
-+{
-+	if (!entity->weight_counter)
-+		return;
-+
-+	BUG_ON(RB_EMPTY_ROOT(root));
-+	BUG_ON(entity->weight_counter->weight != entity->weight);
-+
-+	BUG_ON(!entity->weight_counter->num_active);
-+	entity->weight_counter->num_active--;
-+	if (entity->weight_counter->num_active > 0)
-+		goto reset_entity_pointer;
-+
-+	rb_erase(&entity->weight_counter->weights_node, root);
-+	kfree(entity->weight_counter);
-+
-+reset_entity_pointer:
-+	entity->weight_counter = NULL;
-+}
-+
-+static struct request *bfq_find_next_rq(struct bfq_data *bfqd,
-+					struct bfq_queue *bfqq,
-+					struct request *last)
-+{
-+	struct rb_node *rbnext = rb_next(&last->rb_node);
-+	struct rb_node *rbprev = rb_prev(&last->rb_node);
-+	struct request *next = NULL, *prev = NULL;
-+
-+	BUG_ON(RB_EMPTY_NODE(&last->rb_node));
-+
-+	if (rbprev)
-+		prev = rb_entry_rq(rbprev);
-+
-+	if (rbnext)
-+		next = rb_entry_rq(rbnext);
-+	else {
-+		rbnext = rb_first(&bfqq->sort_list);
-+		if (rbnext && rbnext != &last->rb_node)
-+			next = rb_entry_rq(rbnext);
-+	}
-+
-+	return bfq_choose_req(bfqd, next, prev, blk_rq_pos(last));
-+}
-+
-+/* see the definition of bfq_async_charge_factor for details */
-+static unsigned long bfq_serv_to_charge(struct request *rq,
-+					struct bfq_queue *bfqq)
-+{
-+	return blk_rq_sectors(rq) *
-+		(1 + ((!bfq_bfqq_sync(bfqq)) * (bfqq->wr_coeff == 1) *
-+		bfq_async_charge_factor));
-+}
-+
-+/**
-+ * bfq_updated_next_req - update the queue after a new next_rq selection.
-+ * @bfqd: the device data the queue belongs to.
-+ * @bfqq: the queue to update.
-+ *
-+ * If the first request of a queue changes we make sure that the queue
-+ * has enough budget to serve at least its first request (if the
-+ * request has grown).  We do this because if the queue has not enough
-+ * budget for its first request, it has to go through two dispatch
-+ * rounds to actually get it dispatched.
-+ */
-+static void bfq_updated_next_req(struct bfq_data *bfqd,
-+				 struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+	struct request *next_rq = bfqq->next_rq;
-+	unsigned long new_budget;
-+
-+	if (!next_rq)
-+		return;
-+
-+	if (bfqq == bfqd->in_service_queue)
-+		/*
-+		 * In order not to break guarantees, budgets cannot be
-+		 * changed after an entity has been selected.
-+		 */
-+		return;
-+
-+	BUG_ON(entity->tree != &st->active);
-+	BUG_ON(entity == entity->sched_data->in_service_entity);
-+
-+	new_budget = max_t(unsigned long, bfqq->max_budget,
-+			   bfq_serv_to_charge(next_rq, bfqq));
-+	if (entity->budget != new_budget) {
-+		entity->budget = new_budget;
-+		bfq_log_bfqq(bfqd, bfqq, "updated next rq: new budget %lu",
-+					 new_budget);
-+		bfq_activate_bfqq(bfqd, bfqq);
-+	}
-+}
-+
-+static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
-+{
-+	u64 dur;
-+
-+	if (bfqd->bfq_wr_max_time > 0)
-+		return bfqd->bfq_wr_max_time;
-+
-+	dur = bfqd->RT_prod;
-+	do_div(dur, bfqd->peak_rate);
-+
-+	return dur;
-+}
-+
-+/* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */
-+static void bfq_reset_burst_list(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct bfq_queue *item;
-+	struct hlist_node *n;
-+
-+	hlist_for_each_entry_safe(item, n, &bfqd->burst_list, burst_list_node)
-+		hlist_del_init(&item->burst_list_node);
-+	hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
-+	bfqd->burst_size = 1;
-+}
-+
-+/* Add bfqq to the list of queues in current burst (see bfq_handle_burst) */
-+static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	/* Increment burst size to take into account also bfqq */
-+	bfqd->burst_size++;
-+
-+	if (bfqd->burst_size == bfqd->bfq_large_burst_thresh) {
-+		struct bfq_queue *pos, *bfqq_item;
-+		struct hlist_node *n;
-+
-+		/*
-+		 * Enough queues have been activated shortly after each
-+		 * other to consider this burst as large.
-+		 */
-+		bfqd->large_burst = true;
-+
-+		/*
-+		 * We can now mark all queues in the burst list as
-+		 * belonging to a large burst.
-+		 */
-+		hlist_for_each_entry(bfqq_item, &bfqd->burst_list,
-+				     burst_list_node)
-+		        bfq_mark_bfqq_in_large_burst(bfqq_item);
-+		bfq_mark_bfqq_in_large_burst(bfqq);
-+
-+		/*
-+		 * From now on, and until the current burst finishes, any
-+		 * new queue being activated shortly after the last queue
-+		 * was inserted in the burst can be immediately marked as
-+		 * belonging to a large burst. So the burst list is not
-+		 * needed any more. Remove it.
-+		 */
-+		hlist_for_each_entry_safe(pos, n, &bfqd->burst_list,
-+					  burst_list_node)
-+			hlist_del_init(&pos->burst_list_node);
-+	} else /* burst not yet large: add bfqq to the burst list */
-+		hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
-+}
-+
-+/*
-+ * If many queues happen to become active shortly after each other, then,
-+ * to help the processes associated to these queues get their job done as
-+ * soon as possible, it is usually better to not grant either weight-raising
-+ * or device idling to these queues. In this comment we describe, firstly,
-+ * the reasons why this fact holds, and, secondly, the next function, which
-+ * implements the main steps needed to properly mark these queues so that
-+ * they can then be treated in a different way.
-+ *
-+ * As for the terminology, we say that a queue becomes active, i.e.,
-+ * switches from idle to backlogged, either when it is created (as a
-+ * consequence of the arrival of an I/O request), or, if already existing,
-+ * when a new request for the queue arrives while the queue is idle.
-+ * Bursts of activations, i.e., activations of different queues occurring
-+ * shortly after each other, are typically caused by services or applications
-+ * that spawn or reactivate many parallel threads/processes. Examples are
-+ * systemd during boot or git grep.
-+ *
-+ * These services or applications benefit mostly from a high throughput:
-+ * the quicker the requests of the activated queues are cumulatively served,
-+ * the sooner the target job of these queues gets completed. As a consequence,
-+ * weight-raising any of these queues, which also implies idling the device
-+ * for it, is almost always counterproductive: in most cases it just lowers
-+ * throughput.
-+ *
-+ * On the other hand, a burst of activations may be also caused by the start
-+ * of an application that does not consist in a lot of parallel I/O-bound
-+ * threads. In fact, with a complex application, the burst may be just a
-+ * consequence of the fact that several processes need to be executed to
-+ * start-up the application. To start an application as quickly as possible,
-+ * the best thing to do is to privilege the I/O related to the application
-+ * with respect to all other I/O. Therefore, the best strategy to start as
-+ * quickly as possible an application that causes a burst of activations is
-+ * to weight-raise all the queues activated during the burst. This is the
-+ * exact opposite of the best strategy for the other type of bursts.
-+ *
-+ * In the end, to take the best action for each of the two cases, the two
-+ * types of bursts need to be distinguished. Fortunately, this seems
-+ * relatively easy to do, by looking at the sizes of the bursts. In
-+ * particular, we found a threshold such that bursts with a larger size
-+ * than that threshold are apparently caused only by services or commands
-+ * such as systemd or git grep. For brevity, hereafter we call just 'large'
-+ * these bursts. BFQ *does not* weight-raise queues whose activations occur
-+ * in a large burst. In addition, for each of these queues BFQ performs or
-+ * does not perform idling depending on which choice boosts the throughput
-+ * most. The exact choice depends on the device and request pattern at
-+ * hand.
-+ *
-+ * Turning back to the next function, it implements all the steps needed
-+ * to detect the occurrence of a large burst and to properly mark all the
-+ * queues belonging to it (so that they can then be treated in a different
-+ * way). This goal is achieved by maintaining a special "burst list" that
-+ * holds, temporarily, the queues that belong to the burst in progress. The
-+ * list is then used to mark these queues as belonging to a large burst if
-+ * the burst does become large. The main steps are the following.
-+ *
-+ * . when the very first queue is activated, the queue is inserted into the
-+ *   list (as it could be the first queue in a possible burst)
-+ *
-+ * . if the current burst has not yet become large, and a queue Q that does
-+ *   not yet belong to the burst is activated shortly after the last time
-+ *   at which a new queue entered the burst list, then the function appends
-+ *   Q to the burst list
-+ *
-+ * . if, as a consequence of the previous step, the burst size reaches
-+ *   the large-burst threshold, then
-+ *
-+ *     . all the queues in the burst list are marked as belonging to a
-+ *       large burst
-+ *
-+ *     . the burst list is deleted; in fact, the burst list already served
-+ *       its purpose (keeping temporarily track of the queues in a burst,
-+ *       so as to be able to mark them as belonging to a large burst in the
-+ *       previous sub-step), and now is not needed any more
-+ *
-+ *     . the device enters a large-burst mode
-+ *
-+ * . if a queue Q that does not belong to the burst is activated while
-+ *   the device is in large-burst mode and shortly after the last time
-+ *   at which a queue either entered the burst list or was marked as
-+ *   belonging to the current large burst, then Q is immediately marked
-+ *   as belonging to a large burst.
-+ *
-+ * . if a queue Q that does not belong to the burst is activated a while
-+ *   later, i.e., not shortly after, than the last time at which a queue
-+ *   either entered the burst list or was marked as belonging to the
-+ *   current large burst, then the current burst is deemed as finished and:
-+ *
-+ *        . the large-burst mode is reset if set
-+ *
-+ *        . the burst list is emptied
-+ *
-+ *        . Q is inserted in the burst list, as Q may be the first queue
-+ *          in a possible new burst (then the burst list contains just Q
-+ *          after this step).
-+ */
-+static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			     bool idle_for_long_time)
-+{
-+	/*
-+	 * If bfqq happened to be activated in a burst, but has been idle
-+	 * for at least as long as an interactive queue, then we assume
-+	 * that, in the overall I/O initiated in the burst, the I/O
-+	 * associated to bfqq is finished. So bfqq does not need to be
-+	 * treated as a queue belonging to a burst anymore. Accordingly,
-+	 * we reset bfqq's in_large_burst flag if set, and remove bfqq
-+	 * from the burst list if it's there. We do not decrement instead
-+	 * burst_size, because the fact that bfqq does not need to belong
-+	 * to the burst list any more does not invalidate the fact that
-+	 * bfqq may have been activated during the current burst.
-+	 */
-+	if (idle_for_long_time) {
-+		hlist_del_init(&bfqq->burst_list_node);
-+		bfq_clear_bfqq_in_large_burst(bfqq);
-+	}
-+
-+	/*
-+	 * If bfqq is already in the burst list or is part of a large
-+	 * burst, then there is nothing else to do.
-+	 */
-+	if (!hlist_unhashed(&bfqq->burst_list_node) ||
-+	    bfq_bfqq_in_large_burst(bfqq))
-+		return;
-+
-+	/*
-+	 * If bfqq's activation happens late enough, then the current
-+	 * burst is finished, and related data structures must be reset.
-+	 *
-+	 * In this respect, consider the special case where bfqq is the very
-+	 * first queue being activated. In this case, last_ins_in_burst is
-+	 * not yet significant when we get here. But it is easy to verify
-+	 * that, whether or not the following condition is true, bfqq will
-+	 * end up being inserted into the burst list. In particular the
-+	 * list will happen to contain only bfqq. And this is exactly what
-+	 * has to happen, as bfqq may be the first queue in a possible
-+	 * burst.
-+	 */
-+	if (time_is_before_jiffies(bfqd->last_ins_in_burst +
-+	    bfqd->bfq_burst_interval)) {
-+		bfqd->large_burst = false;
-+		bfq_reset_burst_list(bfqd, bfqq);
-+		return;
-+	}
-+
-+	/*
-+	 * If we get here, then bfqq is being activated shortly after the
-+	 * last queue. So, if the current burst is also large, we can mark
-+	 * bfqq as belonging to this large burst immediately.
-+	 */
-+	if (bfqd->large_burst) {
-+		bfq_mark_bfqq_in_large_burst(bfqq);
-+		return;
-+	}
-+
-+	/*
-+	 * If we get here, then a large-burst state has not yet been
-+	 * reached, but bfqq is being activated shortly after the last
-+	 * queue. Then we add bfqq to the burst.
-+	 */
-+	bfq_add_to_burst(bfqd, bfqq);
-+}
-+
-+static void bfq_add_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	struct request *next_rq, *prev;
-+	unsigned long old_wr_coeff = bfqq->wr_coeff;
-+	bool interactive = false;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "add_request %d", rq_is_sync(rq));
-+	bfqq->queued[rq_is_sync(rq)]++;
-+	bfqd->queued++;
-+
-+	elv_rb_add(&bfqq->sort_list, rq);
-+
-+	/*
-+	 * Check if this request is a better next-serve candidate.
-+	 */
-+	prev = bfqq->next_rq;
-+	next_rq = bfq_choose_req(bfqd, bfqq->next_rq, rq, bfqd->last_position);
-+	BUG_ON(!next_rq);
-+	bfqq->next_rq = next_rq;
-+
-+	if (!bfq_bfqq_busy(bfqq)) {
-+		bool soft_rt, in_burst,
-+		     idle_for_long_time = time_is_before_jiffies(
-+						bfqq->budget_timeout +
-+						bfqd->bfq_wr_min_idle_time);
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		bfqg_stats_update_io_add(bfqq_group(RQ_BFQQ(rq)), bfqq,
-+					 rq->cmd_flags);
-+#endif
-+		if (bfq_bfqq_sync(bfqq)) {
-+			bool already_in_burst =
-+			   !hlist_unhashed(&bfqq->burst_list_node) ||
-+			   bfq_bfqq_in_large_burst(bfqq);
-+			bfq_handle_burst(bfqd, bfqq, idle_for_long_time);
-+			/*
-+			 * If bfqq was not already in the current burst,
-+			 * then, at this point, bfqq either has been
-+			 * added to the current burst or has caused the
-+			 * current burst to terminate. In particular, in
-+			 * the second case, bfqq has become the first
-+			 * queue in a possible new burst.
-+			 * In both cases last_ins_in_burst needs to be
-+			 * moved forward.
-+			 */
-+			if (!already_in_burst)
-+				bfqd->last_ins_in_burst = jiffies;
-+		}
-+
-+		in_burst = bfq_bfqq_in_large_burst(bfqq);
-+		soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
-+			!in_burst &&
-+			time_is_before_jiffies(bfqq->soft_rt_next_start);
-+		interactive = !in_burst && idle_for_long_time;
-+		entity->budget = max_t(unsigned long, bfqq->max_budget,
-+				       bfq_serv_to_charge(next_rq, bfqq));
-+
-+		if (!bfq_bfqq_IO_bound(bfqq)) {
-+			if (time_before(jiffies,
-+					RQ_BIC(rq)->ttime.last_end_request +
-+					bfqd->bfq_slice_idle)) {
-+				bfqq->requests_within_timer++;
-+				if (bfqq->requests_within_timer >=
-+				    bfqd->bfq_requests_within_timer)
-+					bfq_mark_bfqq_IO_bound(bfqq);
-+			} else
-+				bfqq->requests_within_timer = 0;
-+		}
-+
-+		if (!bfqd->low_latency)
-+			goto add_bfqq_busy;
-+
-+		/*
-+		 * If the queue:
-+		 * - is not being boosted,
-+		 * - has been idle for enough time,
-+		 * - is not a sync queue or is linked to a bfq_io_cq (it is
-+		 *   shared "for its nature" or it is not shared and its
-+		 *   requests have not been redirected to a shared queue)
-+		 * start a weight-raising period.
-+		 */
-+		if (old_wr_coeff == 1 && (interactive || soft_rt) &&
-+		    (!bfq_bfqq_sync(bfqq) || bfqq->bic)) {
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			if (interactive)
-+				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+			else
-+				bfqq->wr_cur_max_time =
-+					bfqd->bfq_wr_rt_max_time;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "wrais starting at %lu, rais_max_time %u",
-+				     jiffies,
-+				     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+		} else if (old_wr_coeff > 1) {
-+			if (interactive)
-+				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+			else if (in_burst ||
-+				 (bfqq->wr_cur_max_time ==
-+				  bfqd->bfq_wr_rt_max_time &&
-+				  !soft_rt)) {
-+				bfqq->wr_coeff = 1;
-+				bfq_log_bfqq(bfqd, bfqq,
-+					"wrais ending at %lu, rais_max_time %u",
-+					jiffies,
-+					jiffies_to_msecs(bfqq->
-+						wr_cur_max_time));
-+			} else if (time_before(
-+					bfqq->last_wr_start_finish +
-+					bfqq->wr_cur_max_time,
-+					jiffies +
-+					bfqd->bfq_wr_rt_max_time) &&
-+				   soft_rt) {
-+				/*
-+				 *
-+				 * The remaining weight-raising time is lower
-+				 * than bfqd->bfq_wr_rt_max_time, which means
-+				 * that the application is enjoying weight
-+				 * raising either because deemed soft-rt in
-+				 * the near past, or because deemed interactive
-+				 * a long ago.
-+				 * In both cases, resetting now the current
-+				 * remaining weight-raising time for the
-+				 * application to the weight-raising duration
-+				 * for soft rt applications would not cause any
-+				 * latency increase for the application (as the
-+				 * new duration would be higher than the
-+				 * remaining time).
-+				 *
-+				 * In addition, the application is now meeting
-+				 * the requirements for being deemed soft rt.
-+				 * In the end we can correctly and safely
-+				 * (re)charge the weight-raising duration for
-+				 * the application with the weight-raising
-+				 * duration for soft rt applications.
-+				 *
-+				 * In particular, doing this recharge now, i.e.,
-+				 * before the weight-raising period for the
-+				 * application finishes, reduces the probability
-+				 * of the following negative scenario:
-+				 * 1) the weight of a soft rt application is
-+				 *    raised at startup (as for any newly
-+				 *    created application),
-+				 * 2) since the application is not interactive,
-+				 *    at a certain time weight-raising is
-+				 *    stopped for the application,
-+				 * 3) at that time the application happens to
-+				 *    still have pending requests, and hence
-+				 *    is destined to not have a chance to be
-+				 *    deemed soft rt before these requests are
-+				 *    completed (see the comments to the
-+				 *    function bfq_bfqq_softrt_next_start()
-+				 *    for details on soft rt detection),
-+				 * 4) these pending requests experience a high
-+				 *    latency because the application is not
-+				 *    weight-raised while they are pending.
-+				 */
-+				bfqq->last_wr_start_finish = jiffies;
-+				bfqq->wr_cur_max_time =
-+					bfqd->bfq_wr_rt_max_time;
-+			}
-+		}
-+		if (old_wr_coeff != bfqq->wr_coeff)
-+			entity->prio_changed = 1;
-+add_bfqq_busy:
-+		bfqq->last_idle_bklogged = jiffies;
-+		bfqq->service_from_backlogged = 0;
-+		bfq_clear_bfqq_softrt_update(bfqq);
-+		bfq_add_bfqq_busy(bfqd, bfqq);
-+	} else {
-+		if (bfqd->low_latency && old_wr_coeff == 1 && !rq_is_sync(rq) &&
-+		    time_is_before_jiffies(
-+				bfqq->last_wr_start_finish +
-+				bfqd->bfq_wr_min_inter_arr_async)) {
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+
-+			bfqd->wr_busy_queues++;
-+			entity->prio_changed = 1;
-+			bfq_log_bfqq(bfqd, bfqq,
-+			    "non-idle wrais starting at %lu, rais_max_time %u",
-+			    jiffies,
-+			    jiffies_to_msecs(bfqq->wr_cur_max_time));
-+		}
-+		if (prev != bfqq->next_rq)
-+			bfq_updated_next_req(bfqd, bfqq);
-+	}
-+
-+	if (bfqd->low_latency &&
-+		(old_wr_coeff == 1 || bfqq->wr_coeff == 1 || interactive))
-+		bfqq->last_wr_start_finish = jiffies;
-+}
-+
-+static struct request *bfq_find_rq_fmerge(struct bfq_data *bfqd,
-+					  struct bio *bio)
-+{
-+	struct task_struct *tsk = current;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq;
-+
-+	bic = bfq_bic_lookup(bfqd, tsk->io_context);
-+	if (!bic)
-+		return NULL;
-+
-+	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
-+	if (bfqq)
-+		return elv_rb_find(&bfqq->sort_list, bio_end_sector(bio));
-+
-+	return NULL;
-+}
-+
-+static void bfq_activate_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+
-+	bfqd->rq_in_driver++;
-+	bfqd->last_position = blk_rq_pos(rq) + blk_rq_sectors(rq);
-+	bfq_log(bfqd, "activate_request: new bfqd->last_position %llu",
-+		(long long unsigned)bfqd->last_position);
-+}
-+
-+static void bfq_deactivate_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+
-+	BUG_ON(bfqd->rq_in_driver == 0);
-+	bfqd->rq_in_driver--;
-+}
-+
-+static void bfq_remove_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	const int sync = rq_is_sync(rq);
-+
-+	if (bfqq->next_rq == rq) {
-+		bfqq->next_rq = bfq_find_next_rq(bfqd, bfqq, rq);
-+		bfq_updated_next_req(bfqd, bfqq);
-+	}
-+
-+	if (rq->queuelist.prev != &rq->queuelist)
-+		list_del_init(&rq->queuelist);
-+	BUG_ON(bfqq->queued[sync] == 0);
-+	bfqq->queued[sync]--;
-+	bfqd->queued--;
-+	elv_rb_del(&bfqq->sort_list, rq);
-+
-+	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue)
-+			bfq_del_bfqq_busy(bfqd, bfqq, 1);
-+		/*
-+		 * Remove queue from request-position tree as it is empty.
-+		 */
-+		if (bfqq->pos_root) {
-+			rb_erase(&bfqq->pos_node, bfqq->pos_root);
-+			bfqq->pos_root = NULL;
-+		}
-+	}
-+
-+	if (rq->cmd_flags & REQ_META) {
-+		BUG_ON(bfqq->meta_pending == 0);
-+		bfqq->meta_pending--;
-+	}
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_io_remove(bfqq_group(bfqq), rq->cmd_flags);
-+#endif
-+}
-+
-+static int bfq_merge(struct request_queue *q, struct request **req,
-+		     struct bio *bio)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct request *__rq;
-+
-+	__rq = bfq_find_rq_fmerge(bfqd, bio);
-+	if (__rq && elv_rq_merge_ok(__rq, bio)) {
-+		*req = __rq;
-+		return ELEVATOR_FRONT_MERGE;
-+	}
-+
-+	return ELEVATOR_NO_MERGE;
-+}
-+
-+static void bfq_merged_request(struct request_queue *q, struct request *req,
-+			       int type)
-+{
-+	if (type == ELEVATOR_FRONT_MERGE &&
-+	    rb_prev(&req->rb_node) &&
-+	    blk_rq_pos(req) <
-+	    blk_rq_pos(container_of(rb_prev(&req->rb_node),
-+				    struct request, rb_node))) {
-+		struct bfq_queue *bfqq = RQ_BFQQ(req);
-+		struct bfq_data *bfqd = bfqq->bfqd;
-+		struct request *prev, *next_rq;
-+
-+		/* Reposition request in its sort_list */
-+		elv_rb_del(&bfqq->sort_list, req);
-+		elv_rb_add(&bfqq->sort_list, req);
-+		/* Choose next request to be served for bfqq */
-+		prev = bfqq->next_rq;
-+		next_rq = bfq_choose_req(bfqd, bfqq->next_rq, req,
-+					 bfqd->last_position);
-+		BUG_ON(!next_rq);
-+		bfqq->next_rq = next_rq;
-+	}
-+}
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static void bfq_bio_merged(struct request_queue *q, struct request *req,
-+			   struct bio *bio)
-+{
-+	bfqg_stats_update_io_merged(bfqq_group(RQ_BFQQ(req)), bio->bi_rw);
-+}
-+#endif
-+
-+static void bfq_merged_requests(struct request_queue *q, struct request *rq,
-+				struct request *next)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq), *next_bfqq = RQ_BFQQ(next);
-+
-+	/*
-+	 * If next and rq belong to the same bfq_queue and next is older
-+	 * than rq, then reposition rq in the fifo (by substituting next
-+	 * with rq). Otherwise, if next and rq belong to different
-+	 * bfq_queues, never reposition rq: in fact, we would have to
-+	 * reposition it with respect to next's position in its own fifo,
-+	 * which would most certainly be too expensive with respect to
-+	 * the benefits.
-+	 */
-+	if (bfqq == next_bfqq &&
-+	    !list_empty(&rq->queuelist) && !list_empty(&next->queuelist) &&
-+	    time_before(next->fifo_time, rq->fifo_time)) {
-+		list_del_init(&rq->queuelist);
-+		list_replace_init(&next->queuelist, &rq->queuelist);
-+		rq->fifo_time = next->fifo_time;
-+	}
-+
-+	if (bfqq->next_rq == next)
-+		bfqq->next_rq = rq;
-+
-+	bfq_remove_request(next);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_io_merged(bfqq_group(bfqq), next->cmd_flags);
-+#endif
-+}
-+
-+/* Must be called with bfqq != NULL */
-+static void bfq_bfqq_end_wr(struct bfq_queue *bfqq)
-+{
-+	BUG_ON(!bfqq);
-+	if (bfq_bfqq_busy(bfqq))
-+		bfqq->bfqd->wr_busy_queues--;
-+	bfqq->wr_coeff = 1;
-+	bfqq->wr_cur_max_time = 0;
-+	/* Trigger a weight change on the next activation of the queue */
-+	bfqq->entity.prio_changed = 1;
-+}
-+
-+static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
-+				    struct bfq_group *bfqg)
-+{
-+	int i, j;
-+
-+	for (i = 0; i < 2; i++)
-+		for (j = 0; j < IOPRIO_BE_NR; j++)
-+			if (bfqg->async_bfqq[i][j])
-+				bfq_bfqq_end_wr(bfqg->async_bfqq[i][j]);
-+	if (bfqg->async_idle_bfqq)
-+		bfq_bfqq_end_wr(bfqg->async_idle_bfqq);
-+}
-+
-+static void bfq_end_wr(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq;
-+
-+	spin_lock_irq(bfqd->queue->queue_lock);
-+
-+	list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list)
-+		bfq_bfqq_end_wr(bfqq);
-+	list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list)
-+		bfq_bfqq_end_wr(bfqq);
-+	bfq_end_wr_async(bfqd);
-+
-+	spin_unlock_irq(bfqd->queue->queue_lock);
-+}
-+
-+static int bfq_allow_merge(struct request_queue *q, struct request *rq,
-+			   struct bio *bio)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_io_cq *bic;
-+
-+	/*
-+	 * Disallow merge of a sync bio into an async request.
-+	 */
-+	if (bfq_bio_sync(bio) && !rq_is_sync(rq))
-+		return 0;
-+
-+	/*
-+	 * Lookup the bfqq that this bio will be queued with. Allow
-+	 * merge only if rq is queued there.
-+	 * Queue lock is held here.
-+	 */
-+	bic = bfq_bic_lookup(bfqd, current->io_context);
-+	if (!bic)
-+		return 0;
-+
-+	return bic_to_bfqq(bic, bfq_bio_sync(bio)) == RQ_BFQQ(rq);
-+}
-+
-+static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
-+				       struct bfq_queue *bfqq)
-+{
-+	if (bfqq) {
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		bfqg_stats_update_avg_queue_size(bfqq_group(bfqq));
-+#endif
-+		bfq_mark_bfqq_must_alloc(bfqq);
-+		bfq_mark_bfqq_budget_new(bfqq);
-+		bfq_clear_bfqq_fifo_expire(bfqq);
-+
-+		bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8;
-+
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "set_in_service_queue, cur-budget = %d",
-+			     bfqq->entity.budget);
-+	}
-+
-+	bfqd->in_service_queue = bfqq;
-+}
-+
-+/*
-+ * Get and set a new queue for service.
-+ */
-+static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfq_get_next_queue(bfqd);
-+
-+	__bfq_set_in_service_queue(bfqd, bfqq);
-+	return bfqq;
-+}
-+
-+/*
-+ * If enough samples have been computed, return the current max budget
-+ * stored in bfqd, which is dynamically updated according to the
-+ * estimated disk peak rate; otherwise return the default max budget
-+ */
-+static int bfq_max_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
-+		return bfq_default_max_budget;
-+	else
-+		return bfqd->bfq_max_budget;
-+}
-+
-+/*
-+ * Return min budget, which is a fraction of the current or default
-+ * max budget (trying with 1/32)
-+ */
-+static int bfq_min_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
-+		return bfq_default_max_budget / 32;
-+	else
-+		return bfqd->bfq_max_budget / 32;
-+}
-+
-+static void bfq_arm_slice_timer(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfqd->in_service_queue;
-+	struct bfq_io_cq *bic;
-+	unsigned long sl;
-+
-+	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	/* Processes have exited, don't wait. */
-+	bic = bfqd->in_service_bic;
-+	if (!bic || atomic_read(&bic->icq.ioc->active_ref) == 0)
-+		return;
-+
-+	bfq_mark_bfqq_wait_request(bfqq);
-+
-+	/*
-+	 * We don't want to idle for seeks, but we do want to allow
-+	 * fair distribution of slice time for a process doing back-to-back
-+	 * seeks. So allow a little bit of time for him to submit a new rq.
-+	 *
-+	 * To prevent processes with (partly) seeky workloads from
-+	 * being too ill-treated, grant them a small fraction of the
-+	 * assigned budget before reducing the waiting time to
-+	 * BFQ_MIN_TT. This happened to help reduce latency.
-+	 */
-+	sl = bfqd->bfq_slice_idle;
-+	/*
-+	 * Unless the queue is being weight-raised or the scenario is
-+	 * asymmetric, grant only minimum idle time if the queue either
-+	 * has been seeky for long enough or has already proved to be
-+	 * constantly seeky.
-+	 */
-+	if (bfq_sample_valid(bfqq->seek_samples) &&
-+	    ((BFQQ_SEEKY(bfqq) && bfqq->entity.service >
-+				  bfq_max_budget(bfqq->bfqd) / 8) ||
-+	      bfq_bfqq_constantly_seeky(bfqq)) && bfqq->wr_coeff == 1 &&
-+	    bfq_symmetric_scenario(bfqd))
-+		sl = min(sl, msecs_to_jiffies(BFQ_MIN_TT));
-+	else if (bfqq->wr_coeff > 1)
-+		sl = sl * 3;
-+	bfqd->last_idling_start = ktime_get();
-+	mod_timer(&bfqd->idle_slice_timer, jiffies + sl);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_set_start_idle_time(bfqq_group(bfqq));
-+#endif
-+	bfq_log(bfqd, "arm idle: %u/%u ms",
-+		jiffies_to_msecs(sl), jiffies_to_msecs(bfqd->bfq_slice_idle));
-+}
-+
-+/*
-+ * Set the maximum time for the in-service queue to consume its
-+ * budget. This prevents seeky processes from lowering the disk
-+ * throughput (always guaranteed with a time slice scheme as in CFQ).
-+ */
-+static void bfq_set_budget_timeout(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfqd->in_service_queue;
-+	unsigned int timeout_coeff;
-+	if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time)
-+		timeout_coeff = 1;
-+	else
-+		timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight;
-+
-+	bfqd->last_budget_start = ktime_get();
-+
-+	bfq_clear_bfqq_budget_new(bfqq);
-+	bfqq->budget_timeout = jiffies +
-+		bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * timeout_coeff;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "set budget_timeout %u",
-+		jiffies_to_msecs(bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] *
-+		timeout_coeff));
-+}
-+
-+/*
-+ * Move request from internal lists to the request queue dispatch list.
-+ */
-+static void bfq_dispatch_insert(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	/*
-+	 * For consistency, the next instruction should have been executed
-+	 * after removing the request from the queue and dispatching it.
-+	 * We execute instead this instruction before bfq_remove_request()
-+	 * (and hence introduce a temporary inconsistency), for efficiency.
-+	 * In fact, in a forced_dispatch, this prevents two counters related
-+	 * to bfqq->dispatched to risk to be uselessly decremented if bfqq
-+	 * is not in service, and then to be incremented again after
-+	 * incrementing bfqq->dispatched.
-+	 */
-+	bfqq->dispatched++;
-+	bfq_remove_request(rq);
-+	elv_dispatch_sort(q, rq);
-+
-+	if (bfq_bfqq_sync(bfqq))
-+		bfqd->sync_flight++;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_dispatch(bfqq_group(bfqq), blk_rq_bytes(rq),
-+				   rq->cmd_flags);
-+#endif
-+}
-+
-+/*
-+ * Return expired entry, or NULL to just start from scratch in rbtree.
-+ */
-+static struct request *bfq_check_fifo(struct bfq_queue *bfqq)
-+{
-+	struct request *rq = NULL;
-+
-+	if (bfq_bfqq_fifo_expire(bfqq))
-+		return NULL;
-+
-+	bfq_mark_bfqq_fifo_expire(bfqq);
-+
-+	if (list_empty(&bfqq->fifo))
-+		return NULL;
-+
-+	rq = rq_entry_fifo(bfqq->fifo.next);
-+
-+	if (time_before(jiffies, rq->fifo_time))
-+		return NULL;
-+
-+	return rq;
-+}
-+
-+static int bfq_bfqq_budget_left(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	return entity->budget - entity->service;
-+}
-+
-+static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	__bfq_bfqd_reset_in_service(bfqd);
-+
-+	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		/*
-+		 * Overloading budget_timeout field to store the time
-+		 * at which the queue remains with no backlog; used by
-+		 * the weight-raising mechanism.
-+		 */
-+		bfqq->budget_timeout = jiffies;
-+		bfq_del_bfqq_busy(bfqd, bfqq, 1);
-+	} else
-+		bfq_activate_bfqq(bfqd, bfqq);
-+}
-+
-+/**
-+ * __bfq_bfqq_recalc_budget - try to adapt the budget to the @bfqq behavior.
-+ * @bfqd: device data.
-+ * @bfqq: queue to update.
-+ * @reason: reason for expiration.
-+ *
-+ * Handle the feedback on @bfqq budget at queue expiration.
-+ * See the body for detailed comments.
-+ */
-+static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
-+				     struct bfq_queue *bfqq,
-+				     enum bfqq_expiration reason)
-+{
-+	struct request *next_rq;
-+	int budget, min_budget;
-+
-+	budget = bfqq->max_budget;
-+	min_budget = bfq_min_budget(bfqd);
-+
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last budg %d, budg left %d",
-+		bfqq->entity.budget, bfq_bfqq_budget_left(bfqq));
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last max_budg %d, min budg %d",
-+		budget, bfq_min_budget(bfqd));
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: sync %d, seeky %d",
-+		bfq_bfqq_sync(bfqq), BFQQ_SEEKY(bfqd->in_service_queue));
-+
-+	if (bfq_bfqq_sync(bfqq)) {
-+		switch (reason) {
-+		/*
-+		 * Caveat: in all the following cases we trade latency
-+		 * for throughput.
-+		 */
-+		case BFQ_BFQQ_TOO_IDLE:
-+			/*
-+			 * This is the only case where we may reduce
-+			 * the budget: if there is no request of the
-+			 * process still waiting for completion, then
-+			 * we assume (tentatively) that the timer has
-+			 * expired because the batch of requests of
-+			 * the process could have been served with a
-+			 * smaller budget.  Hence, betting that
-+			 * process will behave in the same way when it
-+			 * becomes backlogged again, we reduce its
-+			 * next budget.  As long as we guess right,
-+			 * this budget cut reduces the latency
-+			 * experienced by the process.
-+			 *
-+			 * However, if there are still outstanding
-+			 * requests, then the process may have not yet
-+			 * issued its next request just because it is
-+			 * still waiting for the completion of some of
-+			 * the still outstanding ones.  So in this
-+			 * subcase we do not reduce its budget, on the
-+			 * contrary we increase it to possibly boost
-+			 * the throughput, as discussed in the
-+			 * comments to the BUDGET_TIMEOUT case.
-+			 */
-+			if (bfqq->dispatched > 0) /* still outstanding reqs */
-+				budget = min(budget * 2, bfqd->bfq_max_budget);
-+			else {
-+				if (budget > 5 * min_budget)
-+					budget -= 4 * min_budget;
-+				else
-+					budget = min_budget;
-+			}
-+			break;
-+		case BFQ_BFQQ_BUDGET_TIMEOUT:
-+			/*
-+			 * We double the budget here because: 1) it
-+			 * gives the chance to boost the throughput if
-+			 * this is not a seeky process (which may have
-+			 * bumped into this timeout because of, e.g.,
-+			 * ZBR), 2) together with charge_full_budget
-+			 * it helps give seeky processes higher
-+			 * timestamps, and hence be served less
-+			 * frequently.
-+			 */
-+			budget = min(budget * 2, bfqd->bfq_max_budget);
-+			break;
-+		case BFQ_BFQQ_BUDGET_EXHAUSTED:
-+			/*
-+			 * The process still has backlog, and did not
-+			 * let either the budget timeout or the disk
-+			 * idling timeout expire. Hence it is not
-+			 * seeky, has a short thinktime and may be
-+			 * happy with a higher budget too. So
-+			 * definitely increase the budget of this good
-+			 * candidate to boost the disk throughput.
-+			 */
-+			budget = min(budget * 4, bfqd->bfq_max_budget);
-+			break;
-+		case BFQ_BFQQ_NO_MORE_REQUESTS:
-+		       /*
-+			* Leave the budget unchanged.
-+			*/
-+		default:
-+			return;
-+		}
-+	} else
-+		/*
-+		 * Async queues get always the maximum possible budget
-+		 * (their ability to dispatch is limited by
-+		 * @bfqd->bfq_max_budget_async_rq).
-+		 */
-+		budget = bfqd->bfq_max_budget;
-+
-+	bfqq->max_budget = budget;
-+
-+	if (bfqd->budgets_assigned >= bfq_stats_min_budgets &&
-+	    !bfqd->bfq_user_max_budget)
-+		bfqq->max_budget = min(bfqq->max_budget, bfqd->bfq_max_budget);
-+
-+	/*
-+	 * Make sure that we have enough budget for the next request.
-+	 * Since the finish time of the bfqq must be kept in sync with
-+	 * the budget, be sure to call __bfq_bfqq_expire() after the
-+	 * update.
-+	 */
-+	next_rq = bfqq->next_rq;
-+	if (next_rq)
-+		bfqq->entity.budget = max_t(unsigned long, bfqq->max_budget,
-+					    bfq_serv_to_charge(next_rq, bfqq));
-+	else
-+		bfqq->entity.budget = bfqq->max_budget;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "head sect: %u, new budget %d",
-+			next_rq ? blk_rq_sectors(next_rq) : 0,
-+			bfqq->entity.budget);
-+}
-+
-+static unsigned long bfq_calc_max_budget(u64 peak_rate, u64 timeout)
-+{
-+	unsigned long max_budget;
-+
-+	/*
-+	 * The max_budget calculated when autotuning is equal to the
-+	 * amount of sectors transfered in timeout_sync at the
-+	 * estimated peak rate.
-+	 */
-+	max_budget = (unsigned long)(peak_rate * 1000 *
-+				     timeout >> BFQ_RATE_SHIFT);
-+
-+	return max_budget;
-+}
-+
-+/*
-+ * In addition to updating the peak rate, checks whether the process
-+ * is "slow", and returns 1 if so. This slow flag is used, in addition
-+ * to the budget timeout, to reduce the amount of service provided to
-+ * seeky processes, and hence reduce their chances to lower the
-+ * throughput. See the code for more details.
-+ */
-+static bool bfq_update_peak_rate(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				 bool compensate, enum bfqq_expiration reason)
-+{
-+	u64 bw, usecs, expected, timeout;
-+	ktime_t delta;
-+	int update = 0;
-+
-+	if (!bfq_bfqq_sync(bfqq) || bfq_bfqq_budget_new(bfqq))
-+		return false;
-+
-+	if (compensate)
-+		delta = bfqd->last_idling_start;
-+	else
-+		delta = ktime_get();
-+	delta = ktime_sub(delta, bfqd->last_budget_start);
-+	usecs = ktime_to_us(delta);
-+
-+	/* Don't trust short/unrealistic values. */
-+	if (usecs < 100 || usecs >= LONG_MAX)
-+		return false;
-+
-+	/*
-+	 * Calculate the bandwidth for the last slice.  We use a 64 bit
-+	 * value to store the peak rate, in sectors per usec in fixed
-+	 * point math.  We do so to have enough precision in the estimate
-+	 * and to avoid overflows.
-+	 */
-+	bw = (u64)bfqq->entity.service << BFQ_RATE_SHIFT;
-+	do_div(bw, (unsigned long)usecs);
-+
-+	timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
-+
-+	/*
-+	 * Use only long (> 20ms) intervals to filter out spikes for
-+	 * the peak rate estimation.
-+	 */
-+	if (usecs > 20000) {
-+		if (bw > bfqd->peak_rate ||
-+		   (!BFQQ_SEEKY(bfqq) &&
-+		    reason == BFQ_BFQQ_BUDGET_TIMEOUT)) {
-+			bfq_log(bfqd, "measured bw =%llu", bw);
-+			/*
-+			 * To smooth oscillations use a low-pass filter with
-+			 * alpha=7/8, i.e.,
-+			 * new_rate = (7/8) * old_rate + (1/8) * bw
-+			 */
-+			do_div(bw, 8);
-+			if (bw == 0)
-+				return 0;
-+			bfqd->peak_rate *= 7;
-+			do_div(bfqd->peak_rate, 8);
-+			bfqd->peak_rate += bw;
-+			update = 1;
-+			bfq_log(bfqd, "new peak_rate=%llu", bfqd->peak_rate);
-+		}
-+
-+		update |= bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES - 1;
-+
-+		if (bfqd->peak_rate_samples < BFQ_PEAK_RATE_SAMPLES)
-+			bfqd->peak_rate_samples++;
-+
-+		if (bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES &&
-+		    update) {
-+			int dev_type = blk_queue_nonrot(bfqd->queue);
-+			if (bfqd->bfq_user_max_budget == 0) {
-+				bfqd->bfq_max_budget =
-+					bfq_calc_max_budget(bfqd->peak_rate,
-+							    timeout);
-+				bfq_log(bfqd, "new max_budget=%d",
-+					bfqd->bfq_max_budget);
-+			}
-+			if (bfqd->device_speed == BFQ_BFQD_FAST &&
-+			    bfqd->peak_rate < device_speed_thresh[dev_type]) {
-+				bfqd->device_speed = BFQ_BFQD_SLOW;
-+				bfqd->RT_prod = R_slow[dev_type] *
-+						T_slow[dev_type];
-+			} else if (bfqd->device_speed == BFQ_BFQD_SLOW &&
-+			    bfqd->peak_rate > device_speed_thresh[dev_type]) {
-+				bfqd->device_speed = BFQ_BFQD_FAST;
-+				bfqd->RT_prod = R_fast[dev_type] *
-+						T_fast[dev_type];
-+			}
-+		}
-+	}
-+
-+	/*
-+	 * If the process has been served for a too short time
-+	 * interval to let its possible sequential accesses prevail on
-+	 * the initial seek time needed to move the disk head on the
-+	 * first sector it requested, then give the process a chance
-+	 * and for the moment return false.
-+	 */
-+	if (bfqq->entity.budget <= bfq_max_budget(bfqd) / 8)
-+		return false;
-+
-+	/*
-+	 * A process is considered ``slow'' (i.e., seeky, so that we
-+	 * cannot treat it fairly in the service domain, as it would
-+	 * slow down too much the other processes) if, when a slice
-+	 * ends for whatever reason, it has received service at a
-+	 * rate that would not be high enough to complete the budget
-+	 * before the budget timeout expiration.
-+	 */
-+	expected = bw * 1000 * timeout >> BFQ_RATE_SHIFT;
-+
-+	/*
-+	 * Caveat: processes doing IO in the slower disk zones will
-+	 * tend to be slow(er) even if not seeky. And the estimated
-+	 * peak rate will actually be an average over the disk
-+	 * surface. Hence, to not be too harsh with unlucky processes,
-+	 * we keep a budget/3 margin of safety before declaring a
-+	 * process slow.
-+	 */
-+	return expected > (4 * bfqq->entity.budget) / 3;
-+}
-+
-+/*
-+ * To be deemed as soft real-time, an application must meet two
-+ * requirements. First, the application must not require an average
-+ * bandwidth higher than the approximate bandwidth required to playback or
-+ * record a compressed high-definition video.
-+ * The next function is invoked on the completion of the last request of a
-+ * batch, to compute the next-start time instant, soft_rt_next_start, such
-+ * that, if the next request of the application does not arrive before
-+ * soft_rt_next_start, then the above requirement on the bandwidth is met.
-+ *
-+ * The second requirement is that the request pattern of the application is
-+ * isochronous, i.e., that, after issuing a request or a batch of requests,
-+ * the application stops issuing new requests until all its pending requests
-+ * have been completed. After that, the application may issue a new batch,
-+ * and so on.
-+ * For this reason the next function is invoked to compute
-+ * soft_rt_next_start only for applications that meet this requirement,
-+ * whereas soft_rt_next_start is set to infinity for applications that do
-+ * not.
-+ *
-+ * Unfortunately, even a greedy application may happen to behave in an
-+ * isochronous way if the CPU load is high. In fact, the application may
-+ * stop issuing requests while the CPUs are busy serving other processes,
-+ * then restart, then stop again for a while, and so on. In addition, if
-+ * the disk achieves a low enough throughput with the request pattern
-+ * issued by the application (e.g., because the request pattern is random
-+ * and/or the device is slow), then the application may meet the above
-+ * bandwidth requirement too. To prevent such a greedy application to be
-+ * deemed as soft real-time, a further rule is used in the computation of
-+ * soft_rt_next_start: soft_rt_next_start must be higher than the current
-+ * time plus the maximum time for which the arrival of a request is waited
-+ * for when a sync queue becomes idle, namely bfqd->bfq_slice_idle.
-+ * This filters out greedy applications, as the latter issue instead their
-+ * next request as soon as possible after the last one has been completed
-+ * (in contrast, when a batch of requests is completed, a soft real-time
-+ * application spends some time processing data).
-+ *
-+ * Unfortunately, the last filter may easily generate false positives if
-+ * only bfqd->bfq_slice_idle is used as a reference time interval and one
-+ * or both the following cases occur:
-+ * 1) HZ is so low that the duration of a jiffy is comparable to or higher
-+ *    than bfqd->bfq_slice_idle. This happens, e.g., on slow devices with
-+ *    HZ=100.
-+ * 2) jiffies, instead of increasing at a constant rate, may stop increasing
-+ *    for a while, then suddenly 'jump' by several units to recover the lost
-+ *    increments. This seems to happen, e.g., inside virtual machines.
-+ * To address this issue, we do not use as a reference time interval just
-+ * bfqd->bfq_slice_idle, but bfqd->bfq_slice_idle plus a few jiffies. In
-+ * particular we add the minimum number of jiffies for which the filter
-+ * seems to be quite precise also in embedded systems and KVM/QEMU virtual
-+ * machines.
-+ */
-+static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd,
-+						struct bfq_queue *bfqq)
-+{
-+	return max(bfqq->last_idle_bklogged +
-+		   HZ * bfqq->service_from_backlogged /
-+		   bfqd->bfq_wr_max_softrt_rate,
-+		   jiffies + bfqq->bfqd->bfq_slice_idle + 4);
-+}
-+
-+/*
-+ * Return the largest-possible time instant such that, for as long as possible,
-+ * the current time will be lower than this time instant according to the macro
-+ * time_is_before_jiffies().
-+ */
-+static unsigned long bfq_infinity_from_now(unsigned long now)
-+{
-+	return now + ULONG_MAX / 2;
-+}
-+
-+/**
-+ * bfq_bfqq_expire - expire a queue.
-+ * @bfqd: device owning the queue.
-+ * @bfqq: the queue to expire.
-+ * @compensate: if true, compensate for the time spent idling.
-+ * @reason: the reason causing the expiration.
-+ *
-+ *
-+ * If the process associated to the queue is slow (i.e., seeky), or in
-+ * case of budget timeout, or, finally, if it is async, we
-+ * artificially charge it an entire budget (independently of the
-+ * actual service it received). As a consequence, the queue will get
-+ * higher timestamps than the correct ones upon reactivation, and
-+ * hence it will be rescheduled as if it had received more service
-+ * than what it actually received. In the end, this class of processes
-+ * will receive less service in proportion to how slowly they consume
-+ * their budgets (and hence how seriously they tend to lower the
-+ * throughput).
-+ *
-+ * In contrast, when a queue expires because it has been idling for
-+ * too much or because it exhausted its budget, we do not touch the
-+ * amount of service it has received. Hence when the queue will be
-+ * reactivated and its timestamps updated, the latter will be in sync
-+ * with the actual service received by the queue until expiration.
-+ *
-+ * Charging a full budget to the first type of queues and the exact
-+ * service to the others has the effect of using the WF2Q+ policy to
-+ * schedule the former on a timeslice basis, without violating the
-+ * service domain guarantees of the latter.
-+ */
-+static void bfq_bfqq_expire(struct bfq_data *bfqd,
-+			    struct bfq_queue *bfqq,
-+			    bool compensate,
-+			    enum bfqq_expiration reason)
-+{
-+	bool slow;
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	/*
-+	 * Update disk peak rate for autotuning and check whether the
-+	 * process is slow (see bfq_update_peak_rate).
-+	 */
-+	slow = bfq_update_peak_rate(bfqd, bfqq, compensate, reason);
-+
-+	/*
-+	 * As above explained, 'punish' slow (i.e., seeky), timed-out
-+	 * and async queues, to favor sequential sync workloads.
-+	 *
-+	 * Processes doing I/O in the slower disk zones will tend to be
-+	 * slow(er) even if not seeky. Hence, since the estimated peak
-+	 * rate is actually an average over the disk surface, these
-+	 * processes may timeout just for bad luck. To avoid punishing
-+	 * them we do not charge a full budget to a process that
-+	 * succeeded in consuming at least 2/3 of its budget.
-+	 */
-+	if (slow || (reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
-+		     bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3))
-+		bfq_bfqq_charge_full_budget(bfqq);
-+
-+	bfqq->service_from_backlogged += bfqq->entity.service;
-+
-+	if (BFQQ_SEEKY(bfqq) && reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
-+	    !bfq_bfqq_constantly_seeky(bfqq)) {
-+		bfq_mark_bfqq_constantly_seeky(bfqq);
-+		if (!blk_queue_nonrot(bfqd->queue))
-+			bfqd->const_seeky_busy_in_flight_queues++;
-+	}
-+
-+	if (reason == BFQ_BFQQ_TOO_IDLE &&
-+	    bfqq->entity.service <= 2 * bfqq->entity.budget / 10 )
-+		bfq_clear_bfqq_IO_bound(bfqq);
-+
-+	if (bfqd->low_latency && bfqq->wr_coeff == 1)
-+		bfqq->last_wr_start_finish = jiffies;
-+
-+	if (bfqd->low_latency && bfqd->bfq_wr_max_softrt_rate > 0 &&
-+	    RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		/*
-+		 * If we get here, and there are no outstanding requests,
-+		 * then the request pattern is isochronous (see the comments
-+		 * to the function bfq_bfqq_softrt_next_start()). Hence we
-+		 * can compute soft_rt_next_start. If, instead, the queue
-+		 * still has outstanding requests, then we have to wait
-+		 * for the completion of all the outstanding requests to
-+		 * discover whether the request pattern is actually
-+		 * isochronous.
-+		 */
-+		if (bfqq->dispatched == 0)
-+			bfqq->soft_rt_next_start =
-+				bfq_bfqq_softrt_next_start(bfqd, bfqq);
-+		else {
-+			/*
-+			 * The application is still waiting for the
-+			 * completion of one or more requests:
-+			 * prevent it from possibly being incorrectly
-+			 * deemed as soft real-time by setting its
-+			 * soft_rt_next_start to infinity. In fact,
-+			 * without this assignment, the application
-+			 * would be incorrectly deemed as soft
-+			 * real-time if:
-+			 * 1) it issued a new request before the
-+			 *    completion of all its in-flight
-+			 *    requests, and
-+			 * 2) at that time, its soft_rt_next_start
-+			 *    happened to be in the past.
-+			 */
-+			bfqq->soft_rt_next_start =
-+				bfq_infinity_from_now(jiffies);
-+			/*
-+			 * Schedule an update of soft_rt_next_start to when
-+			 * the task may be discovered to be isochronous.
-+			 */
-+			bfq_mark_bfqq_softrt_update(bfqq);
-+		}
-+	}
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		"expire (%d, slow %d, num_disp %d, idle_win %d)", reason,
-+		slow, bfqq->dispatched, bfq_bfqq_idle_window(bfqq));
-+
-+	/*
-+	 * Increase, decrease or leave budget unchanged according to
-+	 * reason.
-+	 */
-+	__bfq_bfqq_recalc_budget(bfqd, bfqq, reason);
-+	__bfq_bfqq_expire(bfqd, bfqq);
-+}
-+
-+/*
-+ * Budget timeout is not implemented through a dedicated timer, but
-+ * just checked on request arrivals and completions, as well as on
-+ * idle timer expirations.
-+ */
-+static bool bfq_bfqq_budget_timeout(struct bfq_queue *bfqq)
-+{
-+	if (bfq_bfqq_budget_new(bfqq) ||
-+	    time_before(jiffies, bfqq->budget_timeout))
-+		return false;
-+	return true;
-+}
-+
-+/*
-+ * If we expire a queue that is waiting for the arrival of a new
-+ * request, we may prevent the fictitious timestamp back-shifting that
-+ * allows the guarantees of the queue to be preserved (see [1] for
-+ * this tricky aspect). Hence we return true only if this condition
-+ * does not hold, or if the queue is slow enough to deserve only to be
-+ * kicked off for preserving a high throughput.
-+*/
-+static bool bfq_may_expire_for_budg_timeout(struct bfq_queue *bfqq)
-+{
-+	bfq_log_bfqq(bfqq->bfqd, bfqq,
-+		"may_budget_timeout: wait_request %d left %d timeout %d",
-+		bfq_bfqq_wait_request(bfqq),
-+			bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3,
-+		bfq_bfqq_budget_timeout(bfqq));
-+
-+	return (!bfq_bfqq_wait_request(bfqq) ||
-+		bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3)
-+		&&
-+		bfq_bfqq_budget_timeout(bfqq);
-+}
-+
-+/*
-+ * For a queue that becomes empty, device idling is allowed only if
-+ * this function returns true for that queue. As a consequence, since
-+ * device idling plays a critical role for both throughput boosting
-+ * and service guarantees, the return value of this function plays a
-+ * critical role as well.
-+ *
-+ * In a nutshell, this function returns true only if idling is
-+ * beneficial for throughput or, even if detrimental for throughput,
-+ * idling is however necessary to preserve service guarantees (low
-+ * latency, desired throughput distribution, ...). In particular, on
-+ * NCQ-capable devices, this function tries to return false, so as to
-+ * help keep the drives' internal queues full, whenever this helps the
-+ * device boost the throughput without causing any service-guarantee
-+ * issue.
-+ *
-+ * In more detail, the return value of this function is obtained by,
-+ * first, computing a number of boolean variables that take into
-+ * account throughput and service-guarantee issues, and, then,
-+ * combining these variables in a logical expression. Most of the
-+ * issues taken into account are not trivial. We discuss these issues
-+ * while introducing the variables.
-+ */
-+static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	bool idling_boosts_thr, idling_boosts_thr_without_issues,
-+		all_queues_seeky, on_hdd_and_not_all_queues_seeky,
-+		idling_needed_for_service_guarantees,
-+		asymmetric_scenario;
-+
-+	/*
-+	 * The next variable takes into account the cases where idling
-+	 * boosts the throughput.
-+	 *
-+	 * The value of the variable is computed considering, first, that
-+	 * idling is virtually always beneficial for the throughput if:
-+	 * (a) the device is not NCQ-capable, or
-+	 * (b) regardless of the presence of NCQ, the device is rotational
-+	 *     and the request pattern for bfqq is I/O-bound and sequential.
-+	 *
-+	 * Secondly, and in contrast to the above item (b), idling an
-+	 * NCQ-capable flash-based device would not boost the
-+	 * throughput even with sequential I/O; rather it would lower
-+	 * the throughput in proportion to how fast the device
-+	 * is. Accordingly, the next variable is true if any of the
-+	 * above conditions (a) and (b) is true, and, in particular,
-+	 * happens to be false if bfqd is an NCQ-capable flash-based
-+	 * device.
-+	 */
-+	idling_boosts_thr = !bfqd->hw_tag ||
-+		(!blk_queue_nonrot(bfqd->queue) && bfq_bfqq_IO_bound(bfqq) &&
-+		 bfq_bfqq_idle_window(bfqq)) ;
-+
-+	/*
-+	 * The value of the next variable,
-+	 * idling_boosts_thr_without_issues, is equal to that of
-+	 * idling_boosts_thr, unless a special case holds. In this
-+	 * special case, described below, idling may cause problems to
-+	 * weight-raised queues.
-+	 *
-+	 * When the request pool is saturated (e.g., in the presence
-+	 * of write hogs), if the processes associated with
-+	 * non-weight-raised queues ask for requests at a lower rate,
-+	 * then processes associated with weight-raised queues have a
-+	 * higher probability to get a request from the pool
-+	 * immediately (or at least soon) when they need one. Thus
-+	 * they have a higher probability to actually get a fraction
-+	 * of the device throughput proportional to their high
-+	 * weight. This is especially true with NCQ-capable drives,
-+	 * which enqueue several requests in advance, and further
-+	 * reorder internally-queued requests.
-+	 *
-+	 * For this reason, we force to false the value of
-+	 * idling_boosts_thr_without_issues if there are weight-raised
-+	 * busy queues. In this case, and if bfqq is not weight-raised,
-+	 * this guarantees that the device is not idled for bfqq (if,
-+	 * instead, bfqq is weight-raised, then idling will be
-+	 * guaranteed by another variable, see below). Combined with
-+	 * the timestamping rules of BFQ (see [1] for details), this
-+	 * behavior causes bfqq, and hence any sync non-weight-raised
-+	 * queue, to get a lower number of requests served, and thus
-+	 * to ask for a lower number of requests from the request
-+	 * pool, before the busy weight-raised queues get served
-+	 * again. This often mitigates starvation problems in the
-+	 * presence of heavy write workloads and NCQ, thereby
-+	 * guaranteeing a higher application and system responsiveness
-+	 * in these hostile scenarios.
-+	 */
-+	idling_boosts_thr_without_issues = idling_boosts_thr &&
-+		bfqd->wr_busy_queues == 0;
-+
-+	/*
-+	 * There are then two cases where idling must be performed not
-+	 * for throughput concerns, but to preserve service
-+	 * guarantees. In the description of these cases, we say, for
-+	 * short, that a queue is sequential/random if the process
-+	 * associated to the queue issues sequential/random requests
-+	 * (in the second case the queue may be tagged as seeky or
-+	 * even constantly_seeky).
-+	 *
-+	 * To introduce the first case, we note that, since
-+	 * bfq_bfqq_idle_window(bfqq) is false if the device is
-+	 * NCQ-capable and bfqq is random (see
-+	 * bfq_update_idle_window()), then, from the above two
-+	 * assignments it follows that
-+	 * idling_boosts_thr_without_issues is false if the device is
-+	 * NCQ-capable and bfqq is random. Therefore, for this case,
-+	 * device idling would never be allowed if we used just
-+	 * idling_boosts_thr_without_issues to decide whether to allow
-+	 * it. And, beneficially, this would imply that throughput
-+	 * would always be boosted also with random I/O on NCQ-capable
-+	 * HDDs.
-+	 *
-+	 * But we must be careful on this point, to avoid an unfair
-+	 * treatment for bfqq. In fact, because of the same above
-+	 * assignments, idling_boosts_thr_without_issues is, on the
-+	 * other hand, true if 1) the device is an HDD and bfqq is
-+	 * sequential, and 2) there are no busy weight-raised
-+	 * queues. As a consequence, if we used just
-+	 * idling_boosts_thr_without_issues to decide whether to idle
-+	 * the device, then with an HDD we might easily bump into a
-+	 * scenario where queues that are sequential and I/O-bound
-+	 * would enjoy idling, whereas random queues would not. The
-+	 * latter might then get a low share of the device throughput,
-+	 * simply because the former would get many requests served
-+	 * after being set as in service, while the latter would not.
-+	 *
-+	 * To address this issue, we start by setting to true a
-+	 * sentinel variable, on_hdd_and_not_all_queues_seeky, if the
-+	 * device is rotational and not all queues with pending or
-+	 * in-flight requests are constantly seeky (i.e., there are
-+	 * active sequential queues, and bfqq might then be mistreated
-+	 * if it does not enjoy idling because it is random).
-+	 */
-+	all_queues_seeky = bfq_bfqq_constantly_seeky(bfqq) &&
-+			   bfqd->busy_in_flight_queues ==
-+			   bfqd->const_seeky_busy_in_flight_queues;
-+
-+	on_hdd_and_not_all_queues_seeky =
-+		!blk_queue_nonrot(bfqd->queue) && !all_queues_seeky;
-+
-+	/*
-+	 * To introduce the second case where idling needs to be
-+	 * performed to preserve service guarantees, we can note that
-+	 * allowing the drive to enqueue more than one request at a
-+	 * time, and hence delegating de facto final scheduling
-+	 * decisions to the drive's internal scheduler, causes loss of
-+	 * control on the actual request service order. In particular,
-+	 * the critical situation is when requests from different
-+	 * processes happens to be present, at the same time, in the
-+	 * internal queue(s) of the drive. In such a situation, the
-+	 * drive, by deciding the service order of the
-+	 * internally-queued requests, does determine also the actual
-+	 * throughput distribution among these processes. But the
-+	 * drive typically has no notion or concern about per-process
-+	 * throughput distribution, and makes its decisions only on a
-+	 * per-request basis. Therefore, the service distribution
-+	 * enforced by the drive's internal scheduler is likely to
-+	 * coincide with the desired device-throughput distribution
-+	 * only in a completely symmetric scenario where:
-+	 * (i)  each of these processes must get the same throughput as
-+	 *      the others;
-+	 * (ii) all these processes have the same I/O pattern
-+	        (either sequential or random).
-+	 * In fact, in such a scenario, the drive will tend to treat
-+	 * the requests of each of these processes in about the same
-+	 * way as the requests of the others, and thus to provide
-+	 * each of these processes with about the same throughput
-+	 * (which is exactly the desired throughput distribution). In
-+	 * contrast, in any asymmetric scenario, device idling is
-+	 * certainly needed to guarantee that bfqq receives its
-+	 * assigned fraction of the device throughput (see [1] for
-+	 * details).
-+	 *
-+	 * We address this issue by controlling, actually, only the
-+	 * symmetry sub-condition (i), i.e., provided that
-+	 * sub-condition (i) holds, idling is not performed,
-+	 * regardless of whether sub-condition (ii) holds. In other
-+	 * words, only if sub-condition (i) holds, then idling is
-+	 * allowed, and the device tends to be prevented from queueing
-+	 * many requests, possibly of several processes. The reason
-+	 * for not controlling also sub-condition (ii) is that, first,
-+	 * in the case of an HDD, the asymmetry in terms of types of
-+	 * I/O patterns is already taken in to account in the above
-+	 * sentinel variable
-+	 * on_hdd_and_not_all_queues_seeky. Secondly, in the case of a
-+	 * flash-based device, we prefer however to privilege
-+	 * throughput (and idling lowers throughput for this type of
-+	 * devices), for the following reasons:
-+	 * 1) differently from HDDs, the service time of random
-+	 *    requests is not orders of magnitudes lower than the service
-+	 *    time of sequential requests; thus, even if processes doing
-+	 *    sequential I/O get a preferential treatment with respect to
-+	 *    others doing random I/O, the consequences are not as
-+	 *    dramatic as with HDDs;
-+	 * 2) if a process doing random I/O does need strong
-+	 *    throughput guarantees, it is hopefully already being
-+	 *    weight-raised, or the user is likely to have assigned it a
-+	 *    higher weight than the other processes (and thus
-+	 *    sub-condition (i) is likely to be false, which triggers
-+	 *    idling).
-+	 *
-+	 * According to the above considerations, the next variable is
-+	 * true (only) if sub-condition (i) holds. To compute the
-+	 * value of this variable, we not only use the return value of
-+	 * the function bfq_symmetric_scenario(), but also check
-+	 * whether bfqq is being weight-raised, because
-+	 * bfq_symmetric_scenario() does not take into account also
-+	 * weight-raised queues (see comments to
-+	 * bfq_weights_tree_add()).
-+	 *
-+	 * As a side note, it is worth considering that the above
-+	 * device-idling countermeasures may however fail in the
-+	 * following unlucky scenario: if idling is (correctly)
-+	 * disabled in a time period during which all symmetry
-+	 * sub-conditions hold, and hence the device is allowed to
-+	 * enqueue many requests, but at some later point in time some
-+	 * sub-condition stops to hold, then it may become impossible
-+	 * to let requests be served in the desired order until all
-+	 * the requests already queued in the device have been served.
-+	 */
-+	asymmetric_scenario = bfqq->wr_coeff > 1 ||
-+		!bfq_symmetric_scenario(bfqd);
-+
-+	/*
-+	 * Finally, there is a case where maximizing throughput is the
-+	 * best choice even if it may cause unfairness toward
-+	 * bfqq. Such a case is when bfqq became active in a burst of
-+	 * queue activations. Queues that became active during a large
-+	 * burst benefit only from throughput, as discussed in the
-+	 * comments to bfq_handle_burst. Thus, if bfqq became active
-+	 * in a burst and not idling the device maximizes throughput,
-+	 * then the device must no be idled, because not idling the
-+	 * device provides bfqq and all other queues in the burst with
-+	 * maximum benefit. Combining this and the two cases above, we
-+	 * can now establish when idling is actually needed to
-+	 * preserve service guarantees.
-+	 */
-+	idling_needed_for_service_guarantees =
-+		(on_hdd_and_not_all_queues_seeky || asymmetric_scenario) &&
-+		!bfq_bfqq_in_large_burst(bfqq);
-+
-+	/*
-+	 * We have now all the components we need to compute the return
-+	 * value of the function, which is true only if both the following
-+	 * conditions hold:
-+	 * 1) bfqq is sync, because idling make sense only for sync queues;
-+	 * 2) idling either boosts the throughput (without issues), or
-+	 *    is necessary to preserve service guarantees.
-+	 */
-+	return bfq_bfqq_sync(bfqq) &&
-+		(idling_boosts_thr_without_issues ||
-+		 idling_needed_for_service_guarantees);
-+}
-+
-+/*
-+ * If the in-service queue is empty but the function bfq_bfqq_may_idle
-+ * returns true, then:
-+ * 1) the queue must remain in service and cannot be expired, and
-+ * 2) the device must be idled to wait for the possible arrival of a new
-+ *    request for the queue.
-+ * See the comments to the function bfq_bfqq_may_idle for the reasons
-+ * why performing device idling is the best choice to boost the throughput
-+ * and preserve service guarantees when bfq_bfqq_may_idle itself
-+ * returns true.
-+ */
-+static bool bfq_bfqq_must_idle(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+
-+	return RB_EMPTY_ROOT(&bfqq->sort_list) && bfqd->bfq_slice_idle != 0 &&
-+	       bfq_bfqq_may_idle(bfqq);
-+}
-+
-+/*
-+ * Select a queue for service.  If we have a current queue in service,
-+ * check whether to continue servicing it, or retrieve and set a new one.
-+ */
-+static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq;
-+	struct request *next_rq;
-+	enum bfqq_expiration reason = BFQ_BFQQ_BUDGET_TIMEOUT;
-+
-+	bfqq = bfqd->in_service_queue;
-+	if (!bfqq)
-+		goto new_queue;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue");
-+
-+	if (bfq_may_expire_for_budg_timeout(bfqq) &&
-+	    !timer_pending(&bfqd->idle_slice_timer) &&
-+	    !bfq_bfqq_must_idle(bfqq))
-+		goto expire;
-+
-+	next_rq = bfqq->next_rq;
-+	/*
-+	 * If bfqq has requests queued and it has enough budget left to
-+	 * serve them, keep the queue, otherwise expire it.
-+	 */
-+	if (next_rq) {
-+		if (bfq_serv_to_charge(next_rq, bfqq) >
-+			bfq_bfqq_budget_left(bfqq)) {
-+			reason = BFQ_BFQQ_BUDGET_EXHAUSTED;
-+			goto expire;
-+		} else {
-+			/*
-+			 * The idle timer may be pending because we may
-+			 * not disable disk idling even when a new request
-+			 * arrives.
-+			 */
-+			if (timer_pending(&bfqd->idle_slice_timer)) {
-+				/*
-+				 * If we get here: 1) at least a new request
-+				 * has arrived but we have not disabled the
-+				 * timer because the request was too small,
-+				 * 2) then the block layer has unplugged
-+				 * the device, causing the dispatch to be
-+				 * invoked.
-+				 *
-+				 * Since the device is unplugged, now the
-+				 * requests are probably large enough to
-+				 * provide a reasonable throughput.
-+				 * So we disable idling.
-+				 */
-+				bfq_clear_bfqq_wait_request(bfqq);
-+				del_timer(&bfqd->idle_slice_timer);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+				bfqg_stats_update_idle_time(bfqq_group(bfqq));
-+#endif
-+			}
-+			goto keep_queue;
-+		}
-+	}
-+
-+	/*
-+	 * No requests pending. However, if the in-service queue is idling
-+	 * for a new request, or has requests waiting for a completion and
-+	 * may idle after their completion, then keep it anyway.
-+	 */
-+	if (timer_pending(&bfqd->idle_slice_timer) ||
-+	    (bfqq->dispatched != 0 && bfq_bfqq_may_idle(bfqq))) {
-+		bfqq = NULL;
-+		goto keep_queue;
-+	}
-+
-+	reason = BFQ_BFQQ_NO_MORE_REQUESTS;
-+expire:
-+	bfq_bfqq_expire(bfqd, bfqq, false, reason);
-+new_queue:
-+	bfqq = bfq_set_in_service_queue(bfqd);
-+	bfq_log(bfqd, "select_queue: new queue %d returned",
-+		bfqq ? bfqq->pid : 0);
-+keep_queue:
-+	return bfqq;
-+}
-+
-+static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	if (bfqq->wr_coeff > 1) { /* queue is being weight-raised */
-+		bfq_log_bfqq(bfqd, bfqq,
-+			"raising period dur %u/%u msec, old coeff %u, w %d(%d)",
-+			jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish),
-+			jiffies_to_msecs(bfqq->wr_cur_max_time),
-+			bfqq->wr_coeff,
-+			bfqq->entity.weight, bfqq->entity.orig_weight);
-+
-+		BUG_ON(bfqq != bfqd->in_service_queue && entity->weight !=
-+		       entity->orig_weight * bfqq->wr_coeff);
-+		if (entity->prio_changed)
-+			bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change");
-+
-+		/*
-+		 * If the queue was activated in a burst, or
-+		 * too much time has elapsed from the beginning
-+		 * of this weight-raising period, then end weight
-+		 * raising.
-+		 */
-+		if (bfq_bfqq_in_large_burst(bfqq) ||
-+		    time_is_before_jiffies(bfqq->last_wr_start_finish +
-+					   bfqq->wr_cur_max_time)) {
-+			bfqq->last_wr_start_finish = jiffies;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "wrais ending at %lu, rais_max_time %u",
-+				     bfqq->last_wr_start_finish,
-+				     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+			bfq_bfqq_end_wr(bfqq);
-+		}
-+	}
-+	/* Update weight both if it must be raised and if it must be lowered */
-+	if ((entity->weight > entity->orig_weight) != (bfqq->wr_coeff > 1))
-+		__bfq_entity_update_weight_prio(
-+			bfq_entity_service_tree(entity),
-+			entity);
-+}
-+
-+/*
-+ * Dispatch one request from bfqq, moving it to the request queue
-+ * dispatch list.
-+ */
-+static int bfq_dispatch_request(struct bfq_data *bfqd,
-+				struct bfq_queue *bfqq)
-+{
-+	int dispatched = 0;
-+	struct request *rq;
-+	unsigned long service_to_charge;
-+
-+	BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	/* Follow expired path, else get first next available. */
-+	rq = bfq_check_fifo(bfqq);
-+	if (!rq)
-+		rq = bfqq->next_rq;
-+	service_to_charge = bfq_serv_to_charge(rq, bfqq);
-+
-+	if (service_to_charge > bfq_bfqq_budget_left(bfqq)) {
-+		/*
-+		 * This may happen if the next rq is chosen in fifo order
-+		 * instead of sector order. The budget is properly
-+		 * dimensioned to be always sufficient to serve the next
-+		 * request only if it is chosen in sector order. The reason
-+		 * is that it would be quite inefficient and little useful
-+		 * to always make sure that the budget is large enough to
-+		 * serve even the possible next rq in fifo order.
-+		 * In fact, requests are seldom served in fifo order.
-+		 *
-+		 * Expire the queue for budget exhaustion, and make sure
-+		 * that the next act_budget is enough to serve the next
-+		 * request, even if it comes from the fifo expired path.
-+		 */
-+		bfqq->next_rq = rq;
-+		/*
-+		 * Since this dispatch is failed, make sure that
-+		 * a new one will be performed
-+		 */
-+		if (!bfqd->rq_in_driver)
-+			bfq_schedule_dispatch(bfqd);
-+		goto expire;
-+	}
-+
-+	/* Finally, insert request into driver dispatch list. */
-+	bfq_bfqq_served(bfqq, service_to_charge);
-+	bfq_dispatch_insert(bfqd->queue, rq);
-+
-+	bfq_update_wr_data(bfqd, bfqq);
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+			"dispatched %u sec req (%llu), budg left %d",
-+			blk_rq_sectors(rq),
-+			(long long unsigned)blk_rq_pos(rq),
-+			bfq_bfqq_budget_left(bfqq));
-+
-+	dispatched++;
-+
-+	if (!bfqd->in_service_bic) {
-+		atomic_long_inc(&RQ_BIC(rq)->icq.ioc->refcount);
-+		bfqd->in_service_bic = RQ_BIC(rq);
-+	}
-+
-+	if (bfqd->busy_queues > 1 && ((!bfq_bfqq_sync(bfqq) &&
-+	    dispatched >= bfqd->bfq_max_budget_async_rq) ||
-+	    bfq_class_idle(bfqq)))
-+		goto expire;
-+
-+	return dispatched;
-+
-+expire:
-+	bfq_bfqq_expire(bfqd, bfqq, false, BFQ_BFQQ_BUDGET_EXHAUSTED);
-+	return dispatched;
-+}
-+
-+static int __bfq_forced_dispatch_bfqq(struct bfq_queue *bfqq)
-+{
-+	int dispatched = 0;
-+
-+	while (bfqq->next_rq) {
-+		bfq_dispatch_insert(bfqq->bfqd->queue, bfqq->next_rq);
-+		dispatched++;
-+	}
-+
-+	BUG_ON(!list_empty(&bfqq->fifo));
-+	return dispatched;
-+}
-+
-+/*
-+ * Drain our current requests.
-+ * Used for barriers and when switching io schedulers on-the-fly.
-+ */
-+static int bfq_forced_dispatch(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq, *n;
-+	struct bfq_service_tree *st;
-+	int dispatched = 0;
-+
-+	bfqq = bfqd->in_service_queue;
-+	if (bfqq)
-+		__bfq_bfqq_expire(bfqd, bfqq);
-+
-+	/*
-+	 * Loop through classes, and be careful to leave the scheduler
-+	 * in a consistent state, as feedback mechanisms and vtime
-+	 * updates cannot be disabled during the process.
-+	 */
-+	list_for_each_entry_safe(bfqq, n, &bfqd->active_list, bfqq_list) {
-+		st = bfq_entity_service_tree(&bfqq->entity);
-+
-+		dispatched += __bfq_forced_dispatch_bfqq(bfqq);
-+		bfqq->max_budget = bfq_max_budget(bfqd);
-+
-+		bfq_forget_idle(st);
-+	}
-+
-+	BUG_ON(bfqd->busy_queues != 0);
-+
-+	return dispatched;
-+}
-+
-+static int bfq_dispatch_requests(struct request_queue *q, int force)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq;
-+	int max_dispatch;
-+
-+	bfq_log(bfqd, "dispatch requests: %d busy queues", bfqd->busy_queues);
-+	if (bfqd->busy_queues == 0)
-+		return 0;
-+
-+	if (unlikely(force))
-+		return bfq_forced_dispatch(bfqd);
-+
-+	bfqq = bfq_select_queue(bfqd);
-+	if (!bfqq)
-+		return 0;
-+
-+	if (bfq_class_idle(bfqq))
-+		max_dispatch = 1;
-+
-+	if (!bfq_bfqq_sync(bfqq))
-+		max_dispatch = bfqd->bfq_max_budget_async_rq;
-+
-+	if (!bfq_bfqq_sync(bfqq) && bfqq->dispatched >= max_dispatch) {
-+		if (bfqd->busy_queues > 1)
-+			return 0;
-+		if (bfqq->dispatched >= 4 * max_dispatch)
-+			return 0;
-+	}
-+
-+	if (bfqd->sync_flight != 0 && !bfq_bfqq_sync(bfqq))
-+		return 0;
-+
-+	bfq_clear_bfqq_wait_request(bfqq);
-+	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+
-+	if (!bfq_dispatch_request(bfqd, bfqq))
-+		return 0;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "dispatched %s request",
-+			bfq_bfqq_sync(bfqq) ? "sync" : "async");
-+
-+	return 1;
-+}
-+
-+/*
-+ * Task holds one reference to the queue, dropped when task exits.  Each rq
-+ * in-flight on this queue also holds a reference, dropped when rq is freed.
-+ *
-+ * Queue lock must be held here.
-+ */
-+static void bfq_put_queue(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	struct bfq_group *bfqg = bfqq_group(bfqq);
-+#endif
-+
-+	BUG_ON(atomic_read(&bfqq->ref) <= 0);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+	if (!atomic_dec_and_test(&bfqq->ref))
-+		return;
-+
-+	BUG_ON(rb_first(&bfqq->sort_list));
-+	BUG_ON(bfqq->allocated[READ] + bfqq->allocated[WRITE] != 0);
-+	BUG_ON(bfqq->entity.tree);
-+	BUG_ON(bfq_bfqq_busy(bfqq));
-+	BUG_ON(bfqd->in_service_queue == bfqq);
-+
-+	if (bfq_bfqq_sync(bfqq))
-+		/*
-+		 * The fact that this queue is being destroyed does not
-+		 * invalidate the fact that this queue may have been
-+		 * activated during the current burst. As a consequence,
-+		 * although the queue does not exist anymore, and hence
-+		 * needs to be removed from the burst list if there,
-+		 * the burst size has not to be decremented.
-+		 */
-+		hlist_del_init(&bfqq->burst_list_node);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p freed", bfqq);
-+
-+	kmem_cache_free(bfq_pool, bfqq);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_put(bfqg);
-+#endif
-+}
-+
-+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	if (bfqq == bfqd->in_service_queue) {
-+		__bfq_bfqq_expire(bfqd, bfqq);
-+		bfq_schedule_dispatch(bfqd);
-+	}
-+
-+	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+
-+	bfq_put_queue(bfqq);
-+}
-+
-+static void bfq_init_icq(struct io_cq *icq)
-+{
-+	struct bfq_io_cq *bic = icq_to_bic(icq);
-+
-+	bic->ttime.last_end_request = jiffies;
-+}
-+
-+static void bfq_exit_icq(struct io_cq *icq)
-+{
-+	struct bfq_io_cq *bic = icq_to_bic(icq);
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+
-+	if (bic->bfqq[BLK_RW_ASYNC]) {
-+		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_ASYNC]);
-+		bic->bfqq[BLK_RW_ASYNC] = NULL;
-+	}
-+
-+	if (bic->bfqq[BLK_RW_SYNC]) {
-+		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]);
-+		bic->bfqq[BLK_RW_SYNC] = NULL;
-+	}
-+}
-+
-+/*
-+ * Update the entity prio values; note that the new values will not
-+ * be used until the next (re)activation.
-+ */
-+static void bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
-+{
-+	struct task_struct *tsk = current;
-+	int ioprio_class;
-+
-+	ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);
-+	switch (ioprio_class) {
-+	default:
-+		dev_err(bfqq->bfqd->queue->backing_dev_info.dev,
-+			"bfq: bad prio class %d\n", ioprio_class);
-+	case IOPRIO_CLASS_NONE:
-+		/*
-+		 * No prio set, inherit CPU scheduling settings.
-+		 */
-+		bfqq->new_ioprio = task_nice_ioprio(tsk);
-+		bfqq->new_ioprio_class = task_nice_ioclass(tsk);
-+		break;
-+	case IOPRIO_CLASS_RT:
-+		bfqq->new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+		bfqq->new_ioprio_class = IOPRIO_CLASS_RT;
-+		break;
-+	case IOPRIO_CLASS_BE:
-+		bfqq->new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+		bfqq->new_ioprio_class = IOPRIO_CLASS_BE;
-+		break;
-+	case IOPRIO_CLASS_IDLE:
-+		bfqq->new_ioprio_class = IOPRIO_CLASS_IDLE;
-+		bfqq->new_ioprio = 7;
-+		bfq_clear_bfqq_idle_window(bfqq);
-+		break;
-+	}
-+
-+	if (bfqq->new_ioprio < 0 || bfqq->new_ioprio >= IOPRIO_BE_NR) {
-+		printk(KERN_CRIT "bfq_set_next_ioprio_data: new_ioprio %d\n",
-+				 bfqq->new_ioprio);
-+		BUG();
-+	}
-+
-+	bfqq->entity.new_weight = bfq_ioprio_to_weight(bfqq->new_ioprio);
-+	bfqq->entity.prio_changed = 1;
-+}
-+
-+static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio)
-+{
-+	struct bfq_data *bfqd;
-+	struct bfq_queue *bfqq, *new_bfqq;
-+	unsigned long uninitialized_var(flags);
-+	int ioprio = bic->icq.ioc->ioprio;
-+
-+	bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data),
-+				   &flags);
-+	/*
-+	 * This condition may trigger on a newly created bic, be sure to
-+	 * drop the lock before returning.
-+	 */
-+	if (unlikely(!bfqd) || likely(bic->ioprio == ioprio))
-+		goto out;
-+
-+	bic->ioprio = ioprio;
-+
-+	bfqq = bic->bfqq[BLK_RW_ASYNC];
-+	if (bfqq) {
-+		new_bfqq = bfq_get_queue(bfqd, bio, BLK_RW_ASYNC, bic,
-+					 GFP_ATOMIC);
-+		if (new_bfqq) {
-+			bic->bfqq[BLK_RW_ASYNC] = new_bfqq;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "check_ioprio_change: bfqq %p %d",
-+				     bfqq, atomic_read(&bfqq->ref));
-+			bfq_put_queue(bfqq);
-+		}
-+	}
-+
-+	bfqq = bic->bfqq[BLK_RW_SYNC];
-+	if (bfqq)
-+		bfq_set_next_ioprio_data(bfqq, bic);
-+
-+out:
-+	bfq_put_bfqd_unlock(bfqd, &flags);
-+}
-+
-+static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			  struct bfq_io_cq *bic, pid_t pid, int is_sync)
-+{
-+	RB_CLEAR_NODE(&bfqq->entity.rb_node);
-+	INIT_LIST_HEAD(&bfqq->fifo);
-+	INIT_HLIST_NODE(&bfqq->burst_list_node);
-+
-+	atomic_set(&bfqq->ref, 0);
-+	bfqq->bfqd = bfqd;
-+
-+	if (bic)
-+		bfq_set_next_ioprio_data(bfqq, bic);
-+
-+	if (is_sync) {
-+		if (!bfq_class_idle(bfqq))
-+			bfq_mark_bfqq_idle_window(bfqq);
-+		bfq_mark_bfqq_sync(bfqq);
-+	} else
-+		bfq_clear_bfqq_sync(bfqq);
-+	bfq_mark_bfqq_IO_bound(bfqq);
-+
-+	/* Tentative initial value to trade off between thr and lat */
-+	bfqq->max_budget = (2 * bfq_max_budget(bfqd)) / 3;
-+	bfqq->pid = pid;
-+
-+	bfqq->wr_coeff = 1;
-+	bfqq->last_wr_start_finish = 0;
-+	/*
-+	 * Set to the value for which bfqq will not be deemed as
-+	 * soft rt when it becomes backlogged.
-+	 */
-+	bfqq->soft_rt_next_start = bfq_infinity_from_now(jiffies);
-+}
-+
-+static struct bfq_queue *bfq_find_alloc_queue(struct bfq_data *bfqd,
-+					      struct bio *bio, int is_sync,
-+					      struct bfq_io_cq *bic,
-+					      gfp_t gfp_mask)
-+{
-+	struct bfq_group *bfqg;
-+	struct bfq_queue *bfqq, *new_bfqq = NULL;
-+	struct blkcg *blkcg;
-+
-+retry:
-+	rcu_read_lock();
-+
-+	blkcg = bio_blkcg(bio);
-+	bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+	/* bic always exists here */
-+	bfqq = bic_to_bfqq(bic, is_sync);
-+
-+	/*
-+	 * Always try a new alloc if we fall back to the OOM bfqq
-+	 * originally, since it should just be a temporary situation.
-+	 */
-+	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
-+		bfqq = NULL;
-+		if (new_bfqq) {
-+			bfqq = new_bfqq;
-+			new_bfqq = NULL;
-+		} else if (gfpflags_allow_blocking(gfp_mask)) {
-+			rcu_read_unlock();
-+			spin_unlock_irq(bfqd->queue->queue_lock);
-+			new_bfqq = kmem_cache_alloc_node(bfq_pool,
-+					gfp_mask | __GFP_ZERO,
-+					bfqd->queue->node);
-+			spin_lock_irq(bfqd->queue->queue_lock);
-+			if (new_bfqq)
-+				goto retry;
-+		} else {
-+			bfqq = kmem_cache_alloc_node(bfq_pool,
-+					gfp_mask | __GFP_ZERO,
-+					bfqd->queue->node);
-+		}
-+
-+		if (bfqq) {
-+			bfq_init_bfqq(bfqd, bfqq, bic, current->pid,
-+                                      is_sync);
-+			bfq_init_entity(&bfqq->entity, bfqg);
-+			bfq_log_bfqq(bfqd, bfqq, "allocated");
-+		} else {
-+			bfqq = &bfqd->oom_bfqq;
-+			bfq_log_bfqq(bfqd, bfqq, "using oom bfqq");
-+		}
-+	}
-+
-+	if (new_bfqq)
-+		kmem_cache_free(bfq_pool, new_bfqq);
-+
-+	rcu_read_unlock();
-+
-+	return bfqq;
-+}
-+
-+static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd,
-+					       struct bfq_group *bfqg,
-+					       int ioprio_class, int ioprio)
-+{
-+	switch (ioprio_class) {
-+	case IOPRIO_CLASS_RT:
-+		return &bfqg->async_bfqq[0][ioprio];
-+	case IOPRIO_CLASS_NONE:
-+		ioprio = IOPRIO_NORM;
-+		/* fall through */
-+	case IOPRIO_CLASS_BE:
-+		return &bfqg->async_bfqq[1][ioprio];
-+	case IOPRIO_CLASS_IDLE:
-+		return &bfqg->async_idle_bfqq;
-+	default:
-+		BUG();
-+	}
-+}
-+
-+static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
-+				       struct bio *bio, int is_sync,
-+				       struct bfq_io_cq *bic, gfp_t gfp_mask)
-+{
-+	const int ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+	const int ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);
-+	struct bfq_queue **async_bfqq = NULL;
-+	struct bfq_queue *bfqq = NULL;
-+
-+	if (!is_sync) {
-+		struct blkcg *blkcg;
-+		struct bfq_group *bfqg;
-+
-+		rcu_read_lock();
-+		blkcg = bio_blkcg(bio);
-+		rcu_read_unlock();
-+		bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+		async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class,
-+						  ioprio);
-+		bfqq = *async_bfqq;
-+	}
-+
-+	if (!bfqq)
-+		bfqq = bfq_find_alloc_queue(bfqd, bio, is_sync, bic, gfp_mask);
-+
-+	/*
-+	 * Pin the queue now that it's allocated, scheduler exit will
-+	 * prune it.
-+	 */
-+	if (!is_sync && !(*async_bfqq)) {
-+		atomic_inc(&bfqq->ref);
-+		bfq_log_bfqq(bfqd, bfqq, "get_queue, bfqq not in async: %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		*async_bfqq = bfqq;
-+	}
-+
-+	atomic_inc(&bfqq->ref);
-+	bfq_log_bfqq(bfqd, bfqq, "get_queue, at end: %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+	return bfqq;
-+}
-+
-+static void bfq_update_io_thinktime(struct bfq_data *bfqd,
-+				    struct bfq_io_cq *bic)
-+{
-+	unsigned long elapsed = jiffies - bic->ttime.last_end_request;
-+	unsigned long ttime = min(elapsed, 2UL * bfqd->bfq_slice_idle);
-+
-+	bic->ttime.ttime_samples = (7*bic->ttime.ttime_samples + 256) / 8;
-+	bic->ttime.ttime_total = (7*bic->ttime.ttime_total + 256*ttime) / 8;
-+	bic->ttime.ttime_mean = (bic->ttime.ttime_total + 128) /
-+				bic->ttime.ttime_samples;
-+}
-+
-+static void bfq_update_io_seektime(struct bfq_data *bfqd,
-+				   struct bfq_queue *bfqq,
-+				   struct request *rq)
-+{
-+	sector_t sdist;
-+	u64 total;
-+
-+	if (bfqq->last_request_pos < blk_rq_pos(rq))
-+		sdist = blk_rq_pos(rq) - bfqq->last_request_pos;
-+	else
-+		sdist = bfqq->last_request_pos - blk_rq_pos(rq);
-+
-+	/*
-+	 * Don't allow the seek distance to get too large from the
-+	 * odd fragment, pagein, etc.
-+	 */
-+	if (bfqq->seek_samples == 0) /* first request, not really a seek */
-+		sdist = 0;
-+	else if (bfqq->seek_samples <= 60) /* second & third seek */
-+		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*1024);
-+	else
-+		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*64);
-+
-+	bfqq->seek_samples = (7*bfqq->seek_samples + 256) / 8;
-+	bfqq->seek_total = (7*bfqq->seek_total + (u64)256*sdist) / 8;
-+	total = bfqq->seek_total + (bfqq->seek_samples/2);
-+	do_div(total, bfqq->seek_samples);
-+	bfqq->seek_mean = (sector_t)total;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "dist=%llu mean=%llu", (u64)sdist,
-+			(u64)bfqq->seek_mean);
-+}
-+
-+/*
-+ * Disable idle window if the process thinks too long or seeks so much that
-+ * it doesn't matter.
-+ */
-+static void bfq_update_idle_window(struct bfq_data *bfqd,
-+				   struct bfq_queue *bfqq,
-+				   struct bfq_io_cq *bic)
-+{
-+	int enable_idle;
-+
-+	/* Don't idle for async or idle io prio class. */
-+	if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq))
-+		return;
-+
-+	enable_idle = bfq_bfqq_idle_window(bfqq);
-+
-+	if (atomic_read(&bic->icq.ioc->active_ref) == 0 ||
-+	    bfqd->bfq_slice_idle == 0 ||
-+		(bfqd->hw_tag && BFQQ_SEEKY(bfqq) &&
-+			bfqq->wr_coeff == 1))
-+		enable_idle = 0;
-+	else if (bfq_sample_valid(bic->ttime.ttime_samples)) {
-+		if (bic->ttime.ttime_mean > bfqd->bfq_slice_idle &&
-+			bfqq->wr_coeff == 1)
-+			enable_idle = 0;
-+		else
-+			enable_idle = 1;
-+	}
-+	bfq_log_bfqq(bfqd, bfqq, "update_idle_window: enable_idle %d",
-+		enable_idle);
-+
-+	if (enable_idle)
-+		bfq_mark_bfqq_idle_window(bfqq);
-+	else
-+		bfq_clear_bfqq_idle_window(bfqq);
-+}
-+
-+/*
-+ * Called when a new fs request (rq) is added to bfqq.  Check if there's
-+ * something we should do about it.
-+ */
-+static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			    struct request *rq)
-+{
-+	struct bfq_io_cq *bic = RQ_BIC(rq);
-+
-+	if (rq->cmd_flags & REQ_META)
-+		bfqq->meta_pending++;
-+
-+	bfq_update_io_thinktime(bfqd, bic);
-+	bfq_update_io_seektime(bfqd, bfqq, rq);
-+	if (!BFQQ_SEEKY(bfqq) && bfq_bfqq_constantly_seeky(bfqq)) {
-+		bfq_clear_bfqq_constantly_seeky(bfqq);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->const_seeky_busy_in_flight_queues);
-+			bfqd->const_seeky_busy_in_flight_queues--;
-+		}
-+	}
-+	if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 ||
-+	    !BFQQ_SEEKY(bfqq))
-+		bfq_update_idle_window(bfqd, bfqq, bic);
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		     "rq_enqueued: idle_window=%d (seeky %d, mean %llu)",
-+		     bfq_bfqq_idle_window(bfqq), BFQQ_SEEKY(bfqq),
-+		     (long long unsigned)bfqq->seek_mean);
-+
-+	bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq);
-+
-+	if (bfqq == bfqd->in_service_queue && bfq_bfqq_wait_request(bfqq)) {
-+		bool small_req = bfqq->queued[rq_is_sync(rq)] == 1 &&
-+				 blk_rq_sectors(rq) < 32;
-+		bool budget_timeout = bfq_bfqq_budget_timeout(bfqq);
-+
-+		/*
-+		 * There is just this request queued: if the request
-+		 * is small and the queue is not to be expired, then
-+		 * just exit.
-+		 *
-+		 * In this way, if the disk is being idled to wait for
-+		 * a new request from the in-service queue, we avoid
-+		 * unplugging the device and committing the disk to serve
-+		 * just a small request. On the contrary, we wait for
-+		 * the block layer to decide when to unplug the device:
-+		 * hopefully, new requests will be merged to this one
-+		 * quickly, then the device will be unplugged and
-+		 * larger requests will be dispatched.
-+		 */
-+		if (small_req && !budget_timeout)
-+			return;
-+
-+		/*
-+		 * A large enough request arrived, or the queue is to
-+		 * be expired: in both cases disk idling is to be
-+		 * stopped, so clear wait_request flag and reset
-+		 * timer.
-+		 */
-+		bfq_clear_bfqq_wait_request(bfqq);
-+		del_timer(&bfqd->idle_slice_timer);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		bfqg_stats_update_idle_time(bfqq_group(bfqq));
-+#endif
-+
-+		/*
-+		 * The queue is not empty, because a new request just
-+		 * arrived. Hence we can safely expire the queue, in
-+		 * case of budget timeout, without risking that the
-+		 * timestamps of the queue are not updated correctly.
-+		 * See [1] for more details.
-+		 */
-+		if (budget_timeout)
-+			bfq_bfqq_expire(bfqd, bfqq, false,
-+					BFQ_BFQQ_BUDGET_TIMEOUT);
-+
-+		/*
-+		 * Let the request rip immediately, or let a new queue be
-+		 * selected if bfqq has just been expired.
-+		 */
-+		__blk_run_queue(bfqd->queue);
-+	}
-+}
-+
-+static void bfq_insert_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	assert_spin_locked(bfqd->queue->queue_lock);
-+
-+	bfq_add_request(rq);
-+
-+	rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)];
-+	list_add_tail(&rq->queuelist, &bfqq->fifo);
-+
-+	bfq_rq_enqueued(bfqd, bfqq, rq);
-+}
-+
-+static void bfq_update_hw_tag(struct bfq_data *bfqd)
-+{
-+	bfqd->max_rq_in_driver = max(bfqd->max_rq_in_driver,
-+				     bfqd->rq_in_driver);
-+
-+	if (bfqd->hw_tag == 1)
-+		return;
-+
-+	/*
-+	 * This sample is valid if the number of outstanding requests
-+	 * is large enough to allow a queueing behavior.  Note that the
-+	 * sum is not exact, as it's not taking into account deactivated
-+	 * requests.
-+	 */
-+	if (bfqd->rq_in_driver + bfqd->queued < BFQ_HW_QUEUE_THRESHOLD)
-+		return;
-+
-+	if (bfqd->hw_tag_samples++ < BFQ_HW_QUEUE_SAMPLES)
-+		return;
-+
-+	bfqd->hw_tag = bfqd->max_rq_in_driver > BFQ_HW_QUEUE_THRESHOLD;
-+	bfqd->max_rq_in_driver = 0;
-+	bfqd->hw_tag_samples = 0;
-+}
-+
-+static void bfq_completed_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	bool sync = bfq_bfqq_sync(bfqq);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "completed one req with %u sects left (%d)",
-+		     blk_rq_sectors(rq), sync);
-+
-+	bfq_update_hw_tag(bfqd);
-+
-+	BUG_ON(!bfqd->rq_in_driver);
-+	BUG_ON(!bfqq->dispatched);
-+	bfqd->rq_in_driver--;
-+	bfqq->dispatched--;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_completion(bfqq_group(bfqq),
-+				     rq_start_time_ns(rq),
-+				     rq_io_start_time_ns(rq), rq->cmd_flags);
-+#endif
-+
-+	if (!bfqq->dispatched && !bfq_bfqq_busy(bfqq)) {
-+		bfq_weights_tree_remove(bfqd, &bfqq->entity,
-+					&bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->busy_in_flight_queues);
-+			bfqd->busy_in_flight_queues--;
-+			if (bfq_bfqq_constantly_seeky(bfqq)) {
-+				BUG_ON(!bfqd->
-+					const_seeky_busy_in_flight_queues);
-+				bfqd->const_seeky_busy_in_flight_queues--;
-+			}
-+		}
-+	}
-+
-+	if (sync) {
-+		bfqd->sync_flight--;
-+		RQ_BIC(rq)->ttime.last_end_request = jiffies;
-+	}
-+
-+	/*
-+	 * If we are waiting to discover whether the request pattern of the
-+	 * task associated with the queue is actually isochronous, and
-+	 * both requisites for this condition to hold are satisfied, then
-+	 * compute soft_rt_next_start (see the comments to the function
-+	 * bfq_bfqq_softrt_next_start()).
-+	 */
-+	if (bfq_bfqq_softrt_update(bfqq) && bfqq->dispatched == 0 &&
-+	    RB_EMPTY_ROOT(&bfqq->sort_list))
-+		bfqq->soft_rt_next_start =
-+			bfq_bfqq_softrt_next_start(bfqd, bfqq);
-+
-+	/*
-+	 * If this is the in-service queue, check if it needs to be expired,
-+	 * or if we want to idle in case it has no pending requests.
-+	 */
-+	if (bfqd->in_service_queue == bfqq) {
-+		if (bfq_bfqq_budget_new(bfqq))
-+			bfq_set_budget_timeout(bfqd);
-+
-+		if (bfq_bfqq_must_idle(bfqq)) {
-+			bfq_arm_slice_timer(bfqd);
-+			goto out;
-+		} else if (bfq_may_expire_for_budg_timeout(bfqq))
-+			bfq_bfqq_expire(bfqd, bfqq, false,
-+					BFQ_BFQQ_BUDGET_TIMEOUT);
-+		else if (RB_EMPTY_ROOT(&bfqq->sort_list) &&
-+			 (bfqq->dispatched == 0 ||
-+			  !bfq_bfqq_may_idle(bfqq)))
-+			bfq_bfqq_expire(bfqd, bfqq, false,
-+					BFQ_BFQQ_NO_MORE_REQUESTS);
-+	}
-+
-+	if (!bfqd->rq_in_driver)
-+		bfq_schedule_dispatch(bfqd);
-+
-+out:
-+	return;
-+}
-+
-+static int __bfq_may_queue(struct bfq_queue *bfqq)
-+{
-+	if (bfq_bfqq_wait_request(bfqq) && bfq_bfqq_must_alloc(bfqq)) {
-+		bfq_clear_bfqq_must_alloc(bfqq);
-+		return ELV_MQUEUE_MUST;
-+	}
-+
-+	return ELV_MQUEUE_MAY;
-+}
-+
-+static int bfq_may_queue(struct request_queue *q, int rw)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct task_struct *tsk = current;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq;
-+
-+	/*
-+	 * Don't force setup of a queue from here, as a call to may_queue
-+	 * does not necessarily imply that a request actually will be
-+	 * queued. So just lookup a possibly existing queue, or return
-+	 * 'may queue' if that fails.
-+	 */
-+	bic = bfq_bic_lookup(bfqd, tsk->io_context);
-+	if (!bic)
-+		return ELV_MQUEUE_MAY;
-+
-+	bfqq = bic_to_bfqq(bic, rw_is_sync(rw));
-+	if (bfqq)
-+		return __bfq_may_queue(bfqq);
-+
-+	return ELV_MQUEUE_MAY;
-+}
-+
-+/*
-+ * Queue lock held here.
-+ */
-+static void bfq_put_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	if (bfqq) {
-+		const int rw = rq_data_dir(rq);
-+
-+		BUG_ON(!bfqq->allocated[rw]);
-+		bfqq->allocated[rw]--;
-+
-+		rq->elv.priv[0] = NULL;
-+		rq->elv.priv[1] = NULL;
-+
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "put_request %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+	}
-+}
-+
-+/*
-+ * Allocate bfq data structures associated with this request.
-+ */
-+static int bfq_set_request(struct request_queue *q, struct request *rq,
-+			   struct bio *bio, gfp_t gfp_mask)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_io_cq *bic = icq_to_bic(rq->elv.icq);
-+	const int rw = rq_data_dir(rq);
-+	const int is_sync = rq_is_sync(rq);
-+	struct bfq_queue *bfqq;
-+	unsigned long flags;
-+
-+	might_sleep_if(gfpflags_allow_blocking(gfp_mask));
-+
-+	bfq_check_ioprio_change(bic, bio);
-+
-+	spin_lock_irqsave(q->queue_lock, flags);
-+
-+	if (!bic)
-+		goto queue_fail;
-+
-+	bfq_bic_update_cgroup(bic, bio);
-+
-+	bfqq = bic_to_bfqq(bic, is_sync);
-+	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
-+		bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, gfp_mask);
-+		bic_set_bfqq(bic, bfqq, is_sync);
-+		if (is_sync) {
-+			if (bfqd->large_burst)
-+				bfq_mark_bfqq_in_large_burst(bfqq);
-+			else
-+				bfq_clear_bfqq_in_large_burst(bfqq);
-+		}
-+	}
-+
-+	bfqq->allocated[rw]++;
-+	atomic_inc(&bfqq->ref);
-+	bfq_log_bfqq(bfqd, bfqq, "set_request: bfqq %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+
-+	rq->elv.priv[0] = bic;
-+	rq->elv.priv[1] = bfqq;
-+
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
-+	return 0;
-+
-+queue_fail:
-+	bfq_schedule_dispatch(bfqd);
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
-+	return 1;
-+}
-+
-+static void bfq_kick_queue(struct work_struct *work)
-+{
-+	struct bfq_data *bfqd =
-+		container_of(work, struct bfq_data, unplug_work);
-+	struct request_queue *q = bfqd->queue;
-+
-+	spin_lock_irq(q->queue_lock);
-+	__blk_run_queue(q);
-+	spin_unlock_irq(q->queue_lock);
-+}
-+
-+/*
-+ * Handler of the expiration of the timer running if the in-service queue
-+ * is idling inside its time slice.
-+ */
-+static void bfq_idle_slice_timer(unsigned long data)
-+{
-+	struct bfq_data *bfqd = (struct bfq_data *)data;
-+	struct bfq_queue *bfqq;
-+	unsigned long flags;
-+	enum bfqq_expiration reason;
-+
-+	spin_lock_irqsave(bfqd->queue->queue_lock, flags);
-+
-+	bfqq = bfqd->in_service_queue;
-+	/*
-+	 * Theoretical race here: the in-service queue can be NULL or
-+	 * different from the queue that was idling if the timer handler
-+	 * spins on the queue_lock and a new request arrives for the
-+	 * current queue and there is a full dispatch cycle that changes
-+	 * the in-service queue.  This can hardly happen, but in the worst
-+	 * case we just expire a queue too early.
-+	 */
-+	if (bfqq) {
-+		bfq_log_bfqq(bfqd, bfqq, "slice_timer expired");
-+		if (bfq_bfqq_budget_timeout(bfqq))
-+			/*
-+			 * Also here the queue can be safely expired
-+			 * for budget timeout without wasting
-+			 * guarantees
-+			 */
-+			reason = BFQ_BFQQ_BUDGET_TIMEOUT;
-+		else if (bfqq->queued[0] == 0 && bfqq->queued[1] == 0)
-+			/*
-+			 * The queue may not be empty upon timer expiration,
-+			 * because we may not disable the timer when the
-+			 * first request of the in-service queue arrives
-+			 * during disk idling.
-+			 */
-+			reason = BFQ_BFQQ_TOO_IDLE;
-+		else
-+			goto schedule_dispatch;
-+
-+		bfq_bfqq_expire(bfqd, bfqq, true, reason);
-+	}
-+
-+schedule_dispatch:
-+	bfq_schedule_dispatch(bfqd);
-+
-+	spin_unlock_irqrestore(bfqd->queue->queue_lock, flags);
-+}
-+
-+static void bfq_shutdown_timer_wq(struct bfq_data *bfqd)
-+{
-+	del_timer_sync(&bfqd->idle_slice_timer);
-+	cancel_work_sync(&bfqd->unplug_work);
-+}
-+
-+static void __bfq_put_async_bfqq(struct bfq_data *bfqd,
-+					struct bfq_queue **bfqq_ptr)
-+{
-+	struct bfq_group *root_group = bfqd->root_group;
-+	struct bfq_queue *bfqq = *bfqq_ptr;
-+
-+	bfq_log(bfqd, "put_async_bfqq: %p", bfqq);
-+	if (bfqq) {
-+		bfq_bfqq_move(bfqd, bfqq, &bfqq->entity, root_group);
-+		bfq_log_bfqq(bfqd, bfqq, "put_async_bfqq: putting %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+		*bfqq_ptr = NULL;
-+	}
-+}
-+
-+/*
-+ * Release all the bfqg references to its async queues.  If we are
-+ * deallocating the group these queues may still contain requests, so
-+ * we reparent them to the root cgroup (i.e., the only one that will
-+ * exist for sure until all the requests on a device are gone).
-+ */
-+static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg)
-+{
-+	int i, j;
-+
-+	for (i = 0; i < 2; i++)
-+		for (j = 0; j < IOPRIO_BE_NR; j++)
-+			__bfq_put_async_bfqq(bfqd, &bfqg->async_bfqq[i][j]);
-+
-+	__bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq);
-+}
-+
-+static void bfq_exit_queue(struct elevator_queue *e)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	struct request_queue *q = bfqd->queue;
-+	struct bfq_queue *bfqq, *n;
-+
-+	bfq_shutdown_timer_wq(bfqd);
-+
-+	spin_lock_irq(q->queue_lock);
-+
-+	BUG_ON(bfqd->in_service_queue);
-+	list_for_each_entry_safe(bfqq, n, &bfqd->idle_list, bfqq_list)
-+		bfq_deactivate_bfqq(bfqd, bfqq, 0);
-+
-+	spin_unlock_irq(q->queue_lock);
-+
-+	bfq_shutdown_timer_wq(bfqd);
-+
-+	synchronize_rcu();
-+
-+	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	blkcg_deactivate_policy(q, &blkcg_policy_bfq);
-+#else
-+	kfree(bfqd->root_group);
-+#endif
-+
-+	kfree(bfqd);
-+}
-+
-+static void bfq_init_root_group(struct bfq_group *root_group,
-+				struct bfq_data *bfqd)
-+{
-+	int i;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	root_group->entity.parent = NULL;
-+	root_group->my_entity = NULL;
-+	root_group->bfqd = bfqd;
-+#endif
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
-+		root_group->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
-+}
-+
-+static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
-+{
-+	struct bfq_data *bfqd;
-+	struct elevator_queue *eq;
-+
-+	eq = elevator_alloc(q, e);
-+	if (!eq)
-+		return -ENOMEM;
-+
-+	bfqd = kzalloc_node(sizeof(*bfqd), GFP_KERNEL, q->node);
-+	if (!bfqd) {
-+		kobject_put(&eq->kobj);
-+		return -ENOMEM;
-+	}
-+	eq->elevator_data = bfqd;
-+
-+	/*
-+	 * Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues.
-+	 * Grab a permanent reference to it, so that the normal code flow
-+	 * will not attempt to free it.
-+	 */
-+	bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, NULL, 1, 0);
-+	atomic_inc(&bfqd->oom_bfqq.ref);
-+	bfqd->oom_bfqq.new_ioprio = BFQ_DEFAULT_QUEUE_IOPRIO;
-+	bfqd->oom_bfqq.new_ioprio_class = IOPRIO_CLASS_BE;
-+	bfqd->oom_bfqq.entity.new_weight =
-+		bfq_ioprio_to_weight(bfqd->oom_bfqq.new_ioprio);
-+	/*
-+	 * Trigger weight initialization, according to ioprio, at the
-+	 * oom_bfqq's first activation. The oom_bfqq's ioprio and ioprio
-+	 * class won't be changed any more.
-+	 */
-+	bfqd->oom_bfqq.entity.prio_changed = 1;
-+
-+	bfqd->queue = q;
-+
-+	spin_lock_irq(q->queue_lock);
-+	q->elevator = eq;
-+	spin_unlock_irq(q->queue_lock);
-+
-+	bfqd->root_group = bfq_create_group_hierarchy(bfqd, q->node);
-+	if (!bfqd->root_group)
-+		goto out_free;
-+	bfq_init_root_group(bfqd->root_group, bfqd);
-+	bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqd->active_numerous_groups = 0;
-+#endif
-+
-+	init_timer(&bfqd->idle_slice_timer);
-+	bfqd->idle_slice_timer.function = bfq_idle_slice_timer;
-+	bfqd->idle_slice_timer.data = (unsigned long)bfqd;
-+
-+	bfqd->queue_weights_tree = RB_ROOT;
-+	bfqd->group_weights_tree = RB_ROOT;
-+
-+	INIT_WORK(&bfqd->unplug_work, bfq_kick_queue);
-+
-+	INIT_LIST_HEAD(&bfqd->active_list);
-+	INIT_LIST_HEAD(&bfqd->idle_list);
-+	INIT_HLIST_HEAD(&bfqd->burst_list);
-+
-+	bfqd->hw_tag = -1;
-+
-+	bfqd->bfq_max_budget = bfq_default_max_budget;
-+
-+	bfqd->bfq_fifo_expire[0] = bfq_fifo_expire[0];
-+	bfqd->bfq_fifo_expire[1] = bfq_fifo_expire[1];
-+	bfqd->bfq_back_max = bfq_back_max;
-+	bfqd->bfq_back_penalty = bfq_back_penalty;
-+	bfqd->bfq_slice_idle = bfq_slice_idle;
-+	bfqd->bfq_class_idle_last_service = 0;
-+	bfqd->bfq_max_budget_async_rq = bfq_max_budget_async_rq;
-+	bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async;
-+	bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync;
-+
-+	bfqd->bfq_requests_within_timer = 120;
-+
-+	bfqd->bfq_large_burst_thresh = 11;
-+	bfqd->bfq_burst_interval = msecs_to_jiffies(500);
-+
-+	bfqd->low_latency = true;
-+
-+	bfqd->bfq_wr_coeff = 20;
-+	bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300);
-+	bfqd->bfq_wr_max_time = 0;
-+	bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000);
-+	bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500);
-+	bfqd->bfq_wr_max_softrt_rate = 7000; /*
-+					      * Approximate rate required
-+					      * to playback or record a
-+					      * high-definition compressed
-+					      * video.
-+					      */
-+	bfqd->wr_busy_queues = 0;
-+	bfqd->busy_in_flight_queues = 0;
-+	bfqd->const_seeky_busy_in_flight_queues = 0;
-+
-+	/*
-+	 * Begin by assuming, optimistically, that the device peak rate is
-+	 * equal to the highest reference rate.
-+	 */
-+	bfqd->RT_prod = R_fast[blk_queue_nonrot(bfqd->queue)] *
-+			T_fast[blk_queue_nonrot(bfqd->queue)];
-+	bfqd->peak_rate = R_fast[blk_queue_nonrot(bfqd->queue)];
-+	bfqd->device_speed = BFQ_BFQD_FAST;
-+
-+	return 0;
-+
-+out_free:
-+	kfree(bfqd);
-+	kobject_put(&eq->kobj);
-+	return -ENOMEM;
-+}
-+
-+static void bfq_slab_kill(void)
-+{
-+	if (bfq_pool)
-+		kmem_cache_destroy(bfq_pool);
-+}
-+
-+static int __init bfq_slab_setup(void)
-+{
-+	bfq_pool = KMEM_CACHE(bfq_queue, 0);
-+	if (!bfq_pool)
-+		return -ENOMEM;
-+	return 0;
-+}
-+
-+static ssize_t bfq_var_show(unsigned int var, char *page)
-+{
-+	return sprintf(page, "%d\n", var);
-+}
-+
-+static ssize_t bfq_var_store(unsigned long *var, const char *page,
-+			     size_t count)
-+{
-+	unsigned long new_val;
-+	int ret = kstrtoul(page, 10, &new_val);
-+
-+	if (ret == 0)
-+		*var = new_val;
-+
-+	return count;
-+}
-+
-+static ssize_t bfq_wr_max_time_show(struct elevator_queue *e, char *page)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	return sprintf(page, "%d\n", bfqd->bfq_wr_max_time > 0 ?
-+		       jiffies_to_msecs(bfqd->bfq_wr_max_time) :
-+		       jiffies_to_msecs(bfq_wr_duration(bfqd)));
-+}
-+
-+static ssize_t bfq_weights_show(struct elevator_queue *e, char *page)
-+{
-+	struct bfq_queue *bfqq;
-+	struct bfq_data *bfqd = e->elevator_data;
-+	ssize_t num_char = 0;
-+
-+	num_char += sprintf(page + num_char, "Tot reqs queued %d\n\n",
-+			    bfqd->queued);
-+
-+	spin_lock_irq(bfqd->queue->queue_lock);
-+
-+	num_char += sprintf(page + num_char, "Active:\n");
-+	list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) {
-+	  num_char += sprintf(page + num_char,
-+			      "pid%d: weight %hu, nr_queued %d %d, dur %d/%u\n",
-+			      bfqq->pid,
-+			      bfqq->entity.weight,
-+			      bfqq->queued[0],
-+			      bfqq->queued[1],
-+			jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish),
-+			jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	}
-+
-+	num_char += sprintf(page + num_char, "Idle:\n");
-+	list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) {
-+			num_char += sprintf(page + num_char,
-+				"pid%d: weight %hu, dur %d/%u\n",
-+				bfqq->pid,
-+				bfqq->entity.weight,
-+				jiffies_to_msecs(jiffies -
-+					bfqq->last_wr_start_finish),
-+				jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	}
-+
-+	spin_unlock_irq(bfqd->queue->queue_lock);
-+
-+	return num_char;
-+}
-+
-+#define SHOW_FUNCTION(__FUNC, __VAR, __CONV)				\
-+static ssize_t __FUNC(struct elevator_queue *e, char *page)		\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	unsigned int __data = __VAR;					\
-+	if (__CONV)							\
-+		__data = jiffies_to_msecs(__data);			\
-+	return bfq_var_show(__data, (page));				\
-+}
-+SHOW_FUNCTION(bfq_fifo_expire_sync_show, bfqd->bfq_fifo_expire[1], 1);
-+SHOW_FUNCTION(bfq_fifo_expire_async_show, bfqd->bfq_fifo_expire[0], 1);
-+SHOW_FUNCTION(bfq_back_seek_max_show, bfqd->bfq_back_max, 0);
-+SHOW_FUNCTION(bfq_back_seek_penalty_show, bfqd->bfq_back_penalty, 0);
-+SHOW_FUNCTION(bfq_slice_idle_show, bfqd->bfq_slice_idle, 1);
-+SHOW_FUNCTION(bfq_max_budget_show, bfqd->bfq_user_max_budget, 0);
-+SHOW_FUNCTION(bfq_max_budget_async_rq_show,
-+	      bfqd->bfq_max_budget_async_rq, 0);
-+SHOW_FUNCTION(bfq_timeout_sync_show, bfqd->bfq_timeout[BLK_RW_SYNC], 1);
-+SHOW_FUNCTION(bfq_timeout_async_show, bfqd->bfq_timeout[BLK_RW_ASYNC], 1);
-+SHOW_FUNCTION(bfq_low_latency_show, bfqd->low_latency, 0);
-+SHOW_FUNCTION(bfq_wr_coeff_show, bfqd->bfq_wr_coeff, 0);
-+SHOW_FUNCTION(bfq_wr_rt_max_time_show, bfqd->bfq_wr_rt_max_time, 1);
-+SHOW_FUNCTION(bfq_wr_min_idle_time_show, bfqd->bfq_wr_min_idle_time, 1);
-+SHOW_FUNCTION(bfq_wr_min_inter_arr_async_show, bfqd->bfq_wr_min_inter_arr_async,
-+	1);
-+SHOW_FUNCTION(bfq_wr_max_softrt_rate_show, bfqd->bfq_wr_max_softrt_rate, 0);
-+#undef SHOW_FUNCTION
-+
-+#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV)			\
-+static ssize_t								\
-+__FUNC(struct elevator_queue *e, const char *page, size_t count)	\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	unsigned long uninitialized_var(__data);			\
-+	int ret = bfq_var_store(&__data, (page), count);		\
-+	if (__data < (MIN))						\
-+		__data = (MIN);						\
-+	else if (__data > (MAX))					\
-+		__data = (MAX);						\
-+	if (__CONV)							\
-+		*(__PTR) = msecs_to_jiffies(__data);			\
-+	else								\
-+		*(__PTR) = __data;					\
-+	return ret;							\
-+}
-+STORE_FUNCTION(bfq_fifo_expire_sync_store, &bfqd->bfq_fifo_expire[1], 1,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_fifo_expire_async_store, &bfqd->bfq_fifo_expire[0], 1,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_back_seek_max_store, &bfqd->bfq_back_max, 0, INT_MAX, 0);
-+STORE_FUNCTION(bfq_back_seek_penalty_store, &bfqd->bfq_back_penalty, 1,
-+		INT_MAX, 0);
-+STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_max_budget_async_rq_store, &bfqd->bfq_max_budget_async_rq,
-+		1, INT_MAX, 0);
-+STORE_FUNCTION(bfq_timeout_async_store, &bfqd->bfq_timeout[BLK_RW_ASYNC], 0,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_coeff_store, &bfqd->bfq_wr_coeff, 1, INT_MAX, 0);
-+STORE_FUNCTION(bfq_wr_max_time_store, &bfqd->bfq_wr_max_time, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_rt_max_time_store, &bfqd->bfq_wr_rt_max_time, 0, INT_MAX,
-+		1);
-+STORE_FUNCTION(bfq_wr_min_idle_time_store, &bfqd->bfq_wr_min_idle_time, 0,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_min_inter_arr_async_store,
-+		&bfqd->bfq_wr_min_inter_arr_async, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_max_softrt_rate_store, &bfqd->bfq_wr_max_softrt_rate, 0,
-+		INT_MAX, 0);
-+#undef STORE_FUNCTION
-+
-+/* do nothing for the moment */
-+static ssize_t bfq_weights_store(struct elevator_queue *e,
-+				    const char *page, size_t count)
-+{
-+	return count;
-+}
-+
-+static unsigned long bfq_estimated_max_budget(struct bfq_data *bfqd)
-+{
-+	u64 timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
-+
-+	if (bfqd->peak_rate_samples >= BFQ_PEAK_RATE_SAMPLES)
-+		return bfq_calc_max_budget(bfqd->peak_rate, timeout);
-+	else
-+		return bfq_default_max_budget;
-+}
-+
-+static ssize_t bfq_max_budget_store(struct elevator_queue *e,
-+				    const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data == 0)
-+		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+	else {
-+		if (__data > INT_MAX)
-+			__data = INT_MAX;
-+		bfqd->bfq_max_budget = __data;
-+	}
-+
-+	bfqd->bfq_user_max_budget = __data;
-+
-+	return ret;
-+}
-+
-+static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
-+				      const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data < 1)
-+		__data = 1;
-+	else if (__data > INT_MAX)
-+		__data = INT_MAX;
-+
-+	bfqd->bfq_timeout[BLK_RW_SYNC] = msecs_to_jiffies(__data);
-+	if (bfqd->bfq_user_max_budget == 0)
-+		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+
-+	return ret;
-+}
-+
-+static ssize_t bfq_low_latency_store(struct elevator_queue *e,
-+				     const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data > 1)
-+		__data = 1;
-+	if (__data == 0 && bfqd->low_latency != 0)
-+		bfq_end_wr(bfqd);
-+	bfqd->low_latency = __data;
-+
-+	return ret;
-+}
-+
-+#define BFQ_ATTR(name) \
-+	__ATTR(name, S_IRUGO|S_IWUSR, bfq_##name##_show, bfq_##name##_store)
-+
-+static struct elv_fs_entry bfq_attrs[] = {
-+	BFQ_ATTR(fifo_expire_sync),
-+	BFQ_ATTR(fifo_expire_async),
-+	BFQ_ATTR(back_seek_max),
-+	BFQ_ATTR(back_seek_penalty),
-+	BFQ_ATTR(slice_idle),
-+	BFQ_ATTR(max_budget),
-+	BFQ_ATTR(max_budget_async_rq),
-+	BFQ_ATTR(timeout_sync),
-+	BFQ_ATTR(timeout_async),
-+	BFQ_ATTR(low_latency),
-+	BFQ_ATTR(wr_coeff),
-+	BFQ_ATTR(wr_max_time),
-+	BFQ_ATTR(wr_rt_max_time),
-+	BFQ_ATTR(wr_min_idle_time),
-+	BFQ_ATTR(wr_min_inter_arr_async),
-+	BFQ_ATTR(wr_max_softrt_rate),
-+	BFQ_ATTR(weights),
-+	__ATTR_NULL
-+};
-+
-+static struct elevator_type iosched_bfq = {
-+	.ops = {
-+		.elevator_merge_fn =		bfq_merge,
-+		.elevator_merged_fn =		bfq_merged_request,
-+		.elevator_merge_req_fn =	bfq_merged_requests,
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		.elevator_bio_merged_fn =	bfq_bio_merged,
-+#endif
-+		.elevator_allow_merge_fn =	bfq_allow_merge,
-+		.elevator_dispatch_fn =		bfq_dispatch_requests,
-+		.elevator_add_req_fn =		bfq_insert_request,
-+		.elevator_activate_req_fn =	bfq_activate_request,
-+		.elevator_deactivate_req_fn =	bfq_deactivate_request,
-+		.elevator_completed_req_fn =	bfq_completed_request,
-+		.elevator_former_req_fn =	elv_rb_former_request,
-+		.elevator_latter_req_fn =	elv_rb_latter_request,
-+		.elevator_init_icq_fn =		bfq_init_icq,
-+		.elevator_exit_icq_fn =		bfq_exit_icq,
-+		.elevator_set_req_fn =		bfq_set_request,
-+		.elevator_put_req_fn =		bfq_put_request,
-+		.elevator_may_queue_fn =	bfq_may_queue,
-+		.elevator_init_fn =		bfq_init_queue,
-+		.elevator_exit_fn =		bfq_exit_queue,
-+	},
-+	.icq_size =		sizeof(struct bfq_io_cq),
-+	.icq_align =		__alignof__(struct bfq_io_cq),
-+	.elevator_attrs =	bfq_attrs,
-+	.elevator_name =	"bfq",
-+	.elevator_owner =	THIS_MODULE,
-+};
-+
-+static int __init bfq_init(void)
-+{
-+	int ret;
-+
-+	/*
-+	 * Can be 0 on HZ < 1000 setups.
-+	 */
-+	if (bfq_slice_idle == 0)
-+		bfq_slice_idle = 1;
-+
-+	if (bfq_timeout_async == 0)
-+		bfq_timeout_async = 1;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	ret = blkcg_policy_register(&blkcg_policy_bfq);
-+	if (ret)
-+		return ret;
-+#endif
-+
-+	ret = -ENOMEM;
-+	if (bfq_slab_setup())
-+		goto err_pol_unreg;
-+
-+	/*
-+	 * Times to load large popular applications for the typical systems
-+	 * installed on the reference devices (see the comments before the
-+	 * definitions of the two arrays).
-+	 */
-+	T_slow[0] = msecs_to_jiffies(2600);
-+	T_slow[1] = msecs_to_jiffies(1000);
-+	T_fast[0] = msecs_to_jiffies(5500);
-+	T_fast[1] = msecs_to_jiffies(2000);
-+
-+	/*
-+	 * Thresholds that determine the switch between speed classes (see
-+	 * the comments before the definition of the array).
-+	 */
-+	device_speed_thresh[0] = (R_fast[0] + R_slow[0]) / 2;
-+	device_speed_thresh[1] = (R_fast[1] + R_slow[1]) / 2;
-+
-+	ret = elv_register(&iosched_bfq);
-+	if (ret)
-+		goto err_pol_unreg;
-+
-+	pr_info("BFQ I/O-scheduler: v7r11");
-+
-+	return 0;
-+
-+err_pol_unreg:
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	blkcg_policy_unregister(&blkcg_policy_bfq);
-+#endif
-+	return ret;
-+}
-+
-+static void __exit bfq_exit(void)
-+{
-+	elv_unregister(&iosched_bfq);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	blkcg_policy_unregister(&blkcg_policy_bfq);
-+#endif
-+	bfq_slab_kill();
-+}
-+
-+module_init(bfq_init);
-+module_exit(bfq_exit);
-+
-+MODULE_AUTHOR("Arianna Avanzini, Fabio Checconi, Paolo Valente");
-+MODULE_LICENSE("GPL");
-diff --git a/block/bfq-sched.c b/block/bfq-sched.c
-new file mode 100644
-index 0000000..a64fec1
---- /dev/null
-+++ b/block/bfq-sched.c
-@@ -0,0 +1,1200 @@
-+/*
-+ * BFQ: Hierarchical B-WF2Q+ scheduler.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+#define for_each_entity(entity)	\
-+	for (; entity ; entity = entity->parent)
-+
-+#define for_each_entity_safe(entity, parent) \
-+	for (; entity && ({ parent = entity->parent; 1; }); entity = parent)
-+
-+
-+static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
-+						 int extract,
-+						 struct bfq_data *bfqd);
-+
-+static struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
-+
-+static void bfq_update_budget(struct bfq_entity *next_in_service)
-+{
-+	struct bfq_entity *bfqg_entity;
-+	struct bfq_group *bfqg;
-+	struct bfq_sched_data *group_sd;
-+
-+	BUG_ON(!next_in_service);
-+
-+	group_sd = next_in_service->sched_data;
-+
-+	bfqg = container_of(group_sd, struct bfq_group, sched_data);
-+	/*
-+	 * bfq_group's my_entity field is not NULL only if the group
-+	 * is not the root group. We must not touch the root entity
-+	 * as it must never become an in-service entity.
-+	 */
-+	bfqg_entity = bfqg->my_entity;
-+	if (bfqg_entity)
-+		bfqg_entity->budget = next_in_service->budget;
-+}
-+
-+static int bfq_update_next_in_service(struct bfq_sched_data *sd)
-+{
-+	struct bfq_entity *next_in_service;
-+
-+	if (sd->in_service_entity)
-+		/* will update/requeue at the end of service */
-+		return 0;
-+
-+	/*
-+	 * NOTE: this can be improved in many ways, such as returning
-+	 * 1 (and thus propagating upwards the update) only when the
-+	 * budget changes, or caching the bfqq that will be scheduled
-+	 * next from this subtree.  By now we worry more about
-+	 * correctness than about performance...
-+	 */
-+	next_in_service = bfq_lookup_next_entity(sd, 0, NULL);
-+	sd->next_in_service = next_in_service;
-+
-+	if (next_in_service)
-+		bfq_update_budget(next_in_service);
-+
-+	return 1;
-+}
-+
-+static void bfq_check_next_in_service(struct bfq_sched_data *sd,
-+				      struct bfq_entity *entity)
-+{
-+	BUG_ON(sd->next_in_service != entity);
-+}
-+#else
-+#define for_each_entity(entity)	\
-+	for (; entity ; entity = NULL)
-+
-+#define for_each_entity_safe(entity, parent) \
-+	for (parent = NULL; entity ; entity = parent)
-+
-+static int bfq_update_next_in_service(struct bfq_sched_data *sd)
-+{
-+	return 0;
-+}
-+
-+static void bfq_check_next_in_service(struct bfq_sched_data *sd,
-+				      struct bfq_entity *entity)
-+{
-+}
-+
-+static void bfq_update_budget(struct bfq_entity *next_in_service)
-+{
-+}
-+#endif
-+
-+/*
-+ * Shift for timestamp calculations.  This actually limits the maximum
-+ * service allowed in one timestamp delta (small shift values increase it),
-+ * the maximum total weight that can be used for the queues in the system
-+ * (big shift values increase it), and the period of virtual time
-+ * wraparounds.
-+ */
-+#define WFQ_SERVICE_SHIFT	22
-+
-+/**
-+ * bfq_gt - compare two timestamps.
-+ * @a: first ts.
-+ * @b: second ts.
-+ *
-+ * Return @a > @b, dealing with wrapping correctly.
-+ */
-+static int bfq_gt(u64 a, u64 b)
-+{
-+	return (s64)(a - b) > 0;
-+}
-+
-+static struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = NULL;
-+
-+	BUG_ON(!entity);
-+
-+	if (!entity->my_sched_data)
-+		bfqq = container_of(entity, struct bfq_queue, entity);
-+
-+	return bfqq;
-+}
-+
-+
-+/**
-+ * bfq_delta - map service into the virtual time domain.
-+ * @service: amount of service.
-+ * @weight: scale factor (weight of an entity or weight sum).
-+ */
-+static u64 bfq_delta(unsigned long service, unsigned long weight)
-+{
-+	u64 d = (u64)service << WFQ_SERVICE_SHIFT;
-+
-+	do_div(d, weight);
-+	return d;
-+}
-+
-+/**
-+ * bfq_calc_finish - assign the finish time to an entity.
-+ * @entity: the entity to act upon.
-+ * @service: the service to be charged to the entity.
-+ */
-+static void bfq_calc_finish(struct bfq_entity *entity, unsigned long service)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	BUG_ON(entity->weight == 0);
-+
-+	entity->finish = entity->start +
-+		bfq_delta(service, entity->weight);
-+
-+	if (bfqq) {
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			"calc_finish: serv %lu, w %d",
-+			service, entity->weight);
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			"calc_finish: start %llu, finish %llu, delta %llu",
-+			entity->start, entity->finish,
-+			bfq_delta(service, entity->weight));
-+	}
-+}
-+
-+/**
-+ * bfq_entity_of - get an entity from a node.
-+ * @node: the node field of the entity.
-+ *
-+ * Convert a node pointer to the relative entity.  This is used only
-+ * to simplify the logic of some functions and not as the generic
-+ * conversion mechanism because, e.g., in the tree walking functions,
-+ * the check for a %NULL value would be redundant.
-+ */
-+static struct bfq_entity *bfq_entity_of(struct rb_node *node)
-+{
-+	struct bfq_entity *entity = NULL;
-+
-+	if (node)
-+		entity = rb_entry(node, struct bfq_entity, rb_node);
-+
-+	return entity;
-+}
-+
-+/**
-+ * bfq_extract - remove an entity from a tree.
-+ * @root: the tree root.
-+ * @entity: the entity to remove.
-+ */
-+static void bfq_extract(struct rb_root *root, struct bfq_entity *entity)
-+{
-+	BUG_ON(entity->tree != root);
-+
-+	entity->tree = NULL;
-+	rb_erase(&entity->rb_node, root);
-+}
-+
-+/**
-+ * bfq_idle_extract - extract an entity from the idle tree.
-+ * @st: the service tree of the owning @entity.
-+ * @entity: the entity being removed.
-+ */
-+static void bfq_idle_extract(struct bfq_service_tree *st,
-+			     struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *next;
-+
-+	BUG_ON(entity->tree != &st->idle);
-+
-+	if (entity == st->first_idle) {
-+		next = rb_next(&entity->rb_node);
-+		st->first_idle = bfq_entity_of(next);
-+	}
-+
-+	if (entity == st->last_idle) {
-+		next = rb_prev(&entity->rb_node);
-+		st->last_idle = bfq_entity_of(next);
-+	}
-+
-+	bfq_extract(&st->idle, entity);
-+
-+	if (bfqq)
-+		list_del(&bfqq->bfqq_list);
-+}
-+
-+/**
-+ * bfq_insert - generic tree insertion.
-+ * @root: tree root.
-+ * @entity: entity to insert.
-+ *
-+ * This is used for the idle and the active tree, since they are both
-+ * ordered by finish time.
-+ */
-+static void bfq_insert(struct rb_root *root, struct bfq_entity *entity)
-+{
-+	struct bfq_entity *entry;
-+	struct rb_node **node = &root->rb_node;
-+	struct rb_node *parent = NULL;
-+
-+	BUG_ON(entity->tree);
-+
-+	while (*node) {
-+		parent = *node;
-+		entry = rb_entry(parent, struct bfq_entity, rb_node);
-+
-+		if (bfq_gt(entry->finish, entity->finish))
-+			node = &parent->rb_left;
-+		else
-+			node = &parent->rb_right;
-+	}
-+
-+	rb_link_node(&entity->rb_node, parent, node);
-+	rb_insert_color(&entity->rb_node, root);
-+
-+	entity->tree = root;
-+}
-+
-+/**
-+ * bfq_update_min - update the min_start field of a entity.
-+ * @entity: the entity to update.
-+ * @node: one of its children.
-+ *
-+ * This function is called when @entity may store an invalid value for
-+ * min_start due to updates to the active tree.  The function  assumes
-+ * that the subtree rooted at @node (which may be its left or its right
-+ * child) has a valid min_start value.
-+ */
-+static void bfq_update_min(struct bfq_entity *entity, struct rb_node *node)
-+{
-+	struct bfq_entity *child;
-+
-+	if (node) {
-+		child = rb_entry(node, struct bfq_entity, rb_node);
-+		if (bfq_gt(entity->min_start, child->min_start))
-+			entity->min_start = child->min_start;
-+	}
-+}
-+
-+/**
-+ * bfq_update_active_node - recalculate min_start.
-+ * @node: the node to update.
-+ *
-+ * @node may have changed position or one of its children may have moved,
-+ * this function updates its min_start value.  The left and right subtrees
-+ * are assumed to hold a correct min_start value.
-+ */
-+static void bfq_update_active_node(struct rb_node *node)
-+{
-+	struct bfq_entity *entity = rb_entry(node, struct bfq_entity, rb_node);
-+
-+	entity->min_start = entity->start;
-+	bfq_update_min(entity, node->rb_right);
-+	bfq_update_min(entity, node->rb_left);
-+}
-+
-+/**
-+ * bfq_update_active_tree - update min_start for the whole active tree.
-+ * @node: the starting node.
-+ *
-+ * @node must be the deepest modified node after an update.  This function
-+ * updates its min_start using the values held by its children, assuming
-+ * that they did not change, and then updates all the nodes that may have
-+ * changed in the path to the root.  The only nodes that may have changed
-+ * are the ones in the path or their siblings.
-+ */
-+static void bfq_update_active_tree(struct rb_node *node)
-+{
-+	struct rb_node *parent;
-+
-+up:
-+	bfq_update_active_node(node);
-+
-+	parent = rb_parent(node);
-+	if (!parent)
-+		return;
-+
-+	if (node == parent->rb_left && parent->rb_right)
-+		bfq_update_active_node(parent->rb_right);
-+	else if (parent->rb_left)
-+		bfq_update_active_node(parent->rb_left);
-+
-+	node = parent;
-+	goto up;
-+}
-+
-+static void bfq_weights_tree_add(struct bfq_data *bfqd,
-+				 struct bfq_entity *entity,
-+				 struct rb_root *root);
-+
-+static void bfq_weights_tree_remove(struct bfq_data *bfqd,
-+				    struct bfq_entity *entity,
-+				    struct rb_root *root);
-+
-+
-+/**
-+ * bfq_active_insert - insert an entity in the active tree of its
-+ *                     group/device.
-+ * @st: the service tree of the entity.
-+ * @entity: the entity being inserted.
-+ *
-+ * The active tree is ordered by finish time, but an extra key is kept
-+ * per each node, containing the minimum value for the start times of
-+ * its children (and the node itself), so it's possible to search for
-+ * the eligible node with the lowest finish time in logarithmic time.
-+ */
-+static void bfq_active_insert(struct bfq_service_tree *st,
-+			      struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *node = &entity->rb_node;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	struct bfq_sched_data *sd = NULL;
-+	struct bfq_group *bfqg = NULL;
-+	struct bfq_data *bfqd = NULL;
-+#endif
-+
-+	bfq_insert(&st->active, entity);
-+
-+	if (node->rb_left)
-+		node = node->rb_left;
-+	else if (node->rb_right)
-+		node = node->rb_right;
-+
-+	bfq_update_active_tree(node);
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	sd = entity->sched_data;
-+	bfqg = container_of(sd, struct bfq_group, sched_data);
-+	BUG_ON(!bfqg);
-+	bfqd = (struct bfq_data *)bfqg->bfqd;
-+#endif
-+	if (bfqq)
-+		list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	else { /* bfq_group */
-+		BUG_ON(!bfqd);
-+		bfq_weights_tree_add(bfqd, entity, &bfqd->group_weights_tree);
-+	}
-+	if (bfqg != bfqd->root_group) {
-+		BUG_ON(!bfqg);
-+		BUG_ON(!bfqd);
-+		bfqg->active_entities++;
-+		if (bfqg->active_entities == 2)
-+			bfqd->active_numerous_groups++;
-+	}
-+#endif
-+}
-+
-+/**
-+ * bfq_ioprio_to_weight - calc a weight from an ioprio.
-+ * @ioprio: the ioprio value to convert.
-+ */
-+static unsigned short bfq_ioprio_to_weight(int ioprio)
-+{
-+	BUG_ON(ioprio < 0 || ioprio >= IOPRIO_BE_NR);
-+	return IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF - ioprio;
-+}
-+
-+/**
-+ * bfq_weight_to_ioprio - calc an ioprio from a weight.
-+ * @weight: the weight value to convert.
-+ *
-+ * To preserve as much as possible the old only-ioprio user interface,
-+ * 0 is used as an escape ioprio value for weights (numerically) equal or
-+ * larger than IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF.
-+ */
-+static unsigned short bfq_weight_to_ioprio(int weight)
-+{
-+	BUG_ON(weight < BFQ_MIN_WEIGHT || weight > BFQ_MAX_WEIGHT);
-+	return IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF - weight < 0 ?
-+		0 : IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF - weight;
-+}
-+
-+static void bfq_get_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	if (bfqq) {
-+		atomic_inc(&bfqq->ref);
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+	}
-+}
-+
-+/**
-+ * bfq_find_deepest - find the deepest node that an extraction can modify.
-+ * @node: the node being removed.
-+ *
-+ * Do the first step of an extraction in an rb tree, looking for the
-+ * node that will replace @node, and returning the deepest node that
-+ * the following modifications to the tree can touch.  If @node is the
-+ * last node in the tree return %NULL.
-+ */
-+static struct rb_node *bfq_find_deepest(struct rb_node *node)
-+{
-+	struct rb_node *deepest;
-+
-+	if (!node->rb_right && !node->rb_left)
-+		deepest = rb_parent(node);
-+	else if (!node->rb_right)
-+		deepest = node->rb_left;
-+	else if (!node->rb_left)
-+		deepest = node->rb_right;
-+	else {
-+		deepest = rb_next(node);
-+		if (deepest->rb_right)
-+			deepest = deepest->rb_right;
-+		else if (rb_parent(deepest) != node)
-+			deepest = rb_parent(deepest);
-+	}
-+
-+	return deepest;
-+}
-+
-+/**
-+ * bfq_active_extract - remove an entity from the active tree.
-+ * @st: the service_tree containing the tree.
-+ * @entity: the entity being removed.
-+ */
-+static void bfq_active_extract(struct bfq_service_tree *st,
-+			       struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *node;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	struct bfq_sched_data *sd = NULL;
-+	struct bfq_group *bfqg = NULL;
-+	struct bfq_data *bfqd = NULL;
-+#endif
-+
-+	node = bfq_find_deepest(&entity->rb_node);
-+	bfq_extract(&st->active, entity);
-+
-+	if (node)
-+		bfq_update_active_tree(node);
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	sd = entity->sched_data;
-+	bfqg = container_of(sd, struct bfq_group, sched_data);
-+	BUG_ON(!bfqg);
-+	bfqd = (struct bfq_data *)bfqg->bfqd;
-+#endif
-+	if (bfqq)
-+		list_del(&bfqq->bfqq_list);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	else { /* bfq_group */
-+		BUG_ON(!bfqd);
-+		bfq_weights_tree_remove(bfqd, entity,
-+					&bfqd->group_weights_tree);
-+	}
-+	if (bfqg != bfqd->root_group) {
-+		BUG_ON(!bfqg);
-+		BUG_ON(!bfqd);
-+		BUG_ON(!bfqg->active_entities);
-+		bfqg->active_entities--;
-+		if (bfqg->active_entities == 1) {
-+			BUG_ON(!bfqd->active_numerous_groups);
-+			bfqd->active_numerous_groups--;
-+		}
-+	}
-+#endif
-+}
-+
-+/**
-+ * bfq_idle_insert - insert an entity into the idle tree.
-+ * @st: the service tree containing the tree.
-+ * @entity: the entity to insert.
-+ */
-+static void bfq_idle_insert(struct bfq_service_tree *st,
-+			    struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct bfq_entity *first_idle = st->first_idle;
-+	struct bfq_entity *last_idle = st->last_idle;
-+
-+	if (!first_idle || bfq_gt(first_idle->finish, entity->finish))
-+		st->first_idle = entity;
-+	if (!last_idle || bfq_gt(entity->finish, last_idle->finish))
-+		st->last_idle = entity;
-+
-+	bfq_insert(&st->idle, entity);
-+
-+	if (bfqq)
-+		list_add(&bfqq->bfqq_list, &bfqq->bfqd->idle_list);
-+}
-+
-+/**
-+ * bfq_forget_entity - remove an entity from the wfq trees.
-+ * @st: the service tree.
-+ * @entity: the entity being removed.
-+ *
-+ * Update the device status and forget everything about @entity, putting
-+ * the device reference to it, if it is a queue.  Entities belonging to
-+ * groups are not refcounted.
-+ */
-+static void bfq_forget_entity(struct bfq_service_tree *st,
-+			      struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct bfq_sched_data *sd;
-+
-+	BUG_ON(!entity->on_st);
-+
-+	entity->on_st = 0;
-+	st->wsum -= entity->weight;
-+	if (bfqq) {
-+		sd = entity->sched_data;
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "forget_entity: %p %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+	}
-+}
-+
-+/**
-+ * bfq_put_idle_entity - release the idle tree ref of an entity.
-+ * @st: service tree for the entity.
-+ * @entity: the entity being released.
-+ */
-+static void bfq_put_idle_entity(struct bfq_service_tree *st,
-+				struct bfq_entity *entity)
-+{
-+	bfq_idle_extract(st, entity);
-+	bfq_forget_entity(st, entity);
-+}
-+
-+/**
-+ * bfq_forget_idle - update the idle tree if necessary.
-+ * @st: the service tree to act upon.
-+ *
-+ * To preserve the global O(log N) complexity we only remove one entry here;
-+ * as the idle tree will not grow indefinitely this can be done safely.
-+ */
-+static void bfq_forget_idle(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *first_idle = st->first_idle;
-+	struct bfq_entity *last_idle = st->last_idle;
-+
-+	if (RB_EMPTY_ROOT(&st->active) && last_idle &&
-+	    !bfq_gt(last_idle->finish, st->vtime)) {
-+		/*
-+		 * Forget the whole idle tree, increasing the vtime past
-+		 * the last finish time of idle entities.
-+		 */
-+		st->vtime = last_idle->finish;
-+	}
-+
-+	if (first_idle && !bfq_gt(first_idle->finish, st->vtime))
-+		bfq_put_idle_entity(st, first_idle);
-+}
-+
-+static struct bfq_service_tree *
-+__bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
-+			 struct bfq_entity *entity)
-+{
-+	struct bfq_service_tree *new_st = old_st;
-+
-+	if (entity->prio_changed) {
-+		struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+		unsigned short prev_weight, new_weight;
-+		struct bfq_data *bfqd = NULL;
-+		struct rb_root *root;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		struct bfq_sched_data *sd;
-+		struct bfq_group *bfqg;
-+#endif
-+
-+		if (bfqq)
-+			bfqd = bfqq->bfqd;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		else {
-+			sd = entity->my_sched_data;
-+			bfqg = container_of(sd, struct bfq_group, sched_data);
-+			BUG_ON(!bfqg);
-+			bfqd = (struct bfq_data *)bfqg->bfqd;
-+			BUG_ON(!bfqd);
-+		}
-+#endif
-+
-+		BUG_ON(old_st->wsum < entity->weight);
-+		old_st->wsum -= entity->weight;
-+
-+		if (entity->new_weight != entity->orig_weight) {
-+			if (entity->new_weight < BFQ_MIN_WEIGHT ||
-+			    entity->new_weight > BFQ_MAX_WEIGHT) {
-+				printk(KERN_CRIT "update_weight_prio: "
-+						 "new_weight %d\n",
-+					entity->new_weight);
-+				BUG();
-+			}
-+			entity->orig_weight = entity->new_weight;
-+			if (bfqq)
-+				bfqq->ioprio =
-+				  bfq_weight_to_ioprio(entity->orig_weight);
-+		}
-+
-+		if (bfqq)
-+			bfqq->ioprio_class = bfqq->new_ioprio_class;
-+		entity->prio_changed = 0;
-+
-+		/*
-+		 * NOTE: here we may be changing the weight too early,
-+		 * this will cause unfairness.  The correct approach
-+		 * would have required additional complexity to defer
-+		 * weight changes to the proper time instants (i.e.,
-+		 * when entity->finish <= old_st->vtime).
-+		 */
-+		new_st = bfq_entity_service_tree(entity);
-+
-+		prev_weight = entity->weight;
-+		new_weight = entity->orig_weight *
-+			     (bfqq ? bfqq->wr_coeff : 1);
-+		/*
-+		 * If the weight of the entity changes, remove the entity
-+		 * from its old weight counter (if there is a counter
-+		 * associated with the entity), and add it to the counter
-+		 * associated with its new weight.
-+		 */
-+		if (prev_weight != new_weight) {
-+			root = bfqq ? &bfqd->queue_weights_tree :
-+				      &bfqd->group_weights_tree;
-+			bfq_weights_tree_remove(bfqd, entity, root);
-+		}
-+		entity->weight = new_weight;
-+		/*
-+		 * Add the entity to its weights tree only if it is
-+		 * not associated with a weight-raised queue.
-+		 */
-+		if (prev_weight != new_weight &&
-+		    (bfqq ? bfqq->wr_coeff == 1 : 1))
-+			/* If we get here, root has been initialized. */
-+			bfq_weights_tree_add(bfqd, entity, root);
-+
-+		new_st->wsum += entity->weight;
-+
-+		if (new_st != old_st)
-+			entity->start = new_st->vtime;
-+	}
-+
-+	return new_st;
-+}
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg);
-+#endif
-+
-+/**
-+ * bfq_bfqq_served - update the scheduler status after selection for
-+ *                   service.
-+ * @bfqq: the queue being served.
-+ * @served: bytes to transfer.
-+ *
-+ * NOTE: this can be optimized, as the timestamps of upper level entities
-+ * are synchronized every time a new bfqq is selected for service.  By now,
-+ * we keep it to better check consistency.
-+ */
-+static void bfq_bfqq_served(struct bfq_queue *bfqq, int served)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_service_tree *st;
-+
-+	for_each_entity(entity) {
-+		st = bfq_entity_service_tree(entity);
-+
-+		entity->service += served;
-+		BUG_ON(entity->service > entity->budget);
-+		BUG_ON(st->wsum == 0);
-+
-+		st->vtime += bfq_delta(served, st->wsum);
-+		bfq_forget_idle(st);
-+	}
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_set_start_empty_time(bfqq_group(bfqq));
-+#endif
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "bfqq_served %d secs", served);
-+}
-+
-+/**
-+ * bfq_bfqq_charge_full_budget - set the service to the entity budget.
-+ * @bfqq: the queue that needs a service update.
-+ *
-+ * When it's not possible to be fair in the service domain, because
-+ * a queue is not consuming its budget fast enough (the meaning of
-+ * fast depends on the timeout parameter), we charge it a full
-+ * budget.  In this way we should obtain a sort of time-domain
-+ * fairness among all the seeky/slow queues.
-+ */
-+static void bfq_bfqq_charge_full_budget(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "charge_full_budget");
-+
-+	bfq_bfqq_served(bfqq, entity->budget - entity->service);
-+}
-+
-+/**
-+ * __bfq_activate_entity - activate an entity.
-+ * @entity: the entity being activated.
-+ *
-+ * Called whenever an entity is activated, i.e., it is not active and one
-+ * of its children receives a new request, or has to be reactivated due to
-+ * budget exhaustion.  It uses the current budget of the entity (and the
-+ * service received if @entity is active) of the queue to calculate its
-+ * timestamps.
-+ */
-+static void __bfq_activate_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sd = entity->sched_data;
-+	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+
-+	if (entity == sd->in_service_entity) {
-+		BUG_ON(entity->tree);
-+		/*
-+		 * If we are requeueing the current entity we have
-+		 * to take care of not charging to it service it has
-+		 * not received.
-+		 */
-+		bfq_calc_finish(entity, entity->service);
-+		entity->start = entity->finish;
-+		sd->in_service_entity = NULL;
-+	} else if (entity->tree == &st->active) {
-+		/*
-+		 * Requeueing an entity due to a change of some
-+		 * next_in_service entity below it.  We reuse the
-+		 * old start time.
-+		 */
-+		bfq_active_extract(st, entity);
-+	} else if (entity->tree == &st->idle) {
-+		/*
-+		 * Must be on the idle tree, bfq_idle_extract() will
-+		 * check for that.
-+		 */
-+		bfq_idle_extract(st, entity);
-+		entity->start = bfq_gt(st->vtime, entity->finish) ?
-+				       st->vtime : entity->finish;
-+	} else {
-+		/*
-+		 * The finish time of the entity may be invalid, and
-+		 * it is in the past for sure, otherwise the queue
-+		 * would have been on the idle tree.
-+		 */
-+		entity->start = st->vtime;
-+		st->wsum += entity->weight;
-+		bfq_get_entity(entity);
-+
-+		BUG_ON(entity->on_st);
-+		entity->on_st = 1;
-+	}
-+
-+	st = __bfq_entity_update_weight_prio(st, entity);
-+	bfq_calc_finish(entity, entity->budget);
-+	bfq_active_insert(st, entity);
-+}
-+
-+/**
-+ * bfq_activate_entity - activate an entity and its ancestors if necessary.
-+ * @entity: the entity to activate.
-+ *
-+ * Activate @entity and all the entities on the path from it to the root.
-+ */
-+static void bfq_activate_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sd;
-+
-+	for_each_entity(entity) {
-+		__bfq_activate_entity(entity);
-+
-+		sd = entity->sched_data;
-+		if (!bfq_update_next_in_service(sd))
-+			/*
-+			 * No need to propagate the activation to the
-+			 * upper entities, as they will be updated when
-+			 * the in-service entity is rescheduled.
-+			 */
-+			break;
-+	}
-+}
-+
-+/**
-+ * __bfq_deactivate_entity - deactivate an entity from its service tree.
-+ * @entity: the entity to deactivate.
-+ * @requeue: if false, the entity will not be put into the idle tree.
-+ *
-+ * Deactivate an entity, independently from its previous state.  If the
-+ * entity was not on a service tree just return, otherwise if it is on
-+ * any scheduler tree, extract it from that tree, and if necessary
-+ * and if the caller did not specify @requeue, put it on the idle tree.
-+ *
-+ * Return %1 if the caller should update the entity hierarchy, i.e.,
-+ * if the entity was in service or if it was the next_in_service for
-+ * its sched_data; return %0 otherwise.
-+ */
-+static int __bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
-+{
-+	struct bfq_sched_data *sd = entity->sched_data;
-+	struct bfq_service_tree *st;
-+	int was_in_service;
-+	int ret = 0;
-+
-+	if (sd == NULL || !entity->on_st) /* never activated, or inactive */
-+		return 0;
-+
-+	st = bfq_entity_service_tree(entity);
-+	was_in_service = entity == sd->in_service_entity;
-+
-+	BUG_ON(was_in_service && entity->tree);
-+
-+	if (was_in_service) {
-+		bfq_calc_finish(entity, entity->service);
-+		sd->in_service_entity = NULL;
-+	} else if (entity->tree == &st->active)
-+		bfq_active_extract(st, entity);
-+	else if (entity->tree == &st->idle)
-+		bfq_idle_extract(st, entity);
-+	else if (entity->tree)
-+		BUG();
-+
-+	if (was_in_service || sd->next_in_service == entity)
-+		ret = bfq_update_next_in_service(sd);
-+
-+	if (!requeue || !bfq_gt(entity->finish, st->vtime))
-+		bfq_forget_entity(st, entity);
-+	else
-+		bfq_idle_insert(st, entity);
-+
-+	BUG_ON(sd->in_service_entity == entity);
-+	BUG_ON(sd->next_in_service == entity);
-+
-+	return ret;
-+}
-+
-+/**
-+ * bfq_deactivate_entity - deactivate an entity.
-+ * @entity: the entity to deactivate.
-+ * @requeue: true if the entity can be put on the idle tree
-+ */
-+static void bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
-+{
-+	struct bfq_sched_data *sd;
-+	struct bfq_entity *parent;
-+
-+	for_each_entity_safe(entity, parent) {
-+		sd = entity->sched_data;
-+
-+		if (!__bfq_deactivate_entity(entity, requeue))
-+			/*
-+			 * The parent entity is still backlogged, and
-+			 * we don't need to update it as it is still
-+			 * in service.
-+			 */
-+			break;
-+
-+		if (sd->next_in_service)
-+			/*
-+			 * The parent entity is still backlogged and
-+			 * the budgets on the path towards the root
-+			 * need to be updated.
-+			 */
-+			goto update;
-+
-+		/*
-+		 * If we reach there the parent is no more backlogged and
-+		 * we want to propagate the dequeue upwards.
-+		 */
-+		requeue = 1;
-+	}
-+
-+	return;
-+
-+update:
-+	entity = parent;
-+	for_each_entity(entity) {
-+		__bfq_activate_entity(entity);
-+
-+		sd = entity->sched_data;
-+		if (!bfq_update_next_in_service(sd))
-+			break;
-+	}
-+}
-+
-+/**
-+ * bfq_update_vtime - update vtime if necessary.
-+ * @st: the service tree to act upon.
-+ *
-+ * If necessary update the service tree vtime to have at least one
-+ * eligible entity, skipping to its start time.  Assumes that the
-+ * active tree of the device is not empty.
-+ *
-+ * NOTE: this hierarchical implementation updates vtimes quite often,
-+ * we may end up with reactivated processes getting timestamps after a
-+ * vtime skip done because we needed a ->first_active entity on some
-+ * intermediate node.
-+ */
-+static void bfq_update_vtime(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entry;
-+	struct rb_node *node = st->active.rb_node;
-+
-+	entry = rb_entry(node, struct bfq_entity, rb_node);
-+	if (bfq_gt(entry->min_start, st->vtime)) {
-+		st->vtime = entry->min_start;
-+		bfq_forget_idle(st);
-+	}
-+}
-+
-+/**
-+ * bfq_first_active_entity - find the eligible entity with
-+ *                           the smallest finish time
-+ * @st: the service tree to select from.
-+ *
-+ * This function searches the first schedulable entity, starting from the
-+ * root of the tree and going on the left every time on this side there is
-+ * a subtree with at least one eligible (start >= vtime) entity. The path on
-+ * the right is followed only if a) the left subtree contains no eligible
-+ * entities and b) no eligible entity has been found yet.
-+ */
-+static struct bfq_entity *bfq_first_active_entity(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entry, *first = NULL;
-+	struct rb_node *node = st->active.rb_node;
-+
-+	while (node) {
-+		entry = rb_entry(node, struct bfq_entity, rb_node);
-+left:
-+		if (!bfq_gt(entry->start, st->vtime))
-+			first = entry;
-+
-+		BUG_ON(bfq_gt(entry->min_start, st->vtime));
-+
-+		if (node->rb_left) {
-+			entry = rb_entry(node->rb_left,
-+					 struct bfq_entity, rb_node);
-+			if (!bfq_gt(entry->min_start, st->vtime)) {
-+				node = node->rb_left;
-+				goto left;
-+			}
-+		}
-+		if (first)
-+			break;
-+		node = node->rb_right;
-+	}
-+
-+	BUG_ON(!first && !RB_EMPTY_ROOT(&st->active));
-+	return first;
-+}
-+
-+/**
-+ * __bfq_lookup_next_entity - return the first eligible entity in @st.
-+ * @st: the service tree.
-+ *
-+ * Update the virtual time in @st and return the first eligible entity
-+ * it contains.
-+ */
-+static struct bfq_entity *__bfq_lookup_next_entity(struct bfq_service_tree *st,
-+						   bool force)
-+{
-+	struct bfq_entity *entity, *new_next_in_service = NULL;
-+
-+	if (RB_EMPTY_ROOT(&st->active))
-+		return NULL;
-+
-+	bfq_update_vtime(st);
-+	entity = bfq_first_active_entity(st);
-+	BUG_ON(bfq_gt(entity->start, st->vtime));
-+
-+	/*
-+	 * If the chosen entity does not match with the sched_data's
-+	 * next_in_service and we are forcedly serving the IDLE priority
-+	 * class tree, bubble up budget update.
-+	 */
-+	if (unlikely(force && entity != entity->sched_data->next_in_service)) {
-+		new_next_in_service = entity;
-+		for_each_entity(new_next_in_service)
-+			bfq_update_budget(new_next_in_service);
-+	}
-+
-+	return entity;
-+}
-+
-+/**
-+ * bfq_lookup_next_entity - return the first eligible entity in @sd.
-+ * @sd: the sched_data.
-+ * @extract: if true the returned entity will be also extracted from @sd.
-+ *
-+ * NOTE: since we cache the next_in_service entity at each level of the
-+ * hierarchy, the complexity of the lookup can be decreased with
-+ * absolutely no effort just returning the cached next_in_service value;
-+ * we prefer to do full lookups to test the consistency of * the data
-+ * structures.
-+ */
-+static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
-+						 int extract,
-+						 struct bfq_data *bfqd)
-+{
-+	struct bfq_service_tree *st = sd->service_tree;
-+	struct bfq_entity *entity;
-+	int i = 0;
-+
-+	BUG_ON(sd->in_service_entity);
-+
-+	if (bfqd &&
-+	    jiffies - bfqd->bfq_class_idle_last_service > BFQ_CL_IDLE_TIMEOUT) {
-+		entity = __bfq_lookup_next_entity(st + BFQ_IOPRIO_CLASSES - 1,
-+						  true);
-+		if (entity) {
-+			i = BFQ_IOPRIO_CLASSES - 1;
-+			bfqd->bfq_class_idle_last_service = jiffies;
-+			sd->next_in_service = entity;
-+		}
-+	}
-+	for (; i < BFQ_IOPRIO_CLASSES; i++) {
-+		entity = __bfq_lookup_next_entity(st + i, false);
-+		if (entity) {
-+			if (extract) {
-+				bfq_check_next_in_service(sd, entity);
-+				bfq_active_extract(st + i, entity);
-+				sd->in_service_entity = entity;
-+				sd->next_in_service = NULL;
-+			}
-+			break;
-+		}
-+	}
-+
-+	return entity;
-+}
-+
-+/*
-+ * Get next queue for service.
-+ */
-+static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_entity *entity = NULL;
-+	struct bfq_sched_data *sd;
-+	struct bfq_queue *bfqq;
-+
-+	BUG_ON(bfqd->in_service_queue);
-+
-+	if (bfqd->busy_queues == 0)
-+		return NULL;
-+
-+	sd = &bfqd->root_group->sched_data;
-+	for (; sd ; sd = entity->my_sched_data) {
-+		entity = bfq_lookup_next_entity(sd, 1, bfqd);
-+		BUG_ON(!entity);
-+		entity->service = 0;
-+	}
-+
-+	bfqq = bfq_entity_to_bfqq(entity);
-+	BUG_ON(!bfqq);
-+
-+	return bfqq;
-+}
-+
-+static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)
-+{
-+	if (bfqd->in_service_bic) {
-+		put_io_context(bfqd->in_service_bic->icq.ioc);
-+		bfqd->in_service_bic = NULL;
-+	}
-+
-+	bfqd->in_service_queue = NULL;
-+	del_timer(&bfqd->idle_slice_timer);
-+}
-+
-+static void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				int requeue)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	if (bfqq == bfqd->in_service_queue)
-+		__bfq_bfqd_reset_in_service(bfqd);
-+
-+	bfq_deactivate_entity(entity, requeue);
-+}
-+
-+static void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	bfq_activate_entity(entity);
-+}
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static void bfqg_stats_update_dequeue(struct bfq_group *bfqg);
-+#endif
-+
-+/*
-+ * Called when the bfqq no longer has requests pending, remove it from
-+ * the service tree.
-+ */
-+static void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			      int requeue)
-+{
-+	BUG_ON(!bfq_bfqq_busy(bfqq));
-+	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	bfq_log_bfqq(bfqd, bfqq, "del from busy");
-+
-+	bfq_clear_bfqq_busy(bfqq);
-+
-+	BUG_ON(bfqd->busy_queues == 0);
-+	bfqd->busy_queues--;
-+
-+	if (!bfqq->dispatched) {
-+		bfq_weights_tree_remove(bfqd, &bfqq->entity,
-+					&bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->busy_in_flight_queues);
-+			bfqd->busy_in_flight_queues--;
-+			if (bfq_bfqq_constantly_seeky(bfqq)) {
-+				BUG_ON(!bfqd->
-+					const_seeky_busy_in_flight_queues);
-+				bfqd->const_seeky_busy_in_flight_queues--;
-+			}
-+		}
-+	}
-+	if (bfqq->wr_coeff > 1)
-+		bfqd->wr_busy_queues--;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_dequeue(bfqq_group(bfqq));
-+#endif
-+
-+	bfq_deactivate_bfqq(bfqd, bfqq, requeue);
-+}
-+
-+/*
-+ * Called when an inactive queue receives a new request.
-+ */
-+static void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	BUG_ON(bfq_bfqq_busy(bfqq));
-+	BUG_ON(bfqq == bfqd->in_service_queue);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "add to busy");
-+
-+	bfq_activate_bfqq(bfqd, bfqq);
-+
-+	bfq_mark_bfqq_busy(bfqq);
-+	bfqd->busy_queues++;
-+
-+	if (!bfqq->dispatched) {
-+		if (bfqq->wr_coeff == 1)
-+			bfq_weights_tree_add(bfqd, &bfqq->entity,
-+					     &bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			bfqd->busy_in_flight_queues++;
-+			if (bfq_bfqq_constantly_seeky(bfqq))
-+				bfqd->const_seeky_busy_in_flight_queues++;
-+		}
-+	}
-+	if (bfqq->wr_coeff > 1)
-+		bfqd->wr_busy_queues++;
-+}
-diff --git a/block/bfq.h b/block/bfq.h
-new file mode 100644
-index 0000000..3bb7df2
---- /dev/null
-+++ b/block/bfq.h
-@@ -0,0 +1,801 @@
-+/*
-+ * BFQ-v7r11 for 4.4.0: data structures and common functions prototypes.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+#ifndef _BFQ_H
-+#define _BFQ_H
-+
-+#include <linux/blktrace_api.h>
-+#include <linux/hrtimer.h>
-+#include <linux/ioprio.h>
-+#include <linux/rbtree.h>
-+#include <linux/blk-cgroup.h>
-+
-+#define BFQ_IOPRIO_CLASSES	3
-+#define BFQ_CL_IDLE_TIMEOUT	(HZ/5)
-+
-+#define BFQ_MIN_WEIGHT			1
-+#define BFQ_MAX_WEIGHT			1000
-+#define BFQ_WEIGHT_CONVERSION_COEFF	10
-+
-+#define BFQ_DEFAULT_QUEUE_IOPRIO	4
-+
-+#define BFQ_DEFAULT_GRP_WEIGHT	10
-+#define BFQ_DEFAULT_GRP_IOPRIO	0
-+#define BFQ_DEFAULT_GRP_CLASS	IOPRIO_CLASS_BE
-+
-+struct bfq_entity;
-+
-+/**
-+ * struct bfq_service_tree - per ioprio_class service tree.
-+ * @active: tree for active entities (i.e., those backlogged).
-+ * @idle: tree for idle entities (i.e., those not backlogged, with V <= F_i).
-+ * @first_idle: idle entity with minimum F_i.
-+ * @last_idle: idle entity with maximum F_i.
-+ * @vtime: scheduler virtual time.
-+ * @wsum: scheduler weight sum; active and idle entities contribute to it.
-+ *
-+ * Each service tree represents a B-WF2Q+ scheduler on its own.  Each
-+ * ioprio_class has its own independent scheduler, and so its own
-+ * bfq_service_tree.  All the fields are protected by the queue lock
-+ * of the containing bfqd.
-+ */
-+struct bfq_service_tree {
-+	struct rb_root active;
-+	struct rb_root idle;
-+
-+	struct bfq_entity *first_idle;
-+	struct bfq_entity *last_idle;
-+
-+	u64 vtime;
-+	unsigned long wsum;
-+};
-+
-+/**
-+ * struct bfq_sched_data - multi-class scheduler.
-+ * @in_service_entity: entity in service.
-+ * @next_in_service: head-of-the-line entity in the scheduler.
-+ * @service_tree: array of service trees, one per ioprio_class.
-+ *
-+ * bfq_sched_data is the basic scheduler queue.  It supports three
-+ * ioprio_classes, and can be used either as a toplevel queue or as
-+ * an intermediate queue on a hierarchical setup.
-+ * @next_in_service points to the active entity of the sched_data
-+ * service trees that will be scheduled next.
-+ *
-+ * The supported ioprio_classes are the same as in CFQ, in descending
-+ * priority order, IOPRIO_CLASS_RT, IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE.
-+ * Requests from higher priority queues are served before all the
-+ * requests from lower priority queues; among requests of the same
-+ * queue requests are served according to B-WF2Q+.
-+ * All the fields are protected by the queue lock of the containing bfqd.
-+ */
-+struct bfq_sched_data {
-+	struct bfq_entity *in_service_entity;
-+	struct bfq_entity *next_in_service;
-+	struct bfq_service_tree service_tree[BFQ_IOPRIO_CLASSES];
-+};
-+
-+/**
-+ * struct bfq_weight_counter - counter of the number of all active entities
-+ *                             with a given weight.
-+ * @weight: weight of the entities that this counter refers to.
-+ * @num_active: number of active entities with this weight.
-+ * @weights_node: weights tree member (see bfq_data's @queue_weights_tree
-+ *                and @group_weights_tree).
-+ */
-+struct bfq_weight_counter {
-+	short int weight;
-+	unsigned int num_active;
-+	struct rb_node weights_node;
-+};
-+
-+/**
-+ * struct bfq_entity - schedulable entity.
-+ * @rb_node: service_tree member.
-+ * @weight_counter: pointer to the weight counter associated with this entity.
-+ * @on_st: flag, true if the entity is on a tree (either the active or
-+ *         the idle one of its service_tree).
-+ * @finish: B-WF2Q+ finish timestamp (aka F_i).
-+ * @start: B-WF2Q+ start timestamp (aka S_i).
-+ * @tree: tree the entity is enqueued into; %NULL if not on a tree.
-+ * @min_start: minimum start time of the (active) subtree rooted at
-+ *             this entity; used for O(log N) lookups into active trees.
-+ * @service: service received during the last round of service.
-+ * @budget: budget used to calculate F_i; F_i = S_i + @budget / @weight.
-+ * @weight: weight of the queue
-+ * @parent: parent entity, for hierarchical scheduling.
-+ * @my_sched_data: for non-leaf nodes in the cgroup hierarchy, the
-+ *                 associated scheduler queue, %NULL on leaf nodes.
-+ * @sched_data: the scheduler queue this entity belongs to.
-+ * @ioprio: the ioprio in use.
-+ * @new_weight: when a weight change is requested, the new weight value.
-+ * @orig_weight: original weight, used to implement weight boosting
-+ * @prio_changed: flag, true when the user requested a weight, ioprio or
-+ *		  ioprio_class change.
-+ *
-+ * A bfq_entity is used to represent either a bfq_queue (leaf node in the
-+ * cgroup hierarchy) or a bfq_group into the upper level scheduler.  Each
-+ * entity belongs to the sched_data of the parent group in the cgroup
-+ * hierarchy.  Non-leaf entities have also their own sched_data, stored
-+ * in @my_sched_data.
-+ *
-+ * Each entity stores independently its priority values; this would
-+ * allow different weights on different devices, but this
-+ * functionality is not exported to userspace by now.  Priorities and
-+ * weights are updated lazily, first storing the new values into the
-+ * new_* fields, then setting the @prio_changed flag.  As soon as
-+ * there is a transition in the entity state that allows the priority
-+ * update to take place the effective and the requested priority
-+ * values are synchronized.
-+ *
-+ * Unless cgroups are used, the weight value is calculated from the
-+ * ioprio to export the same interface as CFQ.  When dealing with
-+ * ``well-behaved'' queues (i.e., queues that do not spend too much
-+ * time to consume their budget and have true sequential behavior, and
-+ * when there are no external factors breaking anticipation) the
-+ * relative weights at each level of the cgroups hierarchy should be
-+ * guaranteed.  All the fields are protected by the queue lock of the
-+ * containing bfqd.
-+ */
-+struct bfq_entity {
-+	struct rb_node rb_node;
-+	struct bfq_weight_counter *weight_counter;
-+
-+	int on_st;
-+
-+	u64 finish;
-+	u64 start;
-+
-+	struct rb_root *tree;
-+
-+	u64 min_start;
-+
-+	int service, budget;
-+	unsigned short weight, new_weight;
-+	unsigned short orig_weight;
-+
-+	struct bfq_entity *parent;
-+
-+	struct bfq_sched_data *my_sched_data;
-+	struct bfq_sched_data *sched_data;
-+
-+	int prio_changed;
-+};
-+
-+struct bfq_group;
-+
-+/**
-+ * struct bfq_queue - leaf schedulable entity.
-+ * @ref: reference counter.
-+ * @bfqd: parent bfq_data.
-+ * @new_ioprio: when an ioprio change is requested, the new ioprio value.
-+ * @ioprio_class: the ioprio_class in use.
-+ * @new_ioprio_class: when an ioprio_class change is requested, the new
-+ *                    ioprio_class value.
-+ * @new_bfqq: shared bfq_queue if queue is cooperating with
-+ *           one or more other queues.
-+ * @sort_list: sorted list of pending requests.
-+ * @next_rq: if fifo isn't expired, next request to serve.
-+ * @queued: nr of requests queued in @sort_list.
-+ * @allocated: currently allocated requests.
-+ * @meta_pending: pending metadata requests.
-+ * @fifo: fifo list of requests in sort_list.
-+ * @entity: entity representing this queue in the scheduler.
-+ * @max_budget: maximum budget allowed from the feedback mechanism.
-+ * @budget_timeout: budget expiration (in jiffies).
-+ * @dispatched: number of requests on the dispatch list or inside driver.
-+ * @flags: status flags.
-+ * @bfqq_list: node for active/idle bfqq list inside our bfqd.
-+ * @burst_list_node: node for the device's burst list.
-+ * @seek_samples: number of seeks sampled
-+ * @seek_total: sum of the distances of the seeks sampled
-+ * @seek_mean: mean seek distance
-+ * @last_request_pos: position of the last request enqueued
-+ * @requests_within_timer: number of consecutive pairs of request completion
-+ *                         and arrival, such that the queue becomes idle
-+ *                         after the completion, but the next request arrives
-+ *                         within an idle time slice; used only if the queue's
-+ *                         IO_bound has been cleared.
-+ * @pid: pid of the process owning the queue, used for logging purposes.
-+ * @last_wr_start_finish: start time of the current weight-raising period if
-+ *                        the @bfq-queue is being weight-raised, otherwise
-+ *                        finish time of the last weight-raising period
-+ * @wr_cur_max_time: current max raising time for this queue
-+ * @soft_rt_next_start: minimum time instant such that, only if a new
-+ *                      request is enqueued after this time instant in an
-+ *                      idle @bfq_queue with no outstanding requests, then
-+ *                      the task associated with the queue it is deemed as
-+ *                      soft real-time (see the comments to the function
-+ *                      bfq_bfqq_softrt_next_start())
-+ * @last_idle_bklogged: time of the last transition of the @bfq_queue from
-+ *                      idle to backlogged
-+ * @service_from_backlogged: cumulative service received from the @bfq_queue
-+ *                           since the last transition from idle to
-+ *                           backlogged
-+ * @bic: pointer to the bfq_io_cq owning the bfq_queue, set to %NULL if the
-+ *	 queue is shared
-+ *
-+ * A bfq_queue is a leaf request queue; it can be associated with an
-+ * io_context or more, if it  is  async or shared  between  cooperating
-+ * processes. @cgroup holds a reference to the cgroup, to be sure that it
-+ * does not disappear while a bfqq still references it (mostly to avoid
-+ * races between request issuing and task migration followed by cgroup
-+ * destruction).
-+ * All the fields are protected by the queue lock of the containing bfqd.
-+ */
-+struct bfq_queue {
-+	atomic_t ref;
-+	struct bfq_data *bfqd;
-+
-+	unsigned short ioprio, new_ioprio;
-+	unsigned short ioprio_class, new_ioprio_class;
-+
-+	/* fields for cooperating queues handling */
-+	struct bfq_queue *new_bfqq;
-+	struct rb_node pos_node;
-+	struct rb_root *pos_root;
-+
-+	struct rb_root sort_list;
-+	struct request *next_rq;
-+	int queued[2];
-+	int allocated[2];
-+	int meta_pending;
-+	struct list_head fifo;
-+
-+	struct bfq_entity entity;
-+
-+	int max_budget;
-+	unsigned long budget_timeout;
-+
-+	int dispatched;
-+
-+	unsigned int flags;
-+
-+	struct list_head bfqq_list;
-+
-+	struct hlist_node burst_list_node;
-+
-+	unsigned int seek_samples;
-+	u64 seek_total;
-+	sector_t seek_mean;
-+	sector_t last_request_pos;
-+
-+	unsigned int requests_within_timer;
-+
-+	pid_t pid;
-+	struct bfq_io_cq *bic;
-+
-+	/* weight-raising fields */
-+	unsigned long wr_cur_max_time;
-+	unsigned long soft_rt_next_start;
-+	unsigned long last_wr_start_finish;
-+	unsigned int wr_coeff;
-+	unsigned long last_idle_bklogged;
-+	unsigned long service_from_backlogged;
-+};
-+
-+/**
-+ * struct bfq_ttime - per process thinktime stats.
-+ * @ttime_total: total process thinktime
-+ * @ttime_samples: number of thinktime samples
-+ * @ttime_mean: average process thinktime
-+ */
-+struct bfq_ttime {
-+	unsigned long last_end_request;
-+
-+	unsigned long ttime_total;
-+	unsigned long ttime_samples;
-+	unsigned long ttime_mean;
-+};
-+
-+/**
-+ * struct bfq_io_cq - per (request_queue, io_context) structure.
-+ * @icq: associated io_cq structure
-+ * @bfqq: array of two process queues, the sync and the async
-+ * @ttime: associated @bfq_ttime struct
-+ * @ioprio: per (request_queue, blkcg) ioprio.
-+ * @blkcg_id: id of the blkcg the related io_cq belongs to.
-+ */
-+struct bfq_io_cq {
-+	struct io_cq icq; /* must be the first member */
-+	struct bfq_queue *bfqq[2];
-+	struct bfq_ttime ttime;
-+	int ioprio;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	uint64_t blkcg_id; /* the current blkcg ID */
-+#endif
-+};
-+
-+enum bfq_device_speed {
-+	BFQ_BFQD_FAST,
-+	BFQ_BFQD_SLOW,
-+};
-+
-+/**
-+ * struct bfq_data - per device data structure.
-+ * @queue: request queue for the managed device.
-+ * @root_group: root bfq_group for the device.
-+ * @active_numerous_groups: number of bfq_groups containing more than one
-+ *                          active @bfq_entity.
-+ * @queue_weights_tree: rbtree of weight counters of @bfq_queues, sorted by
-+ *                      weight. Used to keep track of whether all @bfq_queues
-+ *                     have the same weight. The tree contains one counter
-+ *                     for each distinct weight associated to some active
-+ *                     and not weight-raised @bfq_queue (see the comments to
-+ *                      the functions bfq_weights_tree_[add|remove] for
-+ *                     further details).
-+ * @group_weights_tree: rbtree of non-queue @bfq_entity weight counters, sorted
-+ *                      by weight. Used to keep track of whether all
-+ *                     @bfq_groups have the same weight. The tree contains
-+ *                     one counter for each distinct weight associated to
-+ *                     some active @bfq_group (see the comments to the
-+ *                     functions bfq_weights_tree_[add|remove] for further
-+ *                     details).
-+ * @busy_queues: number of bfq_queues containing requests (including the
-+ *		 queue in service, even if it is idling).
-+ * @busy_in_flight_queues: number of @bfq_queues containing pending or
-+ *                         in-flight requests, plus the @bfq_queue in
-+ *                         service, even if idle but waiting for the
-+ *                         possible arrival of its next sync request. This
-+ *                         field is updated only if the device is rotational,
-+ *                         but used only if the device is also NCQ-capable.
-+ *                         The reason why the field is updated also for non-
-+ *                         NCQ-capable rotational devices is related to the
-+ *                         fact that the value of @hw_tag may be set also
-+ *                         later than when busy_in_flight_queues may need to
-+ *                         be incremented for the first time(s). Taking also
-+ *                         this possibility into account, to avoid unbalanced
-+ *                         increments/decrements, would imply more overhead
-+ *                         than just updating busy_in_flight_queues
-+ *                         regardless of the value of @hw_tag.
-+ * @const_seeky_busy_in_flight_queues: number of constantly-seeky @bfq_queues
-+ *                                     (that is, seeky queues that expired
-+ *                                     for budget timeout at least once)
-+ *                                     containing pending or in-flight
-+ *                                     requests, including the in-service
-+ *                                     @bfq_queue if constantly seeky. This
-+ *                                     field is updated only if the device
-+ *                                     is rotational, but used only if the
-+ *                                     device is also NCQ-capable (see the
-+ *                                     comments to @busy_in_flight_queues).
-+ * @wr_busy_queues: number of weight-raised busy @bfq_queues.
-+ * @queued: number of queued requests.
-+ * @rq_in_driver: number of requests dispatched and waiting for completion.
-+ * @sync_flight: number of sync requests in the driver.
-+ * @max_rq_in_driver: max number of reqs in driver in the last
-+ *                    @hw_tag_samples completed requests.
-+ * @hw_tag_samples: nr of samples used to calculate hw_tag.
-+ * @hw_tag: flag set to one if the driver is showing a queueing behavior.
-+ * @budgets_assigned: number of budgets assigned.
-+ * @idle_slice_timer: timer set when idling for the next sequential request
-+ *                    from the queue in service.
-+ * @unplug_work: delayed work to restart dispatching on the request queue.
-+ * @in_service_queue: bfq_queue in service.
-+ * @in_service_bic: bfq_io_cq (bic) associated with the @in_service_queue.
-+ * @last_position: on-disk position of the last served request.
-+ * @last_budget_start: beginning of the last budget.
-+ * @last_idling_start: beginning of the last idle slice.
-+ * @peak_rate: peak transfer rate observed for a budget.
-+ * @peak_rate_samples: number of samples used to calculate @peak_rate.
-+ * @bfq_max_budget: maximum budget allotted to a bfq_queue before
-+ *                  rescheduling.
-+ * @active_list: list of all the bfq_queues active on the device.
-+ * @idle_list: list of all the bfq_queues idle on the device.
-+ * @bfq_fifo_expire: timeout for async/sync requests; when it expires
-+ *                   requests are served in fifo order.
-+ * @bfq_back_penalty: weight of backward seeks wrt forward ones.
-+ * @bfq_back_max: maximum allowed backward seek.
-+ * @bfq_slice_idle: maximum idling time.
-+ * @bfq_user_max_budget: user-configured max budget value
-+ *                       (0 for auto-tuning).
-+ * @bfq_max_budget_async_rq: maximum budget (in nr of requests) allotted to
-+ *                           async queues.
-+ * @bfq_timeout: timeout for bfq_queues to consume their budget; used to
-+ *               to prevent seeky queues to impose long latencies to well
-+ *               behaved ones (this also implies that seeky queues cannot
-+ *               receive guarantees in the service domain; after a timeout
-+ *               they are charged for the whole allocated budget, to try
-+ *               to preserve a behavior reasonably fair among them, but
-+ *               without service-domain guarantees).
-+ * @bfq_coop_thresh: number of queue merges after which a @bfq_queue is
-+ *                   no more granted any weight-raising.
-+ * @bfq_failed_cooperations: number of consecutive failed cooperation
-+ *                           chances after which weight-raising is restored
-+ *                           to a queue subject to more than bfq_coop_thresh
-+ *                           queue merges.
-+ * @bfq_requests_within_timer: number of consecutive requests that must be
-+ *                             issued within the idle time slice to set
-+ *                             again idling to a queue which was marked as
-+ *                             non-I/O-bound (see the definition of the
-+ *                             IO_bound flag for further details).
-+ * @last_ins_in_burst: last time at which a queue entered the current
-+ *                     burst of queues being activated shortly after
-+ *                     each other; for more details about this and the
-+ *                     following parameters related to a burst of
-+ *                     activations, see the comments to the function
-+ *                     @bfq_handle_burst.
-+ * @bfq_burst_interval: reference time interval used to decide whether a
-+ *                      queue has been activated shortly after
-+ *                      @last_ins_in_burst.
-+ * @burst_size: number of queues in the current burst of queue activations.
-+ * @bfq_large_burst_thresh: maximum burst size above which the current
-+ * 			    queue-activation burst is deemed as 'large'.
-+ * @large_burst: true if a large queue-activation burst is in progress.
-+ * @burst_list: head of the burst list (as for the above fields, more details
-+ * 		in the comments to the function bfq_handle_burst).
-+ * @low_latency: if set to true, low-latency heuristics are enabled.
-+ * @bfq_wr_coeff: maximum factor by which the weight of a weight-raised
-+ *                queue is multiplied.
-+ * @bfq_wr_max_time: maximum duration of a weight-raising period (jiffies).
-+ * @bfq_wr_rt_max_time: maximum duration for soft real-time processes.
-+ * @bfq_wr_min_idle_time: minimum idle period after which weight-raising
-+ *			  may be reactivated for a queue (in jiffies).
-+ * @bfq_wr_min_inter_arr_async: minimum period between request arrivals
-+ *				after which weight-raising may be
-+ *				reactivated for an already busy queue
-+ *				(in jiffies).
-+ * @bfq_wr_max_softrt_rate: max service-rate for a soft real-time queue,
-+ *			    sectors per seconds.
-+ * @RT_prod: cached value of the product R*T used for computing the maximum
-+ *	     duration of the weight raising automatically.
-+ * @device_speed: device-speed class for the low-latency heuristic.
-+ * @oom_bfqq: fallback dummy bfqq for extreme OOM conditions.
-+ *
-+ * All the fields are protected by the @queue lock.
-+ */
-+struct bfq_data {
-+	struct request_queue *queue;
-+
-+	struct bfq_group *root_group;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	int active_numerous_groups;
-+#endif
-+
-+	struct rb_root queue_weights_tree;
-+	struct rb_root group_weights_tree;
-+
-+	int busy_queues;
-+	int busy_in_flight_queues;
-+	int const_seeky_busy_in_flight_queues;
-+	int wr_busy_queues;
-+	int queued;
-+	int rq_in_driver;
-+	int sync_flight;
-+
-+	int max_rq_in_driver;
-+	int hw_tag_samples;
-+	int hw_tag;
-+
-+	int budgets_assigned;
-+
-+	struct timer_list idle_slice_timer;
-+	struct work_struct unplug_work;
-+
-+	struct bfq_queue *in_service_queue;
-+	struct bfq_io_cq *in_service_bic;
-+
-+	sector_t last_position;
-+
-+	ktime_t last_budget_start;
-+	ktime_t last_idling_start;
-+	int peak_rate_samples;
-+	u64 peak_rate;
-+	int bfq_max_budget;
-+
-+	struct list_head active_list;
-+	struct list_head idle_list;
-+
-+	unsigned int bfq_fifo_expire[2];
-+	unsigned int bfq_back_penalty;
-+	unsigned int bfq_back_max;
-+	unsigned int bfq_slice_idle;
-+	u64 bfq_class_idle_last_service;
-+
-+	int bfq_user_max_budget;
-+	int bfq_max_budget_async_rq;
-+	unsigned int bfq_timeout[2];
-+
-+	unsigned int bfq_coop_thresh;
-+	unsigned int bfq_failed_cooperations;
-+	unsigned int bfq_requests_within_timer;
-+
-+	unsigned long last_ins_in_burst;
-+	unsigned long bfq_burst_interval;
-+	int burst_size;
-+	unsigned long bfq_large_burst_thresh;
-+	bool large_burst;
-+	struct hlist_head burst_list;
-+
-+	bool low_latency;
-+
-+	/* parameters of the low_latency heuristics */
-+	unsigned int bfq_wr_coeff;
-+	unsigned int bfq_wr_max_time;
-+	unsigned int bfq_wr_rt_max_time;
-+	unsigned int bfq_wr_min_idle_time;
-+	unsigned long bfq_wr_min_inter_arr_async;
-+	unsigned int bfq_wr_max_softrt_rate;
-+	u64 RT_prod;
-+	enum bfq_device_speed device_speed;
-+
-+	struct bfq_queue oom_bfqq;
-+};
-+
-+enum bfqq_state_flags {
-+	BFQ_BFQQ_FLAG_busy = 0,		/* has requests or is in service */
-+	BFQ_BFQQ_FLAG_wait_request,	/* waiting for a request */
-+	BFQ_BFQQ_FLAG_must_alloc,	/* must be allowed rq alloc */
-+	BFQ_BFQQ_FLAG_fifo_expire,	/* FIFO checked in this slice */
-+	BFQ_BFQQ_FLAG_idle_window,	/* slice idling enabled */
-+	BFQ_BFQQ_FLAG_sync,		/* synchronous queue */
-+	BFQ_BFQQ_FLAG_budget_new,	/* no completion with this budget */
-+	BFQ_BFQQ_FLAG_IO_bound,		/*
-+					 * bfqq has timed-out at least once
-+					 * having consumed at most 2/10 of
-+					 * its budget
-+					 */
-+	BFQ_BFQQ_FLAG_in_large_burst,	/*
-+					 * bfqq activated in a large burst,
-+					 * see comments to bfq_handle_burst.
-+					 */
-+	BFQ_BFQQ_FLAG_constantly_seeky,	/*
-+					 * bfqq has proved to be slow and
-+					 * seeky until budget timeout
-+					 */
-+	BFQ_BFQQ_FLAG_softrt_update,	/*
-+					 * may need softrt-next-start
-+					 * update
-+					 */
-+};
-+
-+#define BFQ_BFQQ_FNS(name)						\
-+static void bfq_mark_bfqq_##name(struct bfq_queue *bfqq)		\
-+{									\
-+	(bfqq)->flags |= (1 << BFQ_BFQQ_FLAG_##name);			\
-+}									\
-+static void bfq_clear_bfqq_##name(struct bfq_queue *bfqq)		\
-+{									\
-+	(bfqq)->flags &= ~(1 << BFQ_BFQQ_FLAG_##name);			\
-+}									\
-+static int bfq_bfqq_##name(const struct bfq_queue *bfqq)		\
-+{									\
-+	return ((bfqq)->flags & (1 << BFQ_BFQQ_FLAG_##name)) != 0;	\
-+}
-+
-+BFQ_BFQQ_FNS(busy);
-+BFQ_BFQQ_FNS(wait_request);
-+BFQ_BFQQ_FNS(must_alloc);
-+BFQ_BFQQ_FNS(fifo_expire);
-+BFQ_BFQQ_FNS(idle_window);
-+BFQ_BFQQ_FNS(sync);
-+BFQ_BFQQ_FNS(budget_new);
-+BFQ_BFQQ_FNS(IO_bound);
-+BFQ_BFQQ_FNS(in_large_burst);
-+BFQ_BFQQ_FNS(constantly_seeky);
-+BFQ_BFQQ_FNS(softrt_update);
-+#undef BFQ_BFQQ_FNS
-+
-+/* Logging facilities. */
-+#define bfq_log_bfqq(bfqd, bfqq, fmt, args...) \
-+	blk_add_trace_msg((bfqd)->queue, "bfq%d " fmt, (bfqq)->pid, ##args)
-+
-+#define bfq_log(bfqd, fmt, args...) \
-+	blk_add_trace_msg((bfqd)->queue, "bfq " fmt, ##args)
-+
-+/* Expiration reasons. */
-+enum bfqq_expiration {
-+	BFQ_BFQQ_TOO_IDLE = 0,		/*
-+					 * queue has been idling for
-+					 * too long
-+					 */
-+	BFQ_BFQQ_BUDGET_TIMEOUT,	/* budget took too long to be used */
-+	BFQ_BFQQ_BUDGET_EXHAUSTED,	/* budget consumed */
-+	BFQ_BFQQ_NO_MORE_REQUESTS,	/* the queue has no more requests */
-+};
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+
-+struct bfqg_stats {
-+	/* total bytes transferred */
-+	struct blkg_rwstat		service_bytes;
-+	/* total IOs serviced, post merge */
-+	struct blkg_rwstat		serviced;
-+	/* number of ios merged */
-+	struct blkg_rwstat		merged;
-+	/* total time spent on device in ns, may not be accurate w/ queueing */
-+	struct blkg_rwstat		service_time;
-+	/* total time spent waiting in scheduler queue in ns */
-+	struct blkg_rwstat		wait_time;
-+	/* number of IOs queued up */
-+	struct blkg_rwstat		queued;
-+	/* total sectors transferred */
-+	struct blkg_stat		sectors;
-+	/* total disk time and nr sectors dispatched by this group */
-+	struct blkg_stat		time;
-+	/* time not charged to this cgroup */
-+	struct blkg_stat		unaccounted_time;
-+	/* sum of number of ios queued across all samples */
-+	struct blkg_stat		avg_queue_size_sum;
-+	/* count of samples taken for average */
-+	struct blkg_stat		avg_queue_size_samples;
-+	/* how many times this group has been removed from service tree */
-+	struct blkg_stat		dequeue;
-+	/* total time spent waiting for it to be assigned a timeslice. */
-+	struct blkg_stat		group_wait_time;
-+	/* time spent idling for this blkcg_gq */
-+	struct blkg_stat		idle_time;
-+	/* total time with empty current active q with other requests queued */
-+	struct blkg_stat		empty_time;
-+	/* fields after this shouldn't be cleared on stat reset */
-+	uint64_t			start_group_wait_time;
-+	uint64_t			start_idle_time;
-+	uint64_t			start_empty_time;
-+	uint16_t			flags;
-+};
-+
-+/*
-+ * struct bfq_group_data - per-blkcg storage for the blkio subsystem.
-+ *
-+ * @ps: @blkcg_policy_storage that this structure inherits
-+ * @weight: weight of the bfq_group
-+ */
-+struct bfq_group_data {
-+	/* must be the first member */
-+	struct blkcg_policy_data pd;
-+
-+	unsigned short weight;
-+};
-+
-+/**
-+ * struct bfq_group - per (device, cgroup) data structure.
-+ * @entity: schedulable entity to insert into the parent group sched_data.
-+ * @sched_data: own sched_data, to contain child entities (they may be
-+ *              both bfq_queues and bfq_groups).
-+ * @bfqd: the bfq_data for the device this group acts upon.
-+ * @async_bfqq: array of async queues for all the tasks belonging to
-+ *              the group, one queue per ioprio value per ioprio_class,
-+ *              except for the idle class that has only one queue.
-+ * @async_idle_bfqq: async queue for the idle class (ioprio is ignored).
-+ * @my_entity: pointer to @entity, %NULL for the toplevel group; used
-+ *             to avoid too many special cases during group creation/
-+ *             migration.
-+ * @active_entities: number of active entities belonging to the group;
-+ *                   unused for the root group. Used to know whether there
-+ *                   are groups with more than one active @bfq_entity
-+ *                   (see the comments to the function
-+ *                   bfq_bfqq_must_not_expire()).
-+ *
-+ * Each (device, cgroup) pair has its own bfq_group, i.e., for each cgroup
-+ * there is a set of bfq_groups, each one collecting the lower-level
-+ * entities belonging to the group that are acting on the same device.
-+ *
-+ * Locking works as follows:
-+ *    o @bfqd is protected by the queue lock, RCU is used to access it
-+ *      from the readers.
-+ *    o All the other fields are protected by the @bfqd queue lock.
-+ */
-+struct bfq_group {
-+	/* must be the first member */
-+	struct blkg_policy_data pd;
-+
-+	struct bfq_entity entity;
-+	struct bfq_sched_data sched_data;
-+
-+	void *bfqd;
-+
-+	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
-+	struct bfq_queue *async_idle_bfqq;
-+
-+	struct bfq_entity *my_entity;
-+
-+	int active_entities;
-+
-+	struct bfqg_stats stats;
-+	struct bfqg_stats dead_stats;	/* stats pushed from dead children */
-+};
-+
-+#else
-+struct bfq_group {
-+	struct bfq_sched_data sched_data;
-+
-+	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
-+	struct bfq_queue *async_idle_bfqq;
-+};
-+#endif
-+
-+static struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity);
-+
-+static struct bfq_service_tree *
-+bfq_entity_service_tree(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sched_data = entity->sched_data;
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	unsigned int idx = bfqq ? bfqq->ioprio_class - 1 :
-+				  BFQ_DEFAULT_GRP_CLASS;
-+
-+	BUG_ON(idx >= BFQ_IOPRIO_CLASSES);
-+	BUG_ON(sched_data == NULL);
-+
-+	return sched_data->service_tree + idx;
-+}
-+
-+static struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync)
-+{
-+	return bic->bfqq[is_sync];
-+}
-+
-+static void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq,
-+			 bool is_sync)
-+{
-+	bic->bfqq[is_sync] = bfqq;
-+}
-+
-+static struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic)
-+{
-+	return bic->icq.q->elevator->elevator_data;
-+}
-+
-+/**
-+ * bfq_get_bfqd_locked - get a lock to a bfqd using a RCU protected pointer.
-+ * @ptr: a pointer to a bfqd.
-+ * @flags: storage for the flags to be saved.
-+ *
-+ * This function allows bfqg->bfqd to be protected by the
-+ * queue lock of the bfqd they reference; the pointer is dereferenced
-+ * under RCU, so the storage for bfqd is assured to be safe as long
-+ * as the RCU read side critical section does not end.  After the
-+ * bfqd->queue->queue_lock is taken the pointer is rechecked, to be
-+ * sure that no other writer accessed it.  If we raced with a writer,
-+ * the function returns NULL, with the queue unlocked, otherwise it
-+ * returns the dereferenced pointer, with the queue locked.
-+ */
-+static struct bfq_data *bfq_get_bfqd_locked(void **ptr, unsigned long *flags)
-+{
-+	struct bfq_data *bfqd;
-+
-+	rcu_read_lock();
-+	bfqd = rcu_dereference(*(struct bfq_data **)ptr);
-+
-+	if (bfqd != NULL) {
-+		spin_lock_irqsave(bfqd->queue->queue_lock, *flags);
-+		if (ptr == NULL)
-+			printk(KERN_CRIT "get_bfqd_locked pointer NULL\n");
-+		else if (*ptr == bfqd)
-+			goto out;
-+		spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
-+	}
-+
-+	bfqd = NULL;
-+out:
-+	rcu_read_unlock();
-+	return bfqd;
-+}
-+
-+static void bfq_put_bfqd_unlock(struct bfq_data *bfqd, unsigned long *flags)
-+{
-+	spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
-+}
-+
-+static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio);
-+static void bfq_put_queue(struct bfq_queue *bfqq);
-+static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
-+static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
-+				       struct bio *bio, int is_sync,
-+				       struct bfq_io_cq *bic, gfp_t gfp_mask);
-+static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
-+				    struct bfq_group *bfqg);
-+static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg);
-+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
-+
-+#endif /* _BFQ_H */
--- 
-1.9.1
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
deleted file mode 100644
index a20185b99..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
+++ /dev/null
@@ -1,1102 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From d3deade9dc903f58c2bf79e316b785f6eaf2441f Mon Sep 17 00:00:00 2001
-From: Mauro Andreolini <mauro.andreolini@unimore.it>
-Date: Sun, 6 Sep 2015 16:09:05 +0200
-Subject: [PATCH 3/3] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r11 for
- 4.4.0
-
-A set of processes may happen  to  perform interleaved reads, i.e.,requests
-whose union would give rise to a  sequential read  pattern.  There are two
-typical  cases: in the first  case,   processes  read  fixed-size chunks of
-data at a fixed distance from each other, while in the second case processes
-may read variable-size chunks at  variable distances. The latter case occurs
-for  example with  QEMU, which  splits the  I/O generated  by the  guest into
-multiple chunks,  and lets these chunks  be served by a  pool of cooperating
-processes,  iteratively  assigning  the  next  chunk of  I/O  to  the first
-available  process. CFQ  uses actual  queue merging  for the  first type of
-rocesses, whereas it  uses preemption to get a sequential  read pattern out
-of the read requests  performed by the second type of  processes. In the end
-it uses  two different  mechanisms to  achieve the  same goal: boosting the
-throughput with interleaved I/O.
-
-This patch introduces  Early Queue Merge (EQM), a unified mechanism to get a
-sequential  read pattern  with both  types of  processes. The  main idea is
-checking newly arrived requests against the next request of the active queue
-both in case of actual request insert and in case of request merge. By doing
-so, both the types of processes can be handled by just merging their queues.
-EQM is  then simpler and  more compact than the  pair of mechanisms used in
-CFQ.
-
-Finally, EQM  also preserves the  typical low-latency properties of BFQ, by
-properly restoring the weight-raising state of a queue when it gets back to
-a non-merged state.
-
-Signed-off-by: Mauro Andreolini <mauro.andreolini@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini@google.com>
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- block/bfq-cgroup.c  |   4 +
- block/bfq-iosched.c | 687 ++++++++++++++++++++++++++++++++++++++++++++++++++--
- block/bfq.h         |  66 +++++
- 3 files changed, 743 insertions(+), 14 deletions(-)
-
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-index 8610cd6..5ee99ec 100644
---- a/block/bfq-cgroup.c
-+++ b/block/bfq-cgroup.c
-@@ -437,6 +437,7 @@ static void bfq_pd_init(struct blkg_policy_data *pd)
- 				   */
- 	bfqg->bfqd = bfqd;
- 	bfqg->active_entities = 0;
-+	bfqg->rq_pos_tree = RB_ROOT;
- }
- 
- static void bfq_pd_free(struct blkg_policy_data *pd)
-@@ -530,6 +531,8 @@ static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
- 	return bfqg;
- }
- 
-+static void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq);
-+
- /**
-  * bfq_bfqq_move - migrate @bfqq to @bfqg.
-  * @bfqd: queue descriptor.
-@@ -577,6 +580,7 @@ static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	bfqg_get(bfqg);
- 
- 	if (busy) {
-+		bfq_pos_tree_add_move(bfqd, bfqq);
- 		if (resume)
- 			bfq_activate_bfqq(bfqd, bfqq);
- 	}
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index f9787a6..d1f648d 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -296,6 +296,72 @@ static struct request *bfq_choose_req(struct bfq_data *bfqd,
- 	}
- }
- 
-+static struct bfq_queue *
-+bfq_rq_pos_tree_lookup(struct bfq_data *bfqd, struct rb_root *root,
-+		     sector_t sector, struct rb_node **ret_parent,
-+		     struct rb_node ***rb_link)
-+{
-+	struct rb_node **p, *parent;
-+	struct bfq_queue *bfqq = NULL;
-+
-+	parent = NULL;
-+	p = &root->rb_node;
-+	while (*p) {
-+		struct rb_node **n;
-+
-+		parent = *p;
-+		bfqq = rb_entry(parent, struct bfq_queue, pos_node);
-+
-+		/*
-+		 * Sort strictly based on sector. Smallest to the left,
-+		 * largest to the right.
-+		 */
-+		if (sector > blk_rq_pos(bfqq->next_rq))
-+			n = &(*p)->rb_right;
-+		else if (sector < blk_rq_pos(bfqq->next_rq))
-+			n = &(*p)->rb_left;
-+		else
-+			break;
-+		p = n;
-+		bfqq = NULL;
-+	}
-+
-+	*ret_parent = parent;
-+	if (rb_link)
-+		*rb_link = p;
-+
-+	bfq_log(bfqd, "rq_pos_tree_lookup %llu: returning %d",
-+		(long long unsigned)sector,
-+		bfqq ? bfqq->pid : 0);
-+
-+	return bfqq;
-+}
-+
-+static void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct rb_node **p, *parent;
-+	struct bfq_queue *__bfqq;
-+
-+	if (bfqq->pos_root) {
-+		rb_erase(&bfqq->pos_node, bfqq->pos_root);
-+		bfqq->pos_root = NULL;
-+	}
-+
-+	if (bfq_class_idle(bfqq))
-+		return;
-+	if (!bfqq->next_rq)
-+		return;
-+
-+	bfqq->pos_root = &bfq_bfqq_to_bfqg(bfqq)->rq_pos_tree;
-+	__bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root,
-+			blk_rq_pos(bfqq->next_rq), &parent, &p);
-+	if (!__bfqq) {
-+		rb_link_node(&bfqq->pos_node, parent, p);
-+		rb_insert_color(&bfqq->pos_node, bfqq->pos_root);
-+	} else
-+		bfqq->pos_root = NULL;
-+}
-+
- /*
-  * Tell whether there are active queues or groups with differentiated weights.
-  */
-@@ -528,6 +594,57 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
- 	return dur;
- }
- 
-+static unsigned bfq_bfqq_cooperations(struct bfq_queue *bfqq)
-+{
-+	return bfqq->bic ? bfqq->bic->cooperations : 0;
-+}
-+
-+static void
-+bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
-+{
-+	if (bic->saved_idle_window)
-+		bfq_mark_bfqq_idle_window(bfqq);
-+	else
-+		bfq_clear_bfqq_idle_window(bfqq);
-+	if (bic->saved_IO_bound)
-+		bfq_mark_bfqq_IO_bound(bfqq);
-+	else
-+		bfq_clear_bfqq_IO_bound(bfqq);
-+	/* Assuming that the flag in_large_burst is already correctly set */
-+	if (bic->wr_time_left && bfqq->bfqd->low_latency &&
-+	    !bfq_bfqq_in_large_burst(bfqq) &&
-+	    bic->cooperations < bfqq->bfqd->bfq_coop_thresh) {
-+		/*
-+		 * Start a weight raising period with the duration given by
-+		 * the raising_time_left snapshot.
-+		 */
-+		if (bfq_bfqq_busy(bfqq))
-+			bfqq->bfqd->wr_busy_queues++;
-+		bfqq->wr_coeff = bfqq->bfqd->bfq_wr_coeff;
-+		bfqq->wr_cur_max_time = bic->wr_time_left;
-+		bfqq->last_wr_start_finish = jiffies;
-+		bfqq->entity.prio_changed = 1;
-+	}
-+	/*
-+	 * Clear wr_time_left to prevent bfq_bfqq_save_state() from
-+	 * getting confused about the queue's need of a weight-raising
-+	 * period.
-+	 */
-+	bic->wr_time_left = 0;
-+}
-+
-+static int bfqq_process_refs(struct bfq_queue *bfqq)
-+{
-+	int process_refs, io_refs;
-+
-+	lockdep_assert_held(bfqq->bfqd->queue->queue_lock);
-+
-+	io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE];
-+	process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st;
-+	BUG_ON(process_refs < 0);
-+	return process_refs;
-+}
-+
- /* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */
- static void bfq_reset_burst_list(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
-@@ -764,8 +881,14 @@ static void bfq_add_request(struct request *rq)
- 	BUG_ON(!next_rq);
- 	bfqq->next_rq = next_rq;
- 
-+	/*
-+	 * Adjust priority tree position, if next_rq changes.
-+	 */
-+	if (prev != bfqq->next_rq)
-+		bfq_pos_tree_add_move(bfqd, bfqq);
-+
- 	if (!bfq_bfqq_busy(bfqq)) {
--		bool soft_rt, in_burst,
-+		bool soft_rt, coop_or_in_burst,
- 		     idle_for_long_time = time_is_before_jiffies(
- 						bfqq->budget_timeout +
- 						bfqd->bfq_wr_min_idle_time);
-@@ -793,11 +916,12 @@ static void bfq_add_request(struct request *rq)
- 				bfqd->last_ins_in_burst = jiffies;
- 		}
- 
--		in_burst = bfq_bfqq_in_large_burst(bfqq);
-+		coop_or_in_burst = bfq_bfqq_in_large_burst(bfqq) ||
-+			bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh;
- 		soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
--			!in_burst &&
-+			!coop_or_in_burst &&
- 			time_is_before_jiffies(bfqq->soft_rt_next_start);
--		interactive = !in_burst && idle_for_long_time;
-+		interactive = !coop_or_in_burst && idle_for_long_time;
- 		entity->budget = max_t(unsigned long, bfqq->max_budget,
- 				       bfq_serv_to_charge(next_rq, bfqq));
- 
-@@ -816,6 +940,9 @@ static void bfq_add_request(struct request *rq)
- 		if (!bfqd->low_latency)
- 			goto add_bfqq_busy;
- 
-+		if (bfq_bfqq_just_split(bfqq))
-+			goto set_prio_changed;
-+
- 		/*
- 		 * If the queue:
- 		 * - is not being boosted,
-@@ -840,7 +967,7 @@ static void bfq_add_request(struct request *rq)
- 		} else if (old_wr_coeff > 1) {
- 			if (interactive)
- 				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
--			else if (in_burst ||
-+			else if (coop_or_in_burst ||
- 				 (bfqq->wr_cur_max_time ==
- 				  bfqd->bfq_wr_rt_max_time &&
- 				  !soft_rt)) {
-@@ -905,6 +1032,7 @@ static void bfq_add_request(struct request *rq)
- 					bfqd->bfq_wr_rt_max_time;
- 			}
- 		}
-+set_prio_changed:
- 		if (old_wr_coeff != bfqq->wr_coeff)
- 			entity->prio_changed = 1;
- add_bfqq_busy:
-@@ -1047,6 +1175,15 @@ static void bfq_merged_request(struct request_queue *q, struct request *req,
- 					 bfqd->last_position);
- 		BUG_ON(!next_rq);
- 		bfqq->next_rq = next_rq;
-+		/*
-+		 * If next_rq changes, update both the queue's budget to
-+		 * fit the new request and the queue's position in its
-+		 * rq_pos_tree.
-+		 */
-+		if (prev != bfqq->next_rq) {
-+			bfq_updated_next_req(bfqd, bfqq);
-+			bfq_pos_tree_add_move(bfqd, bfqq);
-+		}
- 	}
- }
- 
-@@ -1129,11 +1266,346 @@ static void bfq_end_wr(struct bfq_data *bfqd)
- 	spin_unlock_irq(bfqd->queue->queue_lock);
- }
- 
-+static sector_t bfq_io_struct_pos(void *io_struct, bool request)
-+{
-+	if (request)
-+		return blk_rq_pos(io_struct);
-+	else
-+		return ((struct bio *)io_struct)->bi_iter.bi_sector;
-+}
-+
-+static int bfq_rq_close_to_sector(void *io_struct, bool request,
-+				  sector_t sector)
-+{
-+	return abs(bfq_io_struct_pos(io_struct, request) - sector) <=
-+	       BFQQ_SEEK_THR;
-+}
-+
-+static struct bfq_queue *bfqq_find_close(struct bfq_data *bfqd,
-+					 struct bfq_queue *bfqq,
-+					 sector_t sector)
-+{
-+	struct rb_root *root = &bfq_bfqq_to_bfqg(bfqq)->rq_pos_tree;
-+	struct rb_node *parent, *node;
-+	struct bfq_queue *__bfqq;
-+
-+	if (RB_EMPTY_ROOT(root))
-+		return NULL;
-+
-+	/*
-+	 * First, if we find a request starting at the end of the last
-+	 * request, choose it.
-+	 */
-+	__bfqq = bfq_rq_pos_tree_lookup(bfqd, root, sector, &parent, NULL);
-+	if (__bfqq)
-+		return __bfqq;
-+
-+	/*
-+	 * If the exact sector wasn't found, the parent of the NULL leaf
-+	 * will contain the closest sector (rq_pos_tree sorted by
-+	 * next_request position).
-+	 */
-+	__bfqq = rb_entry(parent, struct bfq_queue, pos_node);
-+	if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector))
-+		return __bfqq;
-+
-+	if (blk_rq_pos(__bfqq->next_rq) < sector)
-+		node = rb_next(&__bfqq->pos_node);
-+	else
-+		node = rb_prev(&__bfqq->pos_node);
-+	if (!node)
-+		return NULL;
-+
-+	__bfqq = rb_entry(node, struct bfq_queue, pos_node);
-+	if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector))
-+		return __bfqq;
-+
-+	return NULL;
-+}
-+
-+static struct bfq_queue *bfq_find_close_cooperator(struct bfq_data *bfqd,
-+						   struct bfq_queue *cur_bfqq,
-+						   sector_t sector)
-+{
-+	struct bfq_queue *bfqq;
-+
-+	/*
-+	 * We shall notice if some of the queues are cooperating,
-+	 * e.g., working closely on the same area of the device. In
-+	 * that case, we can group them together and: 1) don't waste
-+	 * time idling, and 2) serve the union of their requests in
-+	 * the best possible order for throughput.
-+	 */
-+	bfqq = bfqq_find_close(bfqd, cur_bfqq, sector);
-+	if (!bfqq || bfqq == cur_bfqq)
-+		return NULL;
-+
-+	return bfqq;
-+}
-+
-+static struct bfq_queue *
-+bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
-+{
-+	int process_refs, new_process_refs;
-+	struct bfq_queue *__bfqq;
-+
-+	/*
-+	 * If there are no process references on the new_bfqq, then it is
-+	 * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain
-+	 * may have dropped their last reference (not just their last process
-+	 * reference).
-+	 */
-+	if (!bfqq_process_refs(new_bfqq))
-+		return NULL;
-+
-+	/* Avoid a circular list and skip interim queue merges. */
-+	while ((__bfqq = new_bfqq->new_bfqq)) {
-+		if (__bfqq == bfqq)
-+			return NULL;
-+		new_bfqq = __bfqq;
-+	}
-+
-+	process_refs = bfqq_process_refs(bfqq);
-+	new_process_refs = bfqq_process_refs(new_bfqq);
-+	/*
-+	 * If the process for the bfqq has gone away, there is no
-+	 * sense in merging the queues.
-+	 */
-+	if (process_refs == 0 || new_process_refs == 0)
-+		return NULL;
-+
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d",
-+		new_bfqq->pid);
-+
-+	/*
-+	 * Merging is just a redirection: the requests of the process
-+	 * owning one of the two queues are redirected to the other queue.
-+	 * The latter queue, in its turn, is set as shared if this is the
-+	 * first time that the requests of some process are redirected to
-+	 * it.
-+	 *
-+	 * We redirect bfqq to new_bfqq and not the opposite, because we
-+	 * are in the context of the process owning bfqq, hence we have
-+	 * the io_cq of this process. So we can immediately configure this
-+	 * io_cq to redirect the requests of the process to new_bfqq.
-+	 *
-+	 * NOTE, even if new_bfqq coincides with the in-service queue, the
-+	 * io_cq of new_bfqq is not available, because, if the in-service
-+	 * queue is shared, bfqd->in_service_bic may not point to the
-+	 * io_cq of the in-service queue.
-+	 * Redirecting the requests of the process owning bfqq to the
-+	 * currently in-service queue is in any case the best option, as
-+	 * we feed the in-service queue with new requests close to the
-+	 * last request served and, by doing so, hopefully increase the
-+	 * throughput.
-+	 */
-+	bfqq->new_bfqq = new_bfqq;
-+	atomic_add(process_refs, &new_bfqq->ref);
-+	return new_bfqq;
-+}
-+
-+static bool bfq_may_be_close_cooperator(struct bfq_queue *bfqq,
-+					struct bfq_queue *new_bfqq)
-+{
-+	if (bfq_class_idle(bfqq) || bfq_class_idle(new_bfqq) ||
-+	    (bfqq->ioprio_class != new_bfqq->ioprio_class))
-+		return false;
-+
-+	/*
-+	 * If either of the queues has already been detected as seeky,
-+	 * then merging it with the other queue is unlikely to lead to
-+	 * sequential I/O.
-+	 */
-+	if (BFQQ_SEEKY(bfqq) || BFQQ_SEEKY(new_bfqq))
-+		return false;
-+
-+	/*
-+	 * Interleaved I/O is known to be done by (some) applications
-+	 * only for reads, so it does not make sense to merge async
-+	 * queues.
-+	 */
-+	if (!bfq_bfqq_sync(bfqq) || !bfq_bfqq_sync(new_bfqq))
-+		return false;
-+
-+	return true;
-+}
-+
-+/*
-+ * Attempt to schedule a merge of bfqq with the currently in-service queue
-+ * or with a close queue among the scheduled queues.
-+ * Return NULL if no merge was scheduled, a pointer to the shared bfq_queue
-+ * structure otherwise.
-+ *
-+ * The OOM queue is not allowed to participate to cooperation: in fact, since
-+ * the requests temporarily redirected to the OOM queue could be redirected
-+ * again to dedicated queues at any time, the state needed to correctly
-+ * handle merging with the OOM queue would be quite complex and expensive
-+ * to maintain. Besides, in such a critical condition as an out of memory,
-+ * the benefits of queue merging may be little relevant, or even negligible.
-+ */
-+static struct bfq_queue *
-+bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+		     void *io_struct, bool request)
-+{
-+	struct bfq_queue *in_service_bfqq, *new_bfqq;
-+
-+	if (bfqq->new_bfqq)
-+		return bfqq->new_bfqq;
-+	if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq))
-+		return NULL;
-+	/* If device has only one backlogged bfq_queue, don't search. */
-+	if (bfqd->busy_queues == 1)
-+		return NULL;
-+
-+	in_service_bfqq = bfqd->in_service_queue;
-+
-+	if (!in_service_bfqq || in_service_bfqq == bfqq ||
-+	    !bfqd->in_service_bic ||
-+	    unlikely(in_service_bfqq == &bfqd->oom_bfqq))
-+		goto check_scheduled;
-+
-+	if (bfq_rq_close_to_sector(io_struct, request, bfqd->last_position) &&
-+	    bfqq->entity.parent == in_service_bfqq->entity.parent &&
-+	    bfq_may_be_close_cooperator(bfqq, in_service_bfqq)) {
-+		new_bfqq = bfq_setup_merge(bfqq, in_service_bfqq);
-+		if (new_bfqq)
-+			return new_bfqq;
-+	}
-+	/*
-+	 * Check whether there is a cooperator among currently scheduled
-+	 * queues. The only thing we need is that the bio/request is not
-+	 * NULL, as we need it to establish whether a cooperator exists.
-+	 */
-+check_scheduled:
-+	new_bfqq = bfq_find_close_cooperator(bfqd, bfqq,
-+			bfq_io_struct_pos(io_struct, request));
-+
-+	BUG_ON(new_bfqq && bfqq->entity.parent != new_bfqq->entity.parent);
-+
-+	if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq) &&
-+	    bfq_may_be_close_cooperator(bfqq, new_bfqq))
-+		return bfq_setup_merge(bfqq, new_bfqq);
-+
-+	return NULL;
-+}
-+
-+static void bfq_bfqq_save_state(struct bfq_queue *bfqq)
-+{
-+	/*
-+	 * If !bfqq->bic, the queue is already shared or its requests
-+	 * have already been redirected to a shared queue; both idle window
-+	 * and weight raising state have already been saved. Do nothing.
-+	 */
-+	if (!bfqq->bic)
-+		return;
-+	if (bfqq->bic->wr_time_left)
-+		/*
-+		 * This is the queue of a just-started process, and would
-+		 * deserve weight raising: we set wr_time_left to the full
-+		 * weight-raising duration to trigger weight-raising when
-+		 * and if the queue is split and the first request of the
-+		 * queue is enqueued.
-+		 */
-+		bfqq->bic->wr_time_left = bfq_wr_duration(bfqq->bfqd);
-+	else if (bfqq->wr_coeff > 1) {
-+		unsigned long wr_duration =
-+			jiffies - bfqq->last_wr_start_finish;
-+		/*
-+		 * It may happen that a queue's weight raising period lasts
-+		 * longer than its wr_cur_max_time, as weight raising is
-+		 * handled only when a request is enqueued or dispatched (it
-+		 * does not use any timer). If the weight raising period is
-+		 * about to end, don't save it.
-+		 */
-+		if (bfqq->wr_cur_max_time <= wr_duration)
-+			bfqq->bic->wr_time_left = 0;
-+		else
-+			bfqq->bic->wr_time_left =
-+				bfqq->wr_cur_max_time - wr_duration;
-+		/*
-+		 * The bfq_queue is becoming shared or the requests of the
-+		 * process owning the queue are being redirected to a shared
-+		 * queue. Stop the weight raising period of the queue, as in
-+		 * both cases it should not be owned by an interactive or
-+		 * soft real-time application.
-+		 */
-+		bfq_bfqq_end_wr(bfqq);
-+	} else
-+		bfqq->bic->wr_time_left = 0;
-+	bfqq->bic->saved_idle_window = bfq_bfqq_idle_window(bfqq);
-+	bfqq->bic->saved_IO_bound = bfq_bfqq_IO_bound(bfqq);
-+	bfqq->bic->saved_in_large_burst = bfq_bfqq_in_large_burst(bfqq);
-+	bfqq->bic->was_in_burst_list = !hlist_unhashed(&bfqq->burst_list_node);
-+	bfqq->bic->cooperations++;
-+	bfqq->bic->failed_cooperations = 0;
-+}
-+
-+static void bfq_get_bic_reference(struct bfq_queue *bfqq)
-+{
-+	/*
-+	 * If bfqq->bic has a non-NULL value, the bic to which it belongs
-+	 * is about to begin using a shared bfq_queue.
-+	 */
-+	if (bfqq->bic)
-+		atomic_long_inc(&bfqq->bic->icq.ioc->refcount);
-+}
-+
-+static void
-+bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
-+		struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
-+{
-+	bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu",
-+		(long unsigned)new_bfqq->pid);
-+	/* Save weight raising and idle window of the merged queues */
-+	bfq_bfqq_save_state(bfqq);
-+	bfq_bfqq_save_state(new_bfqq);
-+	if (bfq_bfqq_IO_bound(bfqq))
-+		bfq_mark_bfqq_IO_bound(new_bfqq);
-+	bfq_clear_bfqq_IO_bound(bfqq);
-+	/*
-+	 * Grab a reference to the bic, to prevent it from being destroyed
-+	 * before being possibly touched by a bfq_split_bfqq().
-+	 */
-+	bfq_get_bic_reference(bfqq);
-+	bfq_get_bic_reference(new_bfqq);
-+	/*
-+	 * Merge queues (that is, let bic redirect its requests to new_bfqq)
-+	 */
-+	bic_set_bfqq(bic, new_bfqq, 1);
-+	bfq_mark_bfqq_coop(new_bfqq);
-+	/*
-+	 * new_bfqq now belongs to at least two bics (it is a shared queue):
-+	 * set new_bfqq->bic to NULL. bfqq either:
-+	 * - does not belong to any bic any more, and hence bfqq->bic must
-+	 *   be set to NULL, or
-+	 * - is a queue whose owning bics have already been redirected to a
-+	 *   different queue, hence the queue is destined to not belong to
-+	 *   any bic soon and bfqq->bic is already NULL (therefore the next
-+	 *   assignment causes no harm).
-+	 */
-+	new_bfqq->bic = NULL;
-+	bfqq->bic = NULL;
-+	bfq_put_queue(bfqq);
-+}
-+
-+static void bfq_bfqq_increase_failed_cooperations(struct bfq_queue *bfqq)
-+{
-+	struct bfq_io_cq *bic = bfqq->bic;
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+
-+	if (bic && bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh) {
-+		bic->failed_cooperations++;
-+		if (bic->failed_cooperations >= bfqd->bfq_failed_cooperations)
-+			bic->cooperations = 0;
-+	}
-+}
-+
- static int bfq_allow_merge(struct request_queue *q, struct request *rq,
- 			   struct bio *bio)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
- 	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq, *new_bfqq;
- 
- 	/*
- 	 * Disallow merge of a sync bio into an async request.
-@@ -1150,7 +1622,26 @@ static int bfq_allow_merge(struct request_queue *q, struct request *rq,
- 	if (!bic)
- 		return 0;
- 
--	return bic_to_bfqq(bic, bfq_bio_sync(bio)) == RQ_BFQQ(rq);
-+	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
-+	/*
-+	 * We take advantage of this function to perform an early merge
-+	 * of the queues of possible cooperating processes.
-+	 */
-+	if (bfqq) {
-+		new_bfqq = bfq_setup_cooperator(bfqd, bfqq, bio, false);
-+		if (new_bfqq) {
-+			bfq_merge_bfqqs(bfqd, bic, bfqq, new_bfqq);
-+			/*
-+			 * If we get here, the bio will be queued in the
-+			 * shared queue, i.e., new_bfqq, so use new_bfqq
-+			 * to decide whether bio and rq can be merged.
-+			 */
-+			bfqq = new_bfqq;
-+		} else
-+			bfq_bfqq_increase_failed_cooperations(bfqq);
-+	}
-+
-+	return bfqq == RQ_BFQQ(rq);
- }
- 
- static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
-@@ -1349,6 +1840,15 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 
- 	__bfq_bfqd_reset_in_service(bfqd);
- 
-+	/*
-+	 * If this bfqq is shared between multiple processes, check
-+	 * to make sure that those processes are still issuing I/Os
-+	 * within the mean seek distance. If not, it may be time to
-+	 * break the queues apart again.
-+	 */
-+	if (bfq_bfqq_coop(bfqq) && BFQQ_SEEKY(bfqq))
-+		bfq_mark_bfqq_split_coop(bfqq);
-+
- 	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
- 		/*
- 		 * Overloading budget_timeout field to store the time
-@@ -1357,8 +1857,13 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		 */
- 		bfqq->budget_timeout = jiffies;
- 		bfq_del_bfqq_busy(bfqd, bfqq, 1);
--	} else
-+	} else {
- 		bfq_activate_bfqq(bfqd, bfqq);
-+		/*
-+		 * Resort priority tree of potential close cooperators.
-+		 */
-+		bfq_pos_tree_add_move(bfqd, bfqq);
-+	}
- }
- 
- /**
-@@ -2242,10 +2747,12 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		/*
- 		 * If the queue was activated in a burst, or
- 		 * too much time has elapsed from the beginning
--		 * of this weight-raising period, then end weight
--		 * raising.
-+		 * of this weight-raising period, or the queue has
-+		 * exceeded the acceptable number of cooperations,
-+		 * then end weight raising.
- 		 */
- 		if (bfq_bfqq_in_large_burst(bfqq) ||
-+		    bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh ||
- 		    time_is_before_jiffies(bfqq->last_wr_start_finish +
- 					   bfqq->wr_cur_max_time)) {
- 			bfqq->last_wr_start_finish = jiffies;
-@@ -2474,6 +2981,25 @@ static void bfq_put_queue(struct bfq_queue *bfqq)
- #endif
- }
- 
-+static void bfq_put_cooperator(struct bfq_queue *bfqq)
-+{
-+	struct bfq_queue *__bfqq, *next;
-+
-+	/*
-+	 * If this queue was scheduled to merge with another queue, be
-+	 * sure to drop the reference taken on that queue (and others in
-+	 * the merge chain). See bfq_setup_merge and bfq_merge_bfqqs.
-+	 */
-+	__bfqq = bfqq->new_bfqq;
-+	while (__bfqq) {
-+		if (__bfqq == bfqq)
-+			break;
-+		next = __bfqq->new_bfqq;
-+		bfq_put_queue(__bfqq);
-+		__bfqq = next;
-+	}
-+}
-+
- static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
- 	if (bfqq == bfqd->in_service_queue) {
-@@ -2484,6 +3010,8 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq,
- 		     atomic_read(&bfqq->ref));
- 
-+	bfq_put_cooperator(bfqq);
-+
- 	bfq_put_queue(bfqq);
- }
- 
-@@ -2492,6 +3020,25 @@ static void bfq_init_icq(struct io_cq *icq)
- 	struct bfq_io_cq *bic = icq_to_bic(icq);
- 
- 	bic->ttime.last_end_request = jiffies;
-+	/*
-+	 * A newly created bic indicates that the process has just
-+	 * started doing I/O, and is probably mapping into memory its
-+	 * executable and libraries: it definitely needs weight raising.
-+	 * There is however the possibility that the process performs,
-+	 * for a while, I/O close to some other process. EQM intercepts
-+	 * this behavior and may merge the queue corresponding to the
-+	 * process  with some other queue, BEFORE the weight of the queue
-+	 * is raised. Merged queues are not weight-raised (they are assumed
-+	 * to belong to processes that benefit only from high throughput).
-+	 * If the merge is basically the consequence of an accident, then
-+	 * the queue will be split soon and will get back its old weight.
-+	 * It is then important to write down somewhere that this queue
-+	 * does need weight raising, even if it did not make it to get its
-+	 * weight raised before being merged. To this purpose, we overload
-+	 * the field raising_time_left and assign 1 to it, to mark the queue
-+	 * as needing weight raising.
-+	 */
-+	bic->wr_time_left = 1;
- }
- 
- static void bfq_exit_icq(struct io_cq *icq)
-@@ -2505,6 +3052,13 @@ static void bfq_exit_icq(struct io_cq *icq)
- 	}
- 
- 	if (bic->bfqq[BLK_RW_SYNC]) {
-+		/*
-+		 * If the bic is using a shared queue, put the reference
-+		 * taken on the io_context when the bic started using a
-+		 * shared bfq_queue.
-+		 */
-+		if (bfq_bfqq_coop(bic->bfqq[BLK_RW_SYNC]))
-+			put_io_context(icq->ioc);
- 		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]);
- 		bic->bfqq[BLK_RW_SYNC] = NULL;
- 	}
-@@ -2809,6 +3363,10 @@ static void bfq_update_idle_window(struct bfq_data *bfqd,
- 	if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq))
- 		return;
- 
-+	/* Idle window just restored, statistics are meaningless. */
-+	if (bfq_bfqq_just_split(bfqq))
-+		return;
-+
- 	enable_idle = bfq_bfqq_idle_window(bfqq);
- 
- 	if (atomic_read(&bic->icq.ioc->active_ref) == 0 ||
-@@ -2856,6 +3414,7 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 ||
- 	    !BFQQ_SEEKY(bfqq))
- 		bfq_update_idle_window(bfqd, bfqq, bic);
-+	bfq_clear_bfqq_just_split(bfqq);
- 
- 	bfq_log_bfqq(bfqd, bfqq,
- 		     "rq_enqueued: idle_window=%d (seeky %d, mean %llu)",
-@@ -2920,12 +3479,47 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- static void bfq_insert_request(struct request_queue *q, struct request *rq)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
--	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq), *new_bfqq;
- 
- 	assert_spin_locked(bfqd->queue->queue_lock);
- 
-+	/*
-+	 * An unplug may trigger a requeue of a request from the device
-+	 * driver: make sure we are in process context while trying to
-+	 * merge two bfq_queues.
-+	 */
-+	if (!in_interrupt()) {
-+		new_bfqq = bfq_setup_cooperator(bfqd, bfqq, rq, true);
-+		if (new_bfqq) {
-+			if (bic_to_bfqq(RQ_BIC(rq), 1) != bfqq)
-+				new_bfqq = bic_to_bfqq(RQ_BIC(rq), 1);
-+			/*
-+			 * Release the request's reference to the old bfqq
-+			 * and make sure one is taken to the shared queue.
-+			 */
-+			new_bfqq->allocated[rq_data_dir(rq)]++;
-+			bfqq->allocated[rq_data_dir(rq)]--;
-+			atomic_inc(&new_bfqq->ref);
-+			bfq_put_queue(bfqq);
-+			if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq)
-+				bfq_merge_bfqqs(bfqd, RQ_BIC(rq),
-+						bfqq, new_bfqq);
-+			rq->elv.priv[1] = new_bfqq;
-+			bfqq = new_bfqq;
-+		} else
-+			bfq_bfqq_increase_failed_cooperations(bfqq);
-+	}
-+
- 	bfq_add_request(rq);
- 
-+	/*
-+	 * Here a newly-created bfq_queue has already started a weight-raising
-+	 * period: clear raising_time_left to prevent bfq_bfqq_save_state()
-+	 * from assigning it a full weight-raising period. See the detailed
-+	 * comments about this field in bfq_init_icq().
-+	 */
-+	if (bfqq->bic)
-+		bfqq->bic->wr_time_left = 0;
- 	rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)];
- 	list_add_tail(&rq->queuelist, &bfqq->fifo);
- 
-@@ -3094,6 +3688,32 @@ static void bfq_put_request(struct request *rq)
- }
- 
- /*
-+ * Returns NULL if a new bfqq should be allocated, or the old bfqq if this
-+ * was the last process referring to said bfqq.
-+ */
-+static struct bfq_queue *
-+bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
-+{
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "splitting queue");
-+
-+	put_io_context(bic->icq.ioc);
-+
-+	if (bfqq_process_refs(bfqq) == 1) {
-+		bfqq->pid = current->pid;
-+		bfq_clear_bfqq_coop(bfqq);
-+		bfq_clear_bfqq_split_coop(bfqq);
-+		return bfqq;
-+	}
-+
-+	bic_set_bfqq(bic, NULL, 1);
-+
-+	bfq_put_cooperator(bfqq);
-+
-+	bfq_put_queue(bfqq);
-+	return NULL;
-+}
-+
-+/*
-  * Allocate bfq data structures associated with this request.
-  */
- static int bfq_set_request(struct request_queue *q, struct request *rq,
-@@ -3105,6 +3725,7 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	const int is_sync = rq_is_sync(rq);
- 	struct bfq_queue *bfqq;
- 	unsigned long flags;
-+	bool split = false;
- 
- 	might_sleep_if(gfpflags_allow_blocking(gfp_mask));
- 
-@@ -3117,15 +3738,30 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 
- 	bfq_bic_update_cgroup(bic, bio);
- 
-+new_queue:
- 	bfqq = bic_to_bfqq(bic, is_sync);
- 	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
- 		bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, gfp_mask);
- 		bic_set_bfqq(bic, bfqq, is_sync);
--		if (is_sync) {
--			if (bfqd->large_burst)
-+		if (split && is_sync) {
-+			if ((bic->was_in_burst_list && bfqd->large_burst) ||
-+			    bic->saved_in_large_burst)
- 				bfq_mark_bfqq_in_large_burst(bfqq);
--			else
--				bfq_clear_bfqq_in_large_burst(bfqq);
-+			else {
-+			    bfq_clear_bfqq_in_large_burst(bfqq);
-+			    if (bic->was_in_burst_list)
-+			       hlist_add_head(&bfqq->burst_list_node,
-+				              &bfqd->burst_list);
-+			}
-+		}
-+	} else {
-+		/* If the queue was seeky for too long, break it apart. */
-+		if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) {
-+			bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq");
-+			bfqq = bfq_split_bfqq(bic, bfqq);
-+			split = true;
-+			if (!bfqq)
-+				goto new_queue;
- 		}
- 	}
- 
-@@ -3137,6 +3773,26 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	rq->elv.priv[0] = bic;
- 	rq->elv.priv[1] = bfqq;
- 
-+	/*
-+	 * If a bfq_queue has only one process reference, it is owned
-+	 * by only one bfq_io_cq: we can set the bic field of the
-+	 * bfq_queue to the address of that structure. Also, if the
-+	 * queue has just been split, mark a flag so that the
-+	 * information is available to the other scheduler hooks.
-+	 */
-+	if (likely(bfqq != &bfqd->oom_bfqq) && bfqq_process_refs(bfqq) == 1) {
-+		bfqq->bic = bic;
-+		if (split) {
-+			bfq_mark_bfqq_just_split(bfqq);
-+			/*
-+			 * If the queue has just been split from a shared
-+			 * queue, restore the idle window and the possible
-+			 * weight raising period.
-+			 */
-+			bfq_bfqq_resume_state(bfqq, bic);
-+		}
-+	}
-+
- 	spin_unlock_irqrestore(q->queue_lock, flags);
- 
- 	return 0;
-@@ -3290,6 +3946,7 @@ static void bfq_init_root_group(struct bfq_group *root_group,
- 	root_group->my_entity = NULL;
- 	root_group->bfqd = bfqd;
- #endif
-+	root_group->rq_pos_tree = RB_ROOT;
- 	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
- 		root_group->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
- }
-@@ -3370,6 +4027,8 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
- 	bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async;
- 	bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync;
- 
-+	bfqd->bfq_coop_thresh = 2;
-+	bfqd->bfq_failed_cooperations = 7000;
- 	bfqd->bfq_requests_within_timer = 120;
- 
- 	bfqd->bfq_large_burst_thresh = 11;
-diff --git a/block/bfq.h b/block/bfq.h
-index 3bb7df2..32dfcee 100644
---- a/block/bfq.h
-+++ b/block/bfq.h
-@@ -183,6 +183,8 @@ struct bfq_group;
-  *                    ioprio_class value.
-  * @new_bfqq: shared bfq_queue if queue is cooperating with
-  *           one or more other queues.
-+ * @pos_node: request-position tree member (see bfq_group's @rq_pos_tree).
-+ * @pos_root: request-position tree root (see bfq_group's @rq_pos_tree).
-  * @sort_list: sorted list of pending requests.
-  * @next_rq: if fifo isn't expired, next request to serve.
-  * @queued: nr of requests queued in @sort_list.
-@@ -304,6 +306,26 @@ struct bfq_ttime {
-  * @ttime: associated @bfq_ttime struct
-  * @ioprio: per (request_queue, blkcg) ioprio.
-  * @blkcg_id: id of the blkcg the related io_cq belongs to.
-+ * @wr_time_left: snapshot of the time left before weight raising ends
-+ *                for the sync queue associated to this process; this
-+ *		  snapshot is taken to remember this value while the weight
-+ *		  raising is suspended because the queue is merged with a
-+ *		  shared queue, and is used to set @raising_cur_max_time
-+ *		  when the queue is split from the shared queue and its
-+ *		  weight is raised again
-+ * @saved_idle_window: same purpose as the previous field for the idle
-+ *                     window
-+ * @saved_IO_bound: same purpose as the previous two fields for the I/O
-+ *                  bound classification of a queue
-+ * @saved_in_large_burst: same purpose as the previous fields for the
-+ *                        value of the field keeping the queue's belonging
-+ *                        to a large burst
-+ * @was_in_burst_list: true if the queue belonged to a burst list
-+ *                     before its merge with another cooperating queue
-+ * @cooperations: counter of consecutive successful queue merges underwent
-+ *                by any of the process' @bfq_queues
-+ * @failed_cooperations: counter of consecutive failed queue merges of any
-+ *                       of the process' @bfq_queues
-  */
- struct bfq_io_cq {
- 	struct io_cq icq; /* must be the first member */
-@@ -314,6 +336,16 @@ struct bfq_io_cq {
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	uint64_t blkcg_id; /* the current blkcg ID */
- #endif
-+
-+	unsigned int wr_time_left;
-+	bool saved_idle_window;
-+	bool saved_IO_bound;
-+
-+	bool saved_in_large_burst;
-+	bool was_in_burst_list;
-+
-+	unsigned int cooperations;
-+	unsigned int failed_cooperations;
- };
- 
- enum bfq_device_speed {
-@@ -557,6 +589,9 @@ enum bfqq_state_flags {
- 					 * may need softrt-next-start
- 					 * update
- 					 */
-+	BFQ_BFQQ_FLAG_coop,		/* bfqq is shared */
-+	BFQ_BFQQ_FLAG_split_coop,	/* shared bfqq will be split */
-+	BFQ_BFQQ_FLAG_just_split,	/* queue has just been split */
- };
- 
- #define BFQ_BFQQ_FNS(name)						\
-@@ -583,6 +618,9 @@ BFQ_BFQQ_FNS(budget_new);
- BFQ_BFQQ_FNS(IO_bound);
- BFQ_BFQQ_FNS(in_large_burst);
- BFQ_BFQQ_FNS(constantly_seeky);
-+BFQ_BFQQ_FNS(coop);
-+BFQ_BFQQ_FNS(split_coop);
-+BFQ_BFQQ_FNS(just_split);
- BFQ_BFQQ_FNS(softrt_update);
- #undef BFQ_BFQQ_FNS
- 
-@@ -675,6 +713,9 @@ struct bfq_group_data {
-  *                   are groups with more than one active @bfq_entity
-  *                   (see the comments to the function
-  *                   bfq_bfqq_must_not_expire()).
-+ * @rq_pos_tree: rbtree sorted by next_request position, used when
-+ *               determining if two or more queues have interleaving
-+ *               requests (see bfq_find_close_cooperator()).
-  *
-  * Each (device, cgroup) pair has its own bfq_group, i.e., for each cgroup
-  * there is a set of bfq_groups, each one collecting the lower-level
-@@ -701,6 +742,8 @@ struct bfq_group {
- 
- 	int active_entities;
- 
-+	struct rb_root rq_pos_tree;
-+
- 	struct bfqg_stats stats;
- 	struct bfqg_stats dead_stats;	/* stats pushed from dead children */
- };
-@@ -711,6 +754,8 @@ struct bfq_group {
- 
- 	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
- 	struct bfq_queue *async_idle_bfqq;
-+
-+	struct rb_root rq_pos_tree;
- };
- #endif
- 
-@@ -787,6 +832,27 @@ static void bfq_put_bfqd_unlock(struct bfq_data *bfqd, unsigned long *flags)
- 	spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
- }
- 
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+
-+static struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *group_entity = bfqq->entity.parent;
-+
-+	if (!group_entity)
-+		group_entity = &bfqq->bfqd->root_group->entity;
-+
-+	return container_of(group_entity, struct bfq_group, entity);
-+}
-+
-+#else
-+
-+static struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq)
-+{
-+	return bfqq->bfqd->root_group;
-+}
-+
-+#endif
-+
- static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio);
- static void bfq_put_queue(struct bfq_queue *bfqq);
- static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
--- 
-1.9.1
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/10-calculate-x86-4.4 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/10-calculate-x86-4.4
deleted file mode 100644
index 0af0a4b98..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/10-calculate-x86-4.4
+++ /dev/null
@@ -1,3408 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==i686
-CONFIG_3C515=m
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_ALS=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_IPMI is not set
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-# CONFIG_ALIENWARE_WMI is not set
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-CONFIG_APM_ALLOW_INTS=y
-CONFIG_APM_CPU_IDLE=y
-CONFIG_APM_DISPLAY_BLANK=y
-CONFIG_APM_DO_ENABLE=y
-CONFIG_APM_IGNORE_USER_SUSPEND=y
-CONFIG_APM=m
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASN1=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_CARDS=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_AURORA_NB8800=m
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7038_WDT=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMGENET=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_VXLAN=y
-CONFIG_BH1750=m
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BINFMT_AOUT=y
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-CONFIG_BMC150_MAGN=m
-# CONFIG_BMG160 is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_RTL=m
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-# CONFIG_CARL9170 is not set
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_CGROUP_FREEZER is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_SMB311=y
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_UPCALL=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLZ_TAB=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPUSETS is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CS89x0=m
-CONFIG_CS89x0_PLATFORM=y
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DGAP is not set
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-CONFIG_DMA_ENGINE=y
-# CONFIG_DMATEST is not set
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DTLK is not set
-CONFIG_DUMMY=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
-# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CXD2820R=m
-# CONFIG_DVB_DDBRIDGE is not set
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-# CONFIG_DVB_NGENE is not set
-CONFIG_DVB_NXT200X=m
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-CONFIG_DVB_PLL=m
-# CONFIG_DVB_PLUTO2 is not set
-# CONFIG_DVB_PT1 is not set
-# CONFIG_DVB_PT3 is not set
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-# CONFIG_DVB_TTUSB_BUDGET is not set
-# CONFIG_DVB_TTUSB_DEC is not set
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_FAKE_MEMMAP=y
-CONFIG_EFI_MAX_FAKE_MEM=8
-CONFIG_EFI_PGT_DUMP=y
-CONFIG_EFI_STUB=y
-# CONFIG_EFI_VARS is not set
-CONFIG_EISA_NAMES=y
-CONFIG_EISA_PCI_EISA=y
-CONFIG_EISA_VIRTUAL_ROOT=y
-# CONFIG_EISA_VLB_PRIMING is not set
-CONFIG_EISA=y
-CONFIG_EL3=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_EFI is not set
-# CONFIG_FB_SM750 is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_FRAME_WARN=1024
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FTRACE is not set
-CONFIG_FUJITSU_ES=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_PHY=y
-# CONFIG_GENEVE is not set
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-# CONFIG_HDC100X is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_CORSAIR=y
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GENERIC=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-# CONFIG_HIGHPTE is not set
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HP100=m
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_EG20T=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-# CONFIG_I2C_PCA_ISA is not set
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I40E_VXLAN=y
-CONFIG_I6300ESB_WDT=m
-CONFIG_I82092=m
-# CONFIG_I82365 is not set
-CONFIG_I8K=m
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO=m
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-CONFIG_IIO_SYSFS_TRIGGER=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_LRO=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_IDLE=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-# CONFIG_INV_MPU6050_IIO is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_ILA=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_ISAPNP=y
-CONFIG_ISA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_UAPSD is not set
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_KERNEL_XZ=y
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_ASYNC_PF=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-CONFIG_LANCE=m
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-# CONFIG_LGUEST_GUEST is not set
-CONFIG_LGUEST=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_LLC=m
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-# CONFIG_M62332 is not set
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX517 is not set
-CONFIG_MAX63XX_WATCHDOG=m
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-# CONFIG_MEMCG_KMEM is not set
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIXCOMWD is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-# CONFIG_MLX90614 is not set
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SWITCHX2=m
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC35240=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_MTK=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MOST is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_MPILIB=m
-# CONFIG_MPL115 is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MT7601U=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-# CONFIG_MXC4005 is not set
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_NET_VRF=m
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NI65=m
-CONFIG_NILFS2_FS=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-CONFIG_NVM_DEBUG=y
-CONFIG_NVM_GENNVM=m
-CONFIG_NVM_RRPC=m
-CONFIG_NVM=y
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-# CONFIG_OPT3001 is not set
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-# CONFIG_PA12203001 is not set
-CONFIG_PACKET=m
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_ISAPNP is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_QDI is not set
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-# CONFIG_PATA_WINBOND_VLB is not set
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCH_DMA=m
-CONFIG_PCH_GBE=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCI_ATS=y
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-CONFIG_PCI_IOV=y
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-# CONFIG_PCWATCHDOG is not set
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_PHY_TUSB1210=m
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-# CONFIG_PM_TRACE_RTC is not set
-# CONFIG_PNPBIOS is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PVPANIC=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-CONFIG_QEDE=m
-CONFIG_QED=m
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-# CONFIG_QLCNIC_VXLAN is not set
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_R8723AU=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_LZO=y
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-CONFIG_RD_XZ=y
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPR0521 is not set
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC7240_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-# CONFIG_SCSI_DTC3280 is not set
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IN2000 is not set
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_SNIC=m
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-# CONFIG_SCSI_SYM53C416 is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SCx200_ACB=m
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMC9194=m
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_SMS_SIANO_MDTV=m
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_AD1889=m
-CONFIG_SND_ADLIB=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_MSND_PINNACLE=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_SCS1X=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_SSCAPE=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_HOST_SOC=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STK3310=m
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
-CONFIG_TAHVO_USB=m
-CONFIG_TC1100_WMI=m
-# CONFIG_TCIC is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-# CONFIG_TI_ADC081C is not set
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA=m
-CONFIG_TOSHIBA_WMI=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_TTPCI_EEPROM is not set
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TUN_VNET_CROSS_LE=y
-CONFIG_TYPHOON=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_ULTRA=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_US5182D is not set
-CONFIG_USB_ACM=m
-# CONFIG_USB_AIRSPY is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-CONFIG_USB_FUSB300=m
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-# CONFIG_USB_HACKRF is not set
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSO=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USERIO=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_RING=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-# CONFIG_VIDEO_CX25821 is not set
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_CONSOLE is not set
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-# CONFIG_VZ89X is not set
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WD80x3=m
-# CONFIG_WDT is not set
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-# CONFIG_WILC1000_DRIVER is not set
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_WIMAX_GDM72XX_USB=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_WL_MEDIATEK=y
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_X86_APM_BOOT=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_CPUID=m
-CONFIG_X86_E_POWERSAVER=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_PTDUMP_CORE=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_ZPOOL=y
-CONFIG_ZRAM_LZ4_COMPRESS=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_AMD_MCE_INJ=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_ENTRY=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_HIGHMEM=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RODATA=
-!CONFIG_DEBUG_RODATA_TEST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DEBUG_WX=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_DRM_I810=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT2=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HPET_MMAP=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM800=
-!CONFIG_MFD_88PM805=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_AXP20X=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_DA9062=
-!CONFIG_MFD_DA9063=
-!CONFIG_MFD_DA9150=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX14577=
-!CONFIG_MFD_MAX77693=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8907=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_RT5033=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MMIOTRACE=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_PID_CPUSET=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_EQS_DEBUG=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_FSL=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_STATIC_KEYS_SELFTEST=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_CDG=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GOODIX=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_PROPERTIES=
-!CONFIG_TOUCHSCREEN_ROHM_BU21023=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2004=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TOUCHSCREEN_WDT87XX_I2C=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_X86_32_NON_STANDARD=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_FPU=
-!CONFIG_X86_DEBUG_STATIC_CPU_HAS=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_INTEL_MID=
-!CONFIG_X86_INTEL_QUARK=
-!CONFIG_X86_INTEL_USERCOPY=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_RDC321X=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/10-calculate-x86_64-4.4 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/10-calculate-x86_64-4.4
deleted file mode 100644
index 7136ba41e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/10-calculate-x86_64-4.4
+++ /dev/null
@@ -1,3276 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==x86_64
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_ALS=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AMD8111_ETH=m
-# CONFIG_AMD_IOMMU is not set
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASN1=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_CARDS=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_AURORA_NB8800=m
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7038_WDT=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMGENET=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_VXLAN=y
-CONFIG_BH1750=m
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-CONFIG_BMC150_MAGN=m
-# CONFIG_BMG160 is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_RTL=m
-CONFIG_BTT=y
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-# CONFIG_CARL9170 is not set
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_CGROUP_FREEZER is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_SMB311=y
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_UPCALL=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLZ_TAB=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPUSETS is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA1_MB=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-# CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCA=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-# CONFIG_DEVFREQ_GOV_USERSPACE is not set
-# CONFIG_DGAP is not set
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DMA_ENGINE=y
-# CONFIG_DMATEST is not set
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_AMDGPU_CIK=y
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DUMMY=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
-# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CXD2820R=m
-# CONFIG_DVB_DDBRIDGE is not set
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-# CONFIG_DVB_NGENE is not set
-CONFIG_DVB_NXT200X=m
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-CONFIG_DVB_PLL=m
-# CONFIG_DVB_PLUTO2 is not set
-# CONFIG_DVB_PT1 is not set
-# CONFIG_DVB_PT3 is not set
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-# CONFIG_DVB_TTUSB_BUDGET is not set
-# CONFIG_DVB_TTUSB_DEC is not set
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_FAKE_MEMMAP=y
-CONFIG_EFI_MAX_FAKE_MEM=8
-CONFIG_EFI_MIXED=y
-CONFIG_EFI_PGT_DUMP=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_VARS=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SM750 is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_FRAME_WARN=1024
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FTRACE is not set
-CONFIG_FUJITSU_ES=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-CONFIG_GART_IOMMU=y
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_PHY=y
-CONFIG_GENEVE=m
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-# CONFIG_HDC100X is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_CORSAIR=y
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HP100=m
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I40E_VXLAN=y
-CONFIG_I6300ESB_WDT=m
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-CONFIG_I82092=m
-CONFIG_I8K=m
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO=m
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-CONFIG_IIO_SYSFS_TRIGGER=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_LRO=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_IDLE=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IOATDMA=m
-# CONFIG_INTEL_IOMMU is not set
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_MIC_BUS=m
-# CONFIG_INTEL_MIC_X100_DMA is not set
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-# CONFIG_INV_MPU6050_IIO is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_ILA=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_UAPSD is not set
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_KERNEL_XZ=y
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_KVM_COMPAT=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-CONFIG_LIBNVDIMM=y
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_LIQUIDIO=m
-CONFIG_LLC=m
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-# CONFIG_M62332 is not set
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX517 is not set
-CONFIG_MAX63XX_WATCHDOG=m
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-# CONFIG_MEMCG_KMEM is not set
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-# CONFIG_MLX90614 is not set
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SWITCHX2=m
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC35240=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_MTK=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MOST is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_MPILIB=m
-# CONFIG_MPL115 is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MT7601U=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-# CONFIG_MXC4005 is not set
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_ND_BLK=m
-CONFIG_ND_BTT=m
-CONFIG_ND_CLAIM=y
-CONFIG_NE2K_PCI=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VRF=m
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NILFS2_FS=m
-CONFIG_NIU=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-# CONFIG_NO_HZ is not set
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-# CONFIG_NTP_PPS is not set
-# CONFIG_NUMA is not set
-CONFIG_NVM_DEBUG=y
-CONFIG_NVM_GENNVM=m
-CONFIG_NVM_RRPC=m
-CONFIG_NVM=y
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-# CONFIG_OPT3001 is not set
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-# CONFIG_PA12203001 is not set
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-CONFIG_PCI_IOV=y
-# CONFIG_PCI_PASID is not set
-CONFIG_PCIPCWATCHDOG=m
-# CONFIG_PCI_PRI is not set
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_PHY_TUSB1210=m
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PVPANIC=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-CONFIG_QEDE=m
-CONFIG_QED=m
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-# CONFIG_QLCNIC_VXLAN is not set
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_R8723AU=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPR0521 is not set
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_SNIC=m
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_SMS_SIANO_MDTV=m
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SCS1X=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SONICVIBES=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_HOST_SOC=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STK3310=m
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
-CONFIG_TAHVO_USB=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-# CONFIG_TI_ADC081C is not set
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_TTPCI_EEPROM is not set
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TUN_VNET_CROSS_LE=y
-CONFIG_TYPHOON=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_US5182D is not set
-CONFIG_USB_ACM=m
-# CONFIG_USB_AIRSPY is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_PRINTER=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-# CONFIG_USB_HACKRF is not set
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSO=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USERIO=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_RING=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-# CONFIG_VIDEO_CX25821 is not set
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_CONSOLE is not set
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-# CONFIG_VZ89X is not set
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-# CONFIG_WILC1000_DRIVER is not set
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_WIMAX_GDM72XX_USB=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_WL_MEDIATEK=y
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUID=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_PTDUMP_CORE=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_X2APIC=y
-CONFIG_X86_X32=y
-# CONFIG_XEN is not set
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_ZPOOL=y
-CONFIG_ZRAM_LZ4_COMPRESS=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_ACPI_NUMA=
-!CONFIG_AMD_IOMMU_STATS=
-!CONFIG_AMD_IOMMU_V2=
-!CONFIG_AMD_MCE_INJ=
-!CONFIG_AMD_NUMA=
-!CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_ENTRY=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RODATA=
-!CONFIG_DEBUG_RODATA_TEST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DEBUG_WX=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_DMAR_TABLE=
-!CONFIG_DRM_I810=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT2=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HAVE_INTEL_TXT=
-!CONFIG_HPET_MMAP=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTEL_IOMMU_DEFAULT_ON=
-!CONFIG_INTEL_IOMMU_FLOPPY_WA=
-!CONFIG_INTEL_IOMMU_SVM=
-!CONFIG_INTEL_TXT=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IOMMU_API=
-!CONFIG_IOMMU_IOVA=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MAXSMP=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM800=
-!CONFIG_MFD_88PM805=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_AXP20X=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_DA9062=
-!CONFIG_MFD_DA9063=
-!CONFIG_MFD_DA9150=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX14577=
-!CONFIG_MFD_MAX77693=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8907=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_RT5033=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MMIOTRACE=
-!CONFIG_MOVABLE_NODE=
-!CONFIG_NEED_MULTIPLE_NODES=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NODES_SHIFT=
-!CONFIG_NODES_SPAN_OTHER_NODES=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_NUMA_BALANCING=
-!CONFIG_NUMA_EMU=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_PID_CPUSET=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_EQS_DEBUG=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_FSL=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_STATIC_KEYS_SELFTEST=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_CDG=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GOODIX=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_PROPERTIES=
-!CONFIG_TOUCHSCREEN_ROHM_BU21023=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2004=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TOUCHSCREEN_WDT87XX_I2C=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_USE_PERCPU_NUMA_NODE_ID=
-!CONFIG_VFIO=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_X86_64_ACPI_NUMA=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_FPU=
-!CONFIG_X86_DEBUG_STATIC_CPU_HAS=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_VSMP=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-bfq b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-bfq
deleted file mode 100644
index 4d68c0baf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-bfq
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==desktop
-CONFIG_BFQ_GROUP_IOSCHED=y
-CONFIG_DEFAULT_BFQ=y
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_IOSCHED="bfq"
-CONFIG_IOSCHED_BFQ=y
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-hyperv b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-hyperv
deleted file mode 100644
index b499ead54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-hyperv
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-CONFIG_FB_HYPERV=m
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_UTILS=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-usbip b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-usbip
deleted file mode 100644
index cb407c238..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/30-usbip
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kernel name=.config
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VHCI_HCD=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/4300-overlayfs_whiteout.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/4300-overlayfs_whiteout.patch
deleted file mode 100644
index dc73bd84f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/4300-overlayfs_whiteout.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-# Calculate format=diff
-After rename file dentry still holds reference to lower dentry from
-previous location. This doesn't matter for data access because data
-cames from upper dentry. But this stale lower dentry taints dentry
-at new location and turns it into non-pure upper. Such file leaves
-visible whiteout entry after remove in directory which shouldn't
-have whiteouts at all.
-
-Overlayfs already tracks pureness of file location in oe->opaque.
-This patch just uses that for detecting actual path type.
-
-Comment from Vivek Goyal's patch:
-
-Here are the details of the problem. Do following.
-
-$ mkdir upper lower work merged upper/dir/
-$ touch lower/test
-$ sudo mount -t overlay overlay -olowerdir=lower,upperdir=upper,workdir=work
-merged
-$ mv merged/test merged/dir/
-$ rm merged/dir/test
-$ ls -l merged/dir/
-/usr/bin/ls: cannot access merged/dir/test: No such file or directory
-total 0
-c????????? ? ? ? ?            ? test
-Basic problem seems to be that once a file has been unlinked, a
-whiteout has been left behind which was not needed and hence it becomes
-visible.
-
-whiteout is visible because parent dir is of not type MERGE, hence
-od->is_real is set during ovl_dir_open(). And that means ovl_iterate()
-passes on iterate handling directly to underlying fs. Underlying fs does
-not know/filter whiteouts so it becomes visible to user.
-
-Why did we leave a whiteout to begin with when we should not have.
-ovl_do_remove() checks for OVL_TYPE_PURE_UPPER() and does not leave
-whiteout if file is pure upper. In this case file is not found to be
-pure upper hence whiteout is left.
-
-So why file was not PURE_UPPER in this case? I think because dentry is
-still carrying some leftover state which was valid before rename. For example,
-od->numlower was set to 1 as it was a lower file. After rename, this state
-is not valid anymore as there is no such file in lower.
-
-Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
-Reported-by: Viktor Stanchev <me@viktorstanchev.com>
-Diagnosed-by: Vivek Goyal <vgoyal@redhat.com>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=109611
----
- fs/overlayfs/dir.c   |    7 +++++++
- fs/overlayfs/super.c |   12 +++++++-----
- 2 files changed, 14 insertions(+), 5 deletions(-)
-diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
-index ed95272d57a6..edf83f325bca 100644
---- a/fs/overlayfs/dir.c
-+++ b/fs/overlayfs/dir.c
-@@ -903,6 +903,13 @@ static int ovl_rename2(struct inode *olddir, struct dentry *old,
- 	if (!overwrite && new_is_dir && !old_opaque && new_opaque)
- 		ovl_remove_opaque(newdentry);
- 
-+	/*
-+	 * Old dentry now lives in different location. Dentries in
-+	 * lowerstack are stale. We cannot drop them here because
-+	 * access to them is lockless. This could be only pure upper
-+	 * or opaque directory - numlower is zero. Or upper non-dir
-+	 * entry - its pureness is tracked by flag opaque.
-+	 */
- 	if (old_opaque != new_opaque) {
- 		ovl_dentry_set_opaque(old, new_opaque);
- 		if (!overwrite)
-diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index 8d826bd56b26..ba28b007005e 100644
---- a/fs/overlayfs/super.c
-+++ b/fs/overlayfs/super.c
-@@ -76,12 +76,14 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
- 	if (oe->__upperdentry) {
- 		type = __OVL_PATH_UPPER;
- 
--		if (oe->numlower) {
--			if (S_ISDIR(dentry->d_inode->i_mode))
--				type |= __OVL_PATH_MERGE;
--		} else if (!oe->opaque) {
-+		/*
-+		 * Non-dir dentry can hold lower dentry from previous
-+		 * location. Its purity depends only on opaque flag.
-+		 */
-+		if (oe->numlower && S_ISDIR(dentry->d_inode->i_mode))
-+			type |= __OVL_PATH_MERGE;
-+		else if (!oe->opaque)
- 			type |= __OVL_PATH_PURE;
--		}
- 	} else {
- 		if (oe->numlower > 1)
- 			type |= __OVL_PATH_MERGE;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-dvb b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-dvb
deleted file mode 100644
index dc9f72525..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-dvb
+++ /dev/null
@@ -1,62 +0,0 @@
-# Calculate format=kernel name=.config
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_B2C2_FLEXCOP=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_TC90522=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_VES1X93=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_TTPCI_EEPROM=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_DVB_A8293=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_DVB_S921=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_SMS_USB_DRV=m
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_HACKRF=m
-CONFIG_VIDEO_EM28XX_DVB=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-ipmi b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-ipmi
deleted file mode 100644
index 5b59230d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-ipmi
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=kernel name=.config
-# CONFIG_ACPI_IPMI is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-# CONFIG_USBIP_DEBUG is not set
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-lxc b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-lxc
deleted file mode 100644
index 0d0716e80..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-lxc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate format=kernel name=.config
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CPUSETS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_MEMCG_KMEM=y
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_PACKET_DIAG=m
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_UNIX_DIAG=m
-CONFIG_VETH=m
-CONFIG_XFRM_USER=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-qemu-user-agent b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-qemu-user-agent
deleted file mode 100644
index c0f03a0a4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/50-update-qemu-user-agent
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate format=kernel name=.config
-CONFIG_VIRTIO_CONSOLE=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/90-server b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/90-server
deleted file mode 100644
index 1d1a4e7ba..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/90-server
+++ /dev/null
@@ -1,362 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-# CONFIG_CYPRESS_FIRMWARE is not set
-# CONFIG_DRM_I810 is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_HZ_300=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_PCI_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_USB_SUPPORT is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-CONFIG_TREE_RCU=y
-# CONFIG_TTPCI_EEPROM is not set
-!CONFIG_DVB_AF9013=
-!CONFIG_DVB_AF9033=
-!CONFIG_DVB_AS102=
-!CONFIG_DVB_AS102_FE=
-!CONFIG_DVB_AU8522=
-!CONFIG_DVB_AU8522_DTV=
-!CONFIG_DVB_AU8522_V4L=
-!CONFIG_DVB_AV7110=
-!CONFIG_DVB_AV7110_IR=
-!CONFIG_DVB_AV7110_OSD=
-!CONFIG_DVB_B2C2_FLEXCOP=
-!CONFIG_DVB_B2C2_FLEXCOP_PCI=
-!CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG=
-!CONFIG_DVB_B2C2_FLEXCOP_USB=
-!CONFIG_DVB_BCM3510=
-!CONFIG_DVB_BUDGET=
-!CONFIG_DVB_BUDGET_AV=
-!CONFIG_DVB_BUDGET_CORE=
-!CONFIG_DVB_BUDGET_PATCH=
-!CONFIG_DVB_CORE=
-!CONFIG_DVB_CX24116=
-!CONFIG_DVB_CX24120=
-!CONFIG_DVB_CX24123=
-!CONFIG_DVB_CXD2820R=
-!CONFIG_DVB_DDBRIDGE=
-!CONFIG_DVB_DRXK=
-!CONFIG_DVB_DYNAMIC_MINORS=
-!CONFIG_DVB_EC100=
-!CONFIG_DVB_FIREDTV=
-!CONFIG_DVB_ISL6405=
-!CONFIG_DVB_ISL6421=
-!CONFIG_DVB_ISL6423=
-!CONFIG_DVB_L64781=
-!CONFIG_DVB_LG2160=
-!CONFIG_DVB_LGDT3305=
-!CONFIG_DVB_LGDT330X=
-!CONFIG_DVB_LNBP21=
-!CONFIG_DVB_M88DS3103=
-!CONFIG_DVB_MAX_ADAPTERS=
-!CONFIG_DVB_MT312=
-!CONFIG_DVB_MT352=
-!CONFIG_DVB_NET=
-!CONFIG_DVB_NGENE=
-!CONFIG_DVB_NXT200X=
-!CONFIG_DVB_PLATFORM_DRIVERS=
-!CONFIG_DVB_PLL=
-!CONFIG_DVB_PLUTO2=
-!CONFIG_DVB_PT1=
-!CONFIG_DVB_PT3=
-!CONFIG_DVB_RTL2830=
-!CONFIG_DVB_RTL2832=
-!CONFIG_DVB_RTL2832_SDR=
-!CONFIG_DVB_S5H1409=
-!CONFIG_DVB_S5H1411=
-!CONFIG_DVB_S5H1420=
-!CONFIG_DVB_SI2168=
-!CONFIG_DVB_SP2=
-!CONFIG_DVB_SP8870=
-!CONFIG_DVB_STB0899=
-!CONFIG_DVB_STV0297=
-!CONFIG_DVB_STV0299=
-!CONFIG_DVB_STV0900=
-!CONFIG_DVB_STV090x=
-!CONFIG_DVB_STV6110=
-!CONFIG_DVB_STV6110x=
-!CONFIG_DVB_TC90522=
-!CONFIG_DVB_TDA10021=
-!CONFIG_DVB_TDA10023=
-!CONFIG_DVB_TDA10048=
-!CONFIG_DVB_TDA1004X=
-!CONFIG_DVB_TDA10086=
-!CONFIG_DVB_TDA18271C2DD=
-!CONFIG_DVB_TDA8083=
-!CONFIG_DVB_TDA8261=
-!CONFIG_DVB_TDA826X=
-!CONFIG_DVB_TS2020=
-!CONFIG_DVB_TTUSB_BUDGET=
-!CONFIG_DVB_TTUSB_DEC=
-!CONFIG_DVB_TUA6100=
-!CONFIG_DVB_TUNER_CX24113=
-!CONFIG_DVB_TUNER_ITD1000=
-!CONFIG_DVB_USB_AF9015=
-!CONFIG_DVB_USB_AF9035=
-!CONFIG_DVB_USB_ANYSEE=
-!CONFIG_DVB_USB_AU6610=
-!CONFIG_DVB_USB_AZ6007=
-!CONFIG_DVB_USB_CE6230=
-!CONFIG_DVB_USB_DVBSKY=
-!CONFIG_DVB_USB_EC168=
-!CONFIG_DVB_USB_GL861=
-!CONFIG_DVB_USB_MXL111SF=
-!CONFIG_DVB_USB_RTL28XXU=
-!CONFIG_DVB_USB_V2=
-!CONFIG_DVB_VES1820=
-!CONFIG_DVB_VES1X93=
-!CONFIG_DVB_ZL10036=
-!CONFIG_DVB_ZL10039=
-!CONFIG_DVB_ZL10353=
-!CONFIG_FRAME_VECTOR=
-!CONFIG_JOYSTICK_A3D=
-!CONFIG_JOYSTICK_ADI=
-!CONFIG_JOYSTICK_ANALOG=
-!CONFIG_JOYSTICK_AS5011=
-!CONFIG_JOYSTICK_COBRA=
-!CONFIG_JOYSTICK_DB9=
-!CONFIG_JOYSTICK_GAMECON=
-!CONFIG_JOYSTICK_GF2K=
-!CONFIG_JOYSTICK_GRIP=
-!CONFIG_JOYSTICK_GRIP_MP=
-!CONFIG_JOYSTICK_GUILLEMOT=
-!CONFIG_JOYSTICK_IFORCE=
-!CONFIG_JOYSTICK_IFORCE_232=
-!CONFIG_JOYSTICK_IFORCE_USB=
-!CONFIG_JOYSTICK_INTERACT=
-!CONFIG_JOYSTICK_JOYDUMP=
-!CONFIG_JOYSTICK_MAGELLAN=
-!CONFIG_JOYSTICK_SIDEWINDER=
-!CONFIG_JOYSTICK_SPACEBALL=
-!CONFIG_JOYSTICK_SPACEORB=
-!CONFIG_JOYSTICK_STINGER=
-!CONFIG_JOYSTICK_TMDC=
-!CONFIG_JOYSTICK_TURBOGRAFX=
-!CONFIG_JOYSTICK_TWIDJOY=
-!CONFIG_JOYSTICK_WALKERA0701=
-!CONFIG_JOYSTICK_WARRIOR=
-!CONFIG_JOYSTICK_XPAD=
-!CONFIG_JOYSTICK_XPAD_FF=
-!CONFIG_JOYSTICK_XPAD_LEDS=
-!CONFIG_JOYSTICK_ZHENHUA=
-!CONFIG_MAC_EMUMOUSEBTN=
-!CONFIG_MEDIA_ATTACH=
-!CONFIG_MEDIA_COMMON_OPTIONS=
-!CONFIG_MEDIA_CONTROLLER=
-!CONFIG_MEDIA_SUBDRV_AUTOSELECT=
-!CONFIG_MEDIA_TUNER=
-!CONFIG_MEDIA_TUNER_E4000=
-!CONFIG_MEDIA_TUNER_FC0011=
-!CONFIG_MEDIA_TUNER_FC0012=
-!CONFIG_MEDIA_TUNER_FC0013=
-!CONFIG_MEDIA_TUNER_FC2580=
-!CONFIG_MEDIA_TUNER_IT913X=
-!CONFIG_MEDIA_TUNER_MC44S803=
-!CONFIG_MEDIA_TUNER_MT2060=
-!CONFIG_MEDIA_TUNER_MT2063=
-!CONFIG_MEDIA_TUNER_MT20XX=
-!CONFIG_MEDIA_TUNER_MT2131=
-!CONFIG_MEDIA_TUNER_MXL301RF=
-!CONFIG_MEDIA_TUNER_MXL5005S=
-!CONFIG_MEDIA_TUNER_MXL5007T=
-!CONFIG_MEDIA_TUNER_QM1D1C0042=
-!CONFIG_MEDIA_TUNER_QT1010=
-!CONFIG_MEDIA_TUNER_R820T=
-!CONFIG_MEDIA_TUNER_SI2157=
-!CONFIG_MEDIA_TUNER_SIMPLE=
-!CONFIG_MEDIA_TUNER_TDA18212=
-!CONFIG_MEDIA_TUNER_TDA18218=
-!CONFIG_MEDIA_TUNER_TDA18271=
-!CONFIG_MEDIA_TUNER_TDA827X=
-!CONFIG_MEDIA_TUNER_TDA8290=
-!CONFIG_MEDIA_TUNER_TDA9887=
-!CONFIG_MEDIA_TUNER_TUA9001=
-!CONFIG_MEDIA_TUNER_XC2028=
-!CONFIG_MEDIA_TUNER_XC4000=
-!CONFIG_MEDIA_TUNER_XC5000=
-!CONFIG_PREEMPT_COUNT=
-!CONFIG_PREEMPT_RCU=
-!CONFIG_SMS_SDIO_DRV=
-!CONFIG_SMS_SIANO_MDTV=
-!CONFIG_SMS_USB_DRV=
-!CONFIG_TABLET_SERIAL_WACOM4=
-!CONFIG_TABLET_USB_ACECAD=
-!CONFIG_TABLET_USB_AIPTEK=
-!CONFIG_TABLET_USB_GTCO=
-!CONFIG_TABLET_USB_HANWANG=
-!CONFIG_TABLET_USB_KBTAB=
-!CONFIG_UNINLINE_SPIN_UNLOCK=
-!CONFIG_USB_AIRSPY=
-!CONFIG_USB_CONFIGFS_F_UVC=
-!CONFIG_USB_GL860=
-!CONFIG_USB_GSPCA=
-!CONFIG_USB_GSPCA_BENQ=
-!CONFIG_USB_GSPCA_CONEX=
-!CONFIG_USB_GSPCA_CPIA1=
-!CONFIG_USB_GSPCA_DTCS033=
-!CONFIG_USB_GSPCA_ETOMS=
-!CONFIG_USB_GSPCA_FINEPIX=
-!CONFIG_USB_GSPCA_JEILINJ=
-!CONFIG_USB_GSPCA_JL2005BCD=
-!CONFIG_USB_GSPCA_KINECT=
-!CONFIG_USB_GSPCA_KONICA=
-!CONFIG_USB_GSPCA_MARS=
-!CONFIG_USB_GSPCA_MR97310A=
-!CONFIG_USB_GSPCA_NW80X=
-!CONFIG_USB_GSPCA_OV519=
-!CONFIG_USB_GSPCA_OV534=
-!CONFIG_USB_GSPCA_OV534_9=
-!CONFIG_USB_GSPCA_PAC207=
-!CONFIG_USB_GSPCA_PAC7302=
-!CONFIG_USB_GSPCA_PAC7311=
-!CONFIG_USB_GSPCA_SE401=
-!CONFIG_USB_GSPCA_SN9C2028=
-!CONFIG_USB_GSPCA_SN9C20X=
-!CONFIG_USB_GSPCA_SONIXB=
-!CONFIG_USB_GSPCA_SONIXJ=
-!CONFIG_USB_GSPCA_SPCA1528=
-!CONFIG_USB_GSPCA_SPCA500=
-!CONFIG_USB_GSPCA_SPCA501=
-!CONFIG_USB_GSPCA_SPCA505=
-!CONFIG_USB_GSPCA_SPCA506=
-!CONFIG_USB_GSPCA_SPCA508=
-!CONFIG_USB_GSPCA_SPCA561=
-!CONFIG_USB_GSPCA_SQ905=
-!CONFIG_USB_GSPCA_SQ905C=
-!CONFIG_USB_GSPCA_SQ930X=
-!CONFIG_USB_GSPCA_STK014=
-!CONFIG_USB_GSPCA_STK1135=
-!CONFIG_USB_GSPCA_STV0680=
-!CONFIG_USB_GSPCA_SUNPLUS=
-!CONFIG_USB_GSPCA_T613=
-!CONFIG_USB_GSPCA_TOPRO=
-!CONFIG_USB_GSPCA_TOUPTEK=
-!CONFIG_USB_GSPCA_TV8532=
-!CONFIG_USB_GSPCA_VC032X=
-!CONFIG_USB_GSPCA_VICAM=
-!CONFIG_USB_GSPCA_XIRLINK_CIT=
-!CONFIG_USB_GSPCA_ZC3XX=
-!CONFIG_USB_HACKRF=
-!CONFIG_USB_M5602=
-!CONFIG_USB_PWC=
-!CONFIG_USB_PWC_DEBUG=
-!CONFIG_USB_PWC_INPUT_EVDEV=
-!CONFIG_USB_S2255=
-!CONFIG_USB_STKWEBCAM=
-!CONFIG_USB_STV06XX=
-!CONFIG_USB_VIDEO_CLASS=
-!CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=
-!CONFIG_USB_ZR364XX=
-!CONFIG_V4L_MEM2MEM_DRIVERS=
-!CONFIG_V4L_PLATFORM_DRIVERS=
-!CONFIG_V4L_TEST_DRIVERS=
-!CONFIG_VIDEO_ADV7170=
-!CONFIG_VIDEO_ADV7175=
-!CONFIG_VIDEO_AU0828=
-!CONFIG_VIDEO_AU0828_V4L2=
-!CONFIG_VIDEO_BT819=
-!CONFIG_VIDEO_BT856=
-!CONFIG_VIDEO_BT866=
-!CONFIG_VIDEOBUF2_CORE=
-!CONFIG_VIDEOBUF2_DMA_CONTIG=
-!CONFIG_VIDEOBUF2_DMA_SG=
-!CONFIG_VIDEOBUF2_DVB=
-!CONFIG_VIDEOBUF2_MEMOPS=
-!CONFIG_VIDEOBUF2_VMALLOC=
-!CONFIG_VIDEOBUF_DMA_SG=
-!CONFIG_VIDEOBUF_GEN=
-!CONFIG_VIDEOBUF_VMALLOC=
-!CONFIG_VIDEO_CPIA2=
-!CONFIG_VIDEO_CS53L32A=
-!CONFIG_VIDEO_CX2341X=
-!CONFIG_VIDEO_CX25821=
-!CONFIG_VIDEO_CX25821_ALSA=
-!CONFIG_VIDEO_CX25840=
-!CONFIG_VIDEO_DEV=
-!CONFIG_VIDEO_DT3155=
-!CONFIG_VIDEO_EM28XX=
-!CONFIG_VIDEO_EM28XX_ALSA=
-!CONFIG_VIDEO_EM28XX_DVB=
-!CONFIG_VIDEO_EM28XX_V4L2=
-!CONFIG_VIDEO_GO7007=
-!CONFIG_VIDEO_GO7007_LOADER=
-!CONFIG_VIDEO_GO7007_USB=
-!CONFIG_VIDEO_GO7007_USB_S2250_BOARD=
-!CONFIG_VIDEO_HDPVR=
-!CONFIG_VIDEO_HEXIUM_GEMINI=
-!CONFIG_VIDEO_HEXIUM_ORION=
-!CONFIG_VIDEO_KS0127=
-!CONFIG_VIDEO_MEYE=
-!CONFIG_VIDEO_MSP3400=
-!CONFIG_VIDEO_MT9V011=
-!CONFIG_VIDEO_MXB=
-!CONFIG_VIDEO_OV7640=
-!CONFIG_VIDEO_PVRUSB2=
-!CONFIG_VIDEO_PVRUSB2_DEBUGIFC=
-!CONFIG_VIDEO_PVRUSB2_DVB=
-!CONFIG_VIDEO_PVRUSB2_SYSFS=
-!CONFIG_VIDEO_SAA6588=
-!CONFIG_VIDEO_SAA6752HS=
-!CONFIG_VIDEO_SAA7110=
-!CONFIG_VIDEO_SAA711X=
-!CONFIG_VIDEO_SAA7134=
-!CONFIG_VIDEO_SAA7134_ALSA=
-!CONFIG_VIDEO_SAA7134_DVB=
-!CONFIG_VIDEO_SAA7134_GO7007=
-!CONFIG_VIDEO_SAA7146=
-!CONFIG_VIDEO_SAA7146_VV=
-!CONFIG_VIDEO_SAA7164=
-!CONFIG_VIDEO_SAA7185=
-!CONFIG_VIDEO_SOLO6X10=
-!CONFIG_VIDEO_SONY_BTF_MPX=
-!CONFIG_VIDEO_STK1160=
-!CONFIG_VIDEO_STK1160_AC97=
-!CONFIG_VIDEO_STK1160_COMMON=
-!CONFIG_VIDEO_TDA9840=
-!CONFIG_VIDEO_TEA6415C=
-!CONFIG_VIDEO_TEA6420=
-!CONFIG_VIDEO_TUNER=
-!CONFIG_VIDEO_TVEEPROM=
-!CONFIG_VIDEO_TVP5150=
-!CONFIG_VIDEO_TW2804=
-!CONFIG_VIDEO_TW68=
-!CONFIG_VIDEO_TW9903=
-!CONFIG_VIDEO_TW9906=
-!CONFIG_VIDEO_UDA1342=
-!CONFIG_VIDEO_USBTV=
-!CONFIG_VIDEO_USBVISION=
-!CONFIG_VIDEO_V4L2=
-!CONFIG_VIDEO_VPX3220=
-!CONFIG_VIDEO_WM8775=
-!CONFIG_VIDEO_ZORAN=
-!CONFIG_VIDEO_ZORAN_AVS6EYES=
-!CONFIG_VIDEO_ZORAN_BUZ=
-!CONFIG_VIDEO_ZORAN_DC10=
-!CONFIG_VIDEO_ZORAN_DC30=
-!CONFIG_VIDEO_ZORAN_LML33=
-!CONFIG_VIDEO_ZORAN_LML33R10=
-!CONFIG_VIDEO_ZORAN_ZR36060=
-!CONFIG_DVB_A8293=
-!CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=
-!CONFIG_DVB_CX22700=
-!CONFIG_DVB_DRX39XYJ=
-!CONFIG_DVB_DRXD=
-!CONFIG_DVB_MB86A20S=
-!CONFIG_DVB_S921=
-!CONFIG_DVB_TDA10071=
-!CONFIG_SMS_SIANO_DEBUGFS=
-!CONFIG_USB_G_WEBCAM=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/ecryptfs.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/ecryptfs.patch
deleted file mode 100644
index cd3ccf5d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/ecryptfs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# Calculate format=diff merge(sys-kernel/calculate-sources)>=4.4.13
-From: Tyler Hicks <tyhicks <at> canonical.com>
-Subject: [PATCH] eCryptfs: Fix directory open regression in linux-stable
-Newsgroups: gmane.comp.file-systems.ecryptfs.general, gmane.linux.kernel.stable
-Date: 2016-06-29 03:39:41 GMT (14 hours and 12 minutes ago)
-
-Cherry-picking mainline commit 2f36db71009304b3f0b95afacd8eba1f9f046b87
-introduces a regression in eCryptfs when mainline commit
-6a480a7842545ec520a91730209ec0bae41694c1 (4.6+) is not present. The
-regression causes all attempts at opening directory files to fail with
-EMEDIUMTYPE when the lower filesystem's file_operations for directory
-files do not implement mmap.
-
-This is a simple fix that allows the check for the lower file's mmap
-implementation to be ignored if the lower file is a directory.
-
-Signed-off-by: Tyler Hicks <tyhicks <at> canonical.com>
-Tested-by: Tyler Hicks <tyhicks <at> canonical.com> # 4.4.y, 3.18.y
-Cc: <stable <at> vger.kernel.org> # 4.5-
----
- fs/ecryptfs/kthread.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c
-index e818f5a..b9faeab 100644
---- a/fs/ecryptfs/kthread.c	2016-06-30 23:32:07.029678000 +0200
-+++ b/fs/ecryptfs/kthread.c	2016-06-30 23:34:13.022284475 +0200
-@@ -171,7 +171,7 @@ int ecryptfs_privileged_open(struct file
- 		goto out;
- 	}
- have_file:
--	if ((*lower_file)->f_op->mmap == NULL) {
-+	if ((*lower_file)->f_op->mmap == NULL && !d_is_dir(lower_dentry)) {
- 		fput(*lower_file);
- 		*lower_file = NULL;
- 		rc = -EMEDIUMTYPE;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
deleted file mode 100644
index b7ef63ce1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.4/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-# Calculate format=diff pkg(sys-devel/gcc)>=4.9
-WARNING - this version of the patch works with version 4.9+ of gcc and with
-kernel version 3.15.x+ and should NOT be applied when compiling on older
-versions due to name changes of the flags with the 4.9 release of gcc.
-Use the older version of this patch hosted on the same github for older
-versions of gcc. For example:
-
-corei7 --> nehalem
-corei7-avx --> sandybridge
-core-avx-i --> ivybridge
-core-avx2 --> haswell
-
-For more, see: https://gcc.gnu.org/gcc-4.9/changes.html
-
-It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes.
-Note that upstream is using the deprecated 'match=atom' flags when I believe it
-should use the newer 'march=bonnell' flag for atom processors.
-
-I have made that change to this patch set as well.  See the following kernel
-bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461
-
-This patch will expand the number of microarchitectures to include new
-processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family
-14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD
-Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core
-i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen
-Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th
-Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag.
-
-Small but real speed increases are measurable using a make endpoint comparing
-a generic kernel to one built with one of the respective microarchs.
-
-See the following experimental evidence supporting this statement:
-https://github.com/graysky2/kernel_gcc_patch
-
-REQUIREMENTS
-linux version >=3.15
-gcc version >=4.9
-
---- a/arch/x86/include/asm/module.h	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/include/asm/module.h	2014-09-13 09:37:16.721385247 -0400
-@@ -15,6 +15,20 @@
- #define MODULE_PROC_FAMILY "586MMX "
- #elif defined CONFIG_MCORE2
- #define MODULE_PROC_FAMILY "CORE2 "
-+#elif defined CONFIG_MNATIVE
-+#define MODULE_PROC_FAMILY "NATIVE "
-+#elif defined CONFIG_MNEHALEM
-+#define MODULE_PROC_FAMILY "NEHALEM "
-+#elif defined CONFIG_MWESTMERE
-+#define MODULE_PROC_FAMILY "WESTMERE "
-+#elif defined CONFIG_MSANDYBRIDGE
-+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
-+#elif defined CONFIG_MIVYBRIDGE
-+#define MODULE_PROC_FAMILY "IVYBRIDGE "
-+#elif defined CONFIG_MHASWELL
-+#define MODULE_PROC_FAMILY "HASWELL "
-+#elif defined CONFIG_MBROADWELL
-+#define MODULE_PROC_FAMILY "BROADWELL "
- #elif defined CONFIG_MATOM
- #define MODULE_PROC_FAMILY "ATOM "
- #elif defined CONFIG_M686
-@@ -33,6 +47,20 @@
- #define MODULE_PROC_FAMILY "K7 "
- #elif defined CONFIG_MK8
- #define MODULE_PROC_FAMILY "K8 "
-+#elif defined CONFIG_MK8SSE3
-+#define MODULE_PROC_FAMILY "K8SSE3 "
-+#elif defined CONFIG_MK10
-+#define MODULE_PROC_FAMILY "K10 "
-+#elif defined CONFIG_MBARCELONA
-+#define MODULE_PROC_FAMILY "BARCELONA "
-+#elif defined CONFIG_MBOBCAT
-+#define MODULE_PROC_FAMILY "BOBCAT "
-+#elif defined CONFIG_MBULLDOZER
-+#define MODULE_PROC_FAMILY "BULLDOZER "
-+#elif defined CONFIG_MPILEDRIVER
-+#define MODULE_PROC_FAMILY "PILEDRIVER "
-+#elif defined CONFIG_MJAGUAR
-+#define MODULE_PROC_FAMILY "JAGUAR "
- #elif defined CONFIG_MELAN
- #define MODULE_PROC_FAMILY "ELAN "
- #elif defined CONFIG_MCRUSOE
---- a/arch/x86/Kconfig.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Kconfig.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -137,9 +137,8 @@ config MPENTIUM4
- 		-Paxville
- 		-Dempsey
- 
--
- config MK6
--	bool "K6/K6-II/K6-III"
-+	bool "AMD K6/K6-II/K6-III"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD K6-family processor.  Enables use of
-@@ -147,7 +146,7 @@ config MK6
- 	  flags to GCC.
- 
- config MK7
--	bool "Athlon/Duron/K7"
-+	bool "AMD Athlon/Duron/K7"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD Athlon K7-family processor.  Enables use of
-@@ -155,12 +154,62 @@ config MK7
- 	  flags to GCC.
- 
- config MK8
--	bool "Opteron/Athlon64/Hammer/K8"
-+	bool "AMD Opteron/Athlon64/Hammer/K8"
- 	---help---
- 	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
- 	  Enables use of some extended instructions, and passes appropriate
- 	  optimization flags to GCC.
- 
-+config MK8SSE3
-+	bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
-+	---help---
-+	  Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MK10
-+	bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
-+	---help---
-+	  Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
-+		Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MBARCELONA
-+	bool "AMD Barcelona"
-+	---help---
-+	  Select this for AMD Barcelona and newer processors.
-+
-+	  Enables -march=barcelona
-+
-+config MBOBCAT
-+	bool "AMD Bobcat"
-+	---help---
-+	  Select this for AMD Bobcat processors.
-+
-+	  Enables -march=btver1
-+
-+config MBULLDOZER
-+	bool "AMD Bulldozer"
-+	---help---
-+	  Select this for AMD Bulldozer processors.
-+
-+	  Enables -march=bdver1
-+
-+config MPILEDRIVER
-+	bool "AMD Piledriver"
-+	---help---
-+	  Select this for AMD Piledriver processors.
-+
-+	  Enables -march=bdver2
-+
-+config MJAGUAR
-+	bool "AMD Jaguar"
-+	---help---
-+	  Select this for AMD Jaguar processors.
-+
-+	  Enables -march=btver2
-+
- config MCRUSOE
- 	bool "Crusoe"
- 	depends on X86_32
-@@ -251,8 +300,17 @@ config MPSC
- 	  using the cpu family field
- 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
- 
-+config MATOM
-+	bool "Intel Atom"
-+	---help---
-+
-+	  Select this for the Intel Atom platform. Intel Atom CPUs have an
-+	  in-order pipelining architecture and thus can benefit from
-+	  accordingly optimized code. Use a recent GCC with specific Atom
-+	  support in order to fully benefit from selecting this option.
-+
- config MCORE2
--	bool "Core 2/newer Xeon"
-+	bool "Intel Core 2"
- 	---help---
- 
- 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
-@@ -260,14 +318,55 @@ config MCORE2
- 	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
- 	  (not a typo)
- 
--config MATOM
--	bool "Intel Atom"
-+	  Enables -march=core2
-+
-+config MNEHALEM
-+	bool "Intel Nehalem"
- 	---help---
- 
--	  Select this for the Intel Atom platform. Intel Atom CPUs have an
--	  in-order pipelining architecture and thus can benefit from
--	  accordingly optimized code. Use a recent GCC with specific Atom
--	  support in order to fully benefit from selecting this option.
-+	  Select this for 1st Gen Core processors in the Nehalem family.
-+
-+	  Enables -march=nehalem
-+
-+config MWESTMERE
-+	bool "Intel Westmere"
-+	---help---
-+
-+	  Select this for the Intel Westmere formerly Nehalem-C family.
-+
-+	  Enables -march=westmere
-+
-+config MSANDYBRIDGE
-+	bool "Intel Sandy Bridge"
-+	---help---
-+
-+	  Select this for 2nd Gen Core processors in the Sandy Bridge family.
-+
-+	  Enables -march=sandybridge
-+
-+config MIVYBRIDGE
-+	bool "Intel Ivy Bridge"
-+	---help---
-+
-+	  Select this for 3rd Gen Core processors in the Ivy Bridge family.
-+
-+	  Enables -march=ivybridge
-+
-+config MHASWELL
-+	bool "Intel Haswell"
-+	---help---
-+
-+	  Select this for 4th Gen Core processors in the Haswell family.
-+
-+	  Enables -march=haswell
-+
-+config MBROADWELL
-+	bool "Intel Broadwell"
-+	---help---
-+
-+	  Select this for 5th Gen Core processors in the Broadwell family.
-+
-+	  Enables -march=broadwell
- 
- config GENERIC_CPU
- 	bool "Generic-x86-64"
-@@ -276,6 +375,19 @@ config GENERIC_CPU
- 	  Generic x86-64 CPU.
- 	  Run equally well on all x86-64 CPUs.
- 
-+config MNATIVE
-+ bool "Native optimizations autodetected by GCC"
-+ ---help---
-+
-+   GCC 4.2 and above support -march=native, which automatically detects
-+   the optimum settings to use based on your processor. -march=native 
-+   also detects and applies additional settings beyond -march specific
-+   to your CPU, (eg. -msse4). Unless you have a specific reason not to
-+   (e.g. distcc cross-compiling), you should probably be using
-+   -march=native rather than anything listed below.
-+
-+   Enables -march=native
-+
- endchoice
- 
- config X86_GENERIC
-@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT
- config X86_L1_CACHE_SHIFT
- 	int
- 	default "7" if MPENTIUM4 || MPSC
--	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
-+	default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
- 	default "4" if MELAN || M486 || MGEODEGX1
- 	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
- 
-@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16
- 
- config X86_INTEL_USERCOPY
- 	def_bool y
--	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
-+	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE
- 
- config X86_USE_PPRO_CHECKSUM
- 	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE
- 
- config X86_USE_3DNOW
- 	def_bool y
-@@ -359,17 +471,17 @@ config X86_P6_NOP
- 
- config X86_TSC
- 	def_bool y
--	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
-+	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64
- 
- config X86_CMPXCHG64
- 	def_bool y
--	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
-+	depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE
- 
- # this should be set for all -march=.. options where the compiler
- # generates cmov.
- config X86_CMOV
- 	def_bool y
--	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
-+	depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX)
- 
- config X86_MINIMUM_CPU_FAMILY
- 	int
---- a/arch/x86/Makefile	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile	2014-09-13 09:37:16.721385247 -0400
-@@ -92,13 +92,33 @@ else
- 	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
- 
-         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
-+        cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
-         cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
-+        cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8)
-+        cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
-+        cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
-+        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
-+        cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
-+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
-+        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
-         cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
- 
-         cflags-$(CONFIG_MCORE2) += \
--                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
--	cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
--		$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+                $(call cc-option,-march=core2,$(call cc-option,-mtune=core2))
-+        cflags-$(CONFIG_MNEHALEM) += \
-+                $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem))
-+        cflags-$(CONFIG_MWESTMERE) += \
-+                $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere))
-+        cflags-$(CONFIG_MSANDYBRIDGE) += \
-+                $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge))
-+        cflags-$(CONFIG_MIVYBRIDGE) += \
-+                $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge))
-+        cflags-$(CONFIG_MHASWELL) += \
-+                $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell))
-+        cflags-$(CONFIG_MBROADWELL) += \
-+                $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell))
-+        cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \
-+                $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
-         cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
-         KBUILD_CFLAGS += $(cflags-y)
- 
---- a/arch/x86/Makefile_32.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile_32.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6)		+= -march=k6
- # Please note, that patches that add -march=athlon-xp and friends are pointless.
- # They make zero difference whatsosever to performance at this time.
- cflags-$(CONFIG_MK7)		+= -march=athlon
-+cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
- cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)
-+cflags-$(CONFIG_MK8SSE3)		+= $(call cc-option,-march=k8-sse3,-march=athlon)
-+cflags-$(CONFIG_MK10)	+= $(call cc-option,-march=amdfam10,-march=athlon)
-+cflags-$(CONFIG_MBARCELONA)	+= $(call cc-option,-march=barcelona,-march=athlon)
-+cflags-$(CONFIG_MBOBCAT)	+= $(call cc-option,-march=btver1,-march=athlon)
-+cflags-$(CONFIG_MBULLDOZER)	+= $(call cc-option,-march=bdver1,-march=athlon)
-+cflags-$(CONFIG_MPILEDRIVER)	+= $(call cc-option,-march=bdver2,-march=athlon)
-+cflags-$(CONFIG_MJAGUAR)	+= $(call cc-option,-march=btver2,-march=athlon)
- cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)
-@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-
- cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)
- cflags-$(CONFIG_MVIAC7)		+= -march=i686
- cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)
--cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \
--	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+cflags-$(CONFIG_MNEHALEM)	+= -march=i686 $(call tune,nehalem)
-+cflags-$(CONFIG_MWESTMERE)	+= -march=i686 $(call tune,westmere)
-+cflags-$(CONFIG_MSANDYBRIDGE)	+= -march=i686 $(call tune,sandybridge)
-+cflags-$(CONFIG_MIVYBRIDGE)	+= -march=i686 $(call tune,ivybridge)
-+cflags-$(CONFIG_MHASWELL)	+= -march=i686 $(call tune,haswell)
-+cflags-$(CONFIG_MBROADWELL)	+= -march=i686 $(call tune,broadwell)
-+cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \
-+	$(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
- 
- # AMD Elan support
- cflags-$(CONFIG_MELAN)		+= -march=i486
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/.calculate_directory
deleted file mode 100644
index 4930f12fe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-kernel/calculate-sources)>=4.8&&merge(sys-kernel/calculate-sources)<4.9
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0.patch
deleted file mode 100644
index 8253b6cd9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From f2ebe596e7d72e96e0fb2be87be90f0b96e6f1b3 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Tue, 7 Apr 2015 13:39:12 +0200
-Subject: [PATCH 1/4] block: cgroups, kconfig, build bits for BFQ-v7r11-4.8.0
-
-Update Kconfig.iosched and do the related Makefile changes to include
-kernel configuration options for BFQ. Also increase the number of
-policies supported by the blkio controller so that BFQ can add its
-own.
-
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini@google.com>
----
- block/Kconfig.iosched  | 32 ++++++++++++++++++++++++++++++++
- block/Makefile         |  1 +
- include/linux/blkdev.h |  2 +-
- 3 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
-index 421bef9..0ee5f0f 100644
---- a/block/Kconfig.iosched
-+++ b/block/Kconfig.iosched
-@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
- 	---help---
- 	  Enable group IO scheduling in CFQ.
- 
-+config IOSCHED_BFQ
-+	tristate "BFQ I/O scheduler"
-+	default n
-+	---help---
-+	  The BFQ I/O scheduler tries to distribute bandwidth among
-+	  all processes according to their weights.
-+	  It aims at distributing the bandwidth as desired, independently of
-+	  the disk parameters and with any workload. It also tries to
-+	  guarantee low latency to interactive and soft real-time
-+	  applications. If compiled built-in (saying Y here), BFQ can
-+	  be configured to support hierarchical scheduling.
-+
-+config CGROUP_BFQIO
-+	bool "BFQ hierarchical scheduling support"
-+	depends on CGROUPS && IOSCHED_BFQ=y
-+	default n
-+	---help---
-+	  Enable hierarchical scheduling in BFQ, using the cgroups
-+	  filesystem interface.  The name of the subsystem will be
-+	  bfqio.
-+
- choice
- 	prompt "Default I/O scheduler"
- 	default DEFAULT_CFQ
-@@ -52,6 +73,16 @@ choice
- 	config DEFAULT_CFQ
- 		bool "CFQ" if IOSCHED_CFQ=y
- 
-+	config DEFAULT_BFQ
-+		bool "BFQ" if IOSCHED_BFQ=y
-+		help
-+		  Selects BFQ as the default I/O scheduler which will be
-+		  used by default for all block devices.
-+		  The BFQ I/O scheduler aims at distributing the bandwidth
-+		  as desired, independently of the disk parameters and with
-+		  any workload. It also tries to guarantee low latency to
-+		  interactive and soft real-time applications.
-+
- 	config DEFAULT_NOOP
- 		bool "No-op"
- 
-@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
- 	string
- 	default "deadline" if DEFAULT_DEADLINE
- 	default "cfq" if DEFAULT_CFQ
-+	default "bfq" if DEFAULT_BFQ
- 	default "noop" if DEFAULT_NOOP
- 
- endmenu
-diff --git a/block/Makefile b/block/Makefile
-index 9eda232..4a36683 100644
---- a/block/Makefile
-+++ b/block/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING)	+= blk-throttle.o
- obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
- obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
- obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
-+obj-$(CONFIG_IOSCHED_BFQ)	+= bfq-iosched.o
- 
- obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
- obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
-diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index e79055c..931ff1e 100644
---- a/include/linux/blkdev.h
-+++ b/include/linux/blkdev.h
-@@ -45,7 +45,7 @@ struct pr_ops;
-  * Maximum number of blkcg policies allowed to be registered concurrently.
-  * Defined here to simplify include dependency.
-  */
--#define BLKCG_MAX_POLS		2
-+#define BLKCG_MAX_POLS		3
- 
- typedef void (rq_end_io_fn)(struct request *, int);
- 
--- 
-2.7.4 (Apple Git-66)
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported.patch
deleted file mode 100644
index 473bd2c1f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported.patch
+++ /dev/null
@@ -1,7111 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From d9af6fcc4167cbb8433b10bbf3663c8297487f52 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Thu, 9 May 2013 19:10:02 +0200
-Subject: [PATCH 2/4] block: introduce the BFQ-v7r11 I/O sched, to be ported to
- 4.8.0
-
-The general structure is borrowed from CFQ, as much of the code for
-handling I/O contexts. Over time, several useful features have been
-ported from CFQ as well (details in the changelog in README.BFQ). A
-(bfq_)queue is associated to each task doing I/O on a device, and each
-time a scheduling decision has to be made a queue is selected and served
-until it expires.
-
-    - Slices are given in the service domain: tasks are assigned
-      budgets, measured in number of sectors. Once got the disk, a task
-      must however consume its assigned budget within a configurable
-      maximum time (by default, the maximum possible value of the
-      budgets is automatically computed to comply with this timeout).
-      This allows the desired latency vs "throughput boosting" tradeoff
-      to be set.
-
-    - Budgets are scheduled according to a variant of WF2Q+, implemented
-      using an augmented rb-tree to take eligibility into account while
-      preserving an O(log N) overall complexity.
-
-    - A low-latency tunable is provided; if enabled, both interactive
-      and soft real-time applications are guaranteed a very low latency.
-
-    - Latency guarantees are preserved also in the presence of NCQ.
-
-    - Also with flash-based devices, a high throughput is achieved
-      while still preserving latency guarantees.
-
-    - BFQ features Early Queue Merge (EQM), a sort of fusion of the
-      cooperating-queue-merging and the preemption mechanisms present
-      in CFQ. EQM is in fact a unified mechanism that tries to get a
-      sequential read pattern, and hence a high throughput, with any
-      set of processes performing interleaved I/O over a contiguous
-      sequence of sectors.
-
-    - BFQ supports full hierarchical scheduling, exporting a cgroups
-      interface.  Since each node has a full scheduler, each group can
-      be assigned its own weight.
-
-    - If the cgroups interface is not used, only I/O priorities can be
-      assigned to processes, with ioprio values mapped to weights
-      with the relation weight = IOPRIO_BE_NR - ioprio.
-
-    - ioprio classes are served in strict priority order, i.e., lower
-      priority queues are not served as long as there are higher
-      priority queues.  Among queues in the same class the bandwidth is
-      distributed in proportion to the weight of each queue. A very
-      thin extra bandwidth is however guaranteed to the Idle class, to
-      prevent it from starving.
-
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini@google.com>
----
- block/Kconfig.iosched |    6 +-
- block/bfq-cgroup.c    | 1186 ++++++++++++++++
- block/bfq-ioc.c       |   36 +
- block/bfq-iosched.c   | 3763 +++++++++++++++++++++++++++++++++++++++++++++++++
- block/bfq-sched.c     | 1199 ++++++++++++++++
- block/bfq.h           |  801 +++++++++++
- 6 files changed, 6987 insertions(+), 4 deletions(-)
- create mode 100644 block/bfq-cgroup.c
- create mode 100644 block/bfq-ioc.c
- create mode 100644 block/bfq-iosched.c
- create mode 100644 block/bfq-sched.c
- create mode 100644 block/bfq.h
-
-diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
-index 0ee5f0f..f78cd1a 100644
---- a/block/Kconfig.iosched
-+++ b/block/Kconfig.iosched
-@@ -51,14 +51,12 @@ config IOSCHED_BFQ
- 	  applications. If compiled built-in (saying Y here), BFQ can
- 	  be configured to support hierarchical scheduling.
- 
--config CGROUP_BFQIO
-+config BFQ_GROUP_IOSCHED
- 	bool "BFQ hierarchical scheduling support"
- 	depends on CGROUPS && IOSCHED_BFQ=y
- 	default n
- 	---help---
--	  Enable hierarchical scheduling in BFQ, using the cgroups
--	  filesystem interface.  The name of the subsystem will be
--	  bfqio.
-+	  Enable hierarchical scheduling in BFQ, using the blkio controller.
- 
- choice
- 	prompt "Default I/O scheduler"
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-new file mode 100644
-index 0000000..8b08a57
---- /dev/null
-+++ b/block/bfq-cgroup.c
-@@ -0,0 +1,1186 @@
-+/*
-+ * BFQ: CGROUPS support.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-+ * file.
-+ */
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+
-+/* bfqg stats flags */
-+enum bfqg_stats_flags {
-+	BFQG_stats_waiting = 0,
-+	BFQG_stats_idling,
-+	BFQG_stats_empty,
-+};
-+
-+#define BFQG_FLAG_FNS(name)						\
-+static void bfqg_stats_mark_##name(struct bfqg_stats *stats)	\
-+{									\
-+	stats->flags |= (1 << BFQG_stats_##name);			\
-+}									\
-+static void bfqg_stats_clear_##name(struct bfqg_stats *stats)	\
-+{									\
-+	stats->flags &= ~(1 << BFQG_stats_##name);			\
-+}									\
-+static int bfqg_stats_##name(struct bfqg_stats *stats)		\
-+{									\
-+	return (stats->flags & (1 << BFQG_stats_##name)) != 0;		\
-+}									\
-+
-+BFQG_FLAG_FNS(waiting)
-+BFQG_FLAG_FNS(idling)
-+BFQG_FLAG_FNS(empty)
-+#undef BFQG_FLAG_FNS
-+
-+/* This should be called with the queue_lock held. */
-+static void bfqg_stats_update_group_wait_time(struct bfqg_stats *stats)
-+{
-+	unsigned long long now;
-+
-+	if (!bfqg_stats_waiting(stats))
-+		return;
-+
-+	now = sched_clock();
-+	if (time_after64(now, stats->start_group_wait_time))
-+		blkg_stat_add(&stats->group_wait_time,
-+			      now - stats->start_group_wait_time);
-+	bfqg_stats_clear_waiting(stats);
-+}
-+
-+/* This should be called with the queue_lock held. */
-+static void bfqg_stats_set_start_group_wait_time(struct bfq_group *bfqg,
-+						 struct bfq_group *curr_bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	if (bfqg_stats_waiting(stats))
-+		return;
-+	if (bfqg == curr_bfqg)
-+		return;
-+	stats->start_group_wait_time = sched_clock();
-+	bfqg_stats_mark_waiting(stats);
-+}
-+
-+/* This should be called with the queue_lock held. */
-+static void bfqg_stats_end_empty_time(struct bfqg_stats *stats)
-+{
-+	unsigned long long now;
-+
-+	if (!bfqg_stats_empty(stats))
-+		return;
-+
-+	now = sched_clock();
-+	if (time_after64(now, stats->start_empty_time))
-+		blkg_stat_add(&stats->empty_time,
-+			      now - stats->start_empty_time);
-+	bfqg_stats_clear_empty(stats);
-+}
-+
-+static void bfqg_stats_update_dequeue(struct bfq_group *bfqg)
-+{
-+	blkg_stat_add(&bfqg->stats.dequeue, 1);
-+}
-+
-+static void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	if (blkg_rwstat_total(&stats->queued))
-+		return;
-+
-+	/*
-+	 * group is already marked empty. This can happen if bfqq got new
-+	 * request in parent group and moved to this group while being added
-+	 * to service tree. Just ignore the event and move on.
-+	 */
-+	if (bfqg_stats_empty(stats))
-+		return;
-+
-+	stats->start_empty_time = sched_clock();
-+	bfqg_stats_mark_empty(stats);
-+}
-+
-+static void bfqg_stats_update_idle_time(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	if (bfqg_stats_idling(stats)) {
-+		unsigned long long now = sched_clock();
-+
-+		if (time_after64(now, stats->start_idle_time))
-+			blkg_stat_add(&stats->idle_time,
-+				      now - stats->start_idle_time);
-+		bfqg_stats_clear_idling(stats);
-+	}
-+}
-+
-+static void bfqg_stats_set_start_idle_time(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	stats->start_idle_time = sched_clock();
-+	bfqg_stats_mark_idling(stats);
-+}
-+
-+static void bfqg_stats_update_avg_queue_size(struct bfq_group *bfqg)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+
-+	blkg_stat_add(&stats->avg_queue_size_sum,
-+		      blkg_rwstat_total(&stats->queued));
-+	blkg_stat_add(&stats->avg_queue_size_samples, 1);
-+	bfqg_stats_update_group_wait_time(stats);
-+}
-+
-+static struct blkcg_policy blkcg_policy_bfq;
-+
-+/*
-+ * blk-cgroup policy-related handlers
-+ * The following functions help in converting between blk-cgroup
-+ * internal structures and BFQ-specific structures.
-+ */
-+
-+static struct bfq_group *pd_to_bfqg(struct blkg_policy_data *pd)
-+{
-+	return pd ? container_of(pd, struct bfq_group, pd) : NULL;
-+}
-+
-+static struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg)
-+{
-+	return pd_to_blkg(&bfqg->pd);
-+}
-+
-+static struct bfq_group *blkg_to_bfqg(struct blkcg_gq *blkg)
-+{
-+	struct blkg_policy_data *pd = blkg_to_pd(blkg, &blkcg_policy_bfq);
-+
-+	BUG_ON(!pd);
-+
-+	return pd_to_bfqg(pd);
-+}
-+
-+/*
-+ * bfq_group handlers
-+ * The following functions help in navigating the bfq_group hierarchy
-+ * by allowing to find the parent of a bfq_group or the bfq_group
-+ * associated to a bfq_queue.
-+ */
-+
-+static struct bfq_group *bfqg_parent(struct bfq_group *bfqg)
-+{
-+	struct blkcg_gq *pblkg = bfqg_to_blkg(bfqg)->parent;
-+
-+	return pblkg ? blkg_to_bfqg(pblkg) : NULL;
-+}
-+
-+static struct bfq_group *bfqq_group(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *group_entity = bfqq->entity.parent;
-+
-+	return group_entity ? container_of(group_entity, struct bfq_group,
-+					   entity) :
-+			      bfqq->bfqd->root_group;
-+}
-+
-+/*
-+ * The following two functions handle get and put of a bfq_group by
-+ * wrapping the related blk-cgroup hooks.
-+ */
-+
-+static void bfqg_get(struct bfq_group *bfqg)
-+{
-+	return blkg_get(bfqg_to_blkg(bfqg));
-+}
-+
-+static void bfqg_put(struct bfq_group *bfqg)
-+{
-+	return blkg_put(bfqg_to_blkg(bfqg));
-+}
-+
-+static void bfqg_stats_update_io_add(struct bfq_group *bfqg,
-+				     struct bfq_queue *bfqq,
-+				     int rw)
-+{
-+	blkg_rwstat_add(&bfqg->stats.queued, rw, 1);
-+	bfqg_stats_end_empty_time(&bfqg->stats);
-+	if (!(bfqq == ((struct bfq_data *)bfqg->bfqd)->in_service_queue))
-+		bfqg_stats_set_start_group_wait_time(bfqg, bfqq_group(bfqq));
-+}
-+
-+static void bfqg_stats_update_io_remove(struct bfq_group *bfqg, int rw)
-+{
-+	blkg_rwstat_add(&bfqg->stats.queued, rw, -1);
-+}
-+
-+static void bfqg_stats_update_io_merged(struct bfq_group *bfqg, int rw)
-+{
-+	blkg_rwstat_add(&bfqg->stats.merged, rw, 1);
-+}
-+
-+static void bfqg_stats_update_dispatch(struct bfq_group *bfqg,
-+					      uint64_t bytes, int rw)
-+{
-+	blkg_stat_add(&bfqg->stats.sectors, bytes >> 9);
-+	blkg_rwstat_add(&bfqg->stats.serviced, rw, 1);
-+	blkg_rwstat_add(&bfqg->stats.service_bytes, rw, bytes);
-+}
-+
-+static void bfqg_stats_update_completion(struct bfq_group *bfqg,
-+			uint64_t start_time, uint64_t io_start_time, int rw)
-+{
-+	struct bfqg_stats *stats = &bfqg->stats;
-+	unsigned long long now = sched_clock();
-+
-+	if (time_after64(now, io_start_time))
-+		blkg_rwstat_add(&stats->service_time, rw, now - io_start_time);
-+	if (time_after64(io_start_time, start_time))
-+		blkg_rwstat_add(&stats->wait_time, rw,
-+				io_start_time - start_time);
-+}
-+
-+/* @stats = 0 */
-+static void bfqg_stats_reset(struct bfqg_stats *stats)
-+{
-+	if (!stats)
-+		return;
-+
-+	/* queued stats shouldn't be cleared */
-+	blkg_rwstat_reset(&stats->service_bytes);
-+	blkg_rwstat_reset(&stats->serviced);
-+	blkg_rwstat_reset(&stats->merged);
-+	blkg_rwstat_reset(&stats->service_time);
-+	blkg_rwstat_reset(&stats->wait_time);
-+	blkg_stat_reset(&stats->time);
-+	blkg_stat_reset(&stats->unaccounted_time);
-+	blkg_stat_reset(&stats->avg_queue_size_sum);
-+	blkg_stat_reset(&stats->avg_queue_size_samples);
-+	blkg_stat_reset(&stats->dequeue);
-+	blkg_stat_reset(&stats->group_wait_time);
-+	blkg_stat_reset(&stats->idle_time);
-+	blkg_stat_reset(&stats->empty_time);
-+}
-+
-+/* @to += @from */
-+static void bfqg_stats_merge(struct bfqg_stats *to, struct bfqg_stats *from)
-+{
-+	if (!to || !from)
-+		return;
-+
-+	/* queued stats shouldn't be cleared */
-+	blkg_rwstat_add_aux(&to->service_bytes, &from->service_bytes);
-+	blkg_rwstat_add_aux(&to->serviced, &from->serviced);
-+	blkg_rwstat_add_aux(&to->merged, &from->merged);
-+	blkg_rwstat_add_aux(&to->service_time, &from->service_time);
-+	blkg_rwstat_add_aux(&to->wait_time, &from->wait_time);
-+	blkg_stat_add_aux(&from->time, &from->time);
-+	blkg_stat_add_aux(&to->unaccounted_time, &from->unaccounted_time);
-+	blkg_stat_add_aux(&to->avg_queue_size_sum, &from->avg_queue_size_sum);
-+	blkg_stat_add_aux(&to->avg_queue_size_samples,
-+			  &from->avg_queue_size_samples);
-+	blkg_stat_add_aux(&to->dequeue, &from->dequeue);
-+	blkg_stat_add_aux(&to->group_wait_time, &from->group_wait_time);
-+	blkg_stat_add_aux(&to->idle_time, &from->idle_time);
-+	blkg_stat_add_aux(&to->empty_time, &from->empty_time);
-+}
-+
-+/*
-+ * Transfer @bfqg's stats to its parent's dead_stats so that the ancestors'
-+ * recursive stats can still account for the amount used by this bfqg after
-+ * it's gone.
-+ */
-+static void bfqg_stats_xfer_dead(struct bfq_group *bfqg)
-+{
-+	struct bfq_group *parent;
-+
-+	if (!bfqg) /* root_group */
-+		return;
-+
-+	parent = bfqg_parent(bfqg);
-+
-+	lockdep_assert_held(bfqg_to_blkg(bfqg)->q->queue_lock);
-+
-+	if (unlikely(!parent))
-+		return;
-+
-+	bfqg_stats_merge(&parent->dead_stats, &bfqg->stats);
-+	bfqg_stats_merge(&parent->dead_stats, &bfqg->dead_stats);
-+	bfqg_stats_reset(&bfqg->stats);
-+	bfqg_stats_reset(&bfqg->dead_stats);
-+}
-+
-+static void bfq_init_entity(struct bfq_entity *entity,
-+			    struct bfq_group *bfqg)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	entity->weight = entity->new_weight;
-+	entity->orig_weight = entity->new_weight;
-+	if (bfqq) {
-+		bfqq->ioprio = bfqq->new_ioprio;
-+		bfqq->ioprio_class = bfqq->new_ioprio_class;
-+		bfqg_get(bfqg);
-+	}
-+	entity->parent = bfqg->my_entity;
-+	entity->sched_data = &bfqg->sched_data;
-+}
-+
-+static void bfqg_stats_exit(struct bfqg_stats *stats)
-+{
-+	blkg_rwstat_exit(&stats->service_bytes);
-+	blkg_rwstat_exit(&stats->serviced);
-+	blkg_rwstat_exit(&stats->merged);
-+	blkg_rwstat_exit(&stats->service_time);
-+	blkg_rwstat_exit(&stats->wait_time);
-+	blkg_rwstat_exit(&stats->queued);
-+	blkg_stat_exit(&stats->sectors);
-+	blkg_stat_exit(&stats->time);
-+	blkg_stat_exit(&stats->unaccounted_time);
-+	blkg_stat_exit(&stats->avg_queue_size_sum);
-+	blkg_stat_exit(&stats->avg_queue_size_samples);
-+	blkg_stat_exit(&stats->dequeue);
-+	blkg_stat_exit(&stats->group_wait_time);
-+	blkg_stat_exit(&stats->idle_time);
-+	blkg_stat_exit(&stats->empty_time);
-+}
-+
-+static int bfqg_stats_init(struct bfqg_stats *stats, gfp_t gfp)
-+{
-+	if (blkg_rwstat_init(&stats->service_bytes, gfp) ||
-+	    blkg_rwstat_init(&stats->serviced, gfp) ||
-+	    blkg_rwstat_init(&stats->merged, gfp) ||
-+	    blkg_rwstat_init(&stats->service_time, gfp) ||
-+	    blkg_rwstat_init(&stats->wait_time, gfp) ||
-+	    blkg_rwstat_init(&stats->queued, gfp) ||
-+	    blkg_stat_init(&stats->sectors, gfp) ||
-+	    blkg_stat_init(&stats->time, gfp) ||
-+	    blkg_stat_init(&stats->unaccounted_time, gfp) ||
-+	    blkg_stat_init(&stats->avg_queue_size_sum, gfp) ||
-+	    blkg_stat_init(&stats->avg_queue_size_samples, gfp) ||
-+	    blkg_stat_init(&stats->dequeue, gfp) ||
-+	    blkg_stat_init(&stats->group_wait_time, gfp) ||
-+	    blkg_stat_init(&stats->idle_time, gfp) ||
-+	    blkg_stat_init(&stats->empty_time, gfp)) {
-+		bfqg_stats_exit(stats);
-+		return -ENOMEM;
-+	}
-+
-+	return 0;
-+}
-+
-+static struct bfq_group_data *cpd_to_bfqgd(struct blkcg_policy_data *cpd)
-+{
-+	return cpd ? container_of(cpd, struct bfq_group_data, pd) : NULL;
-+}
-+
-+static struct bfq_group_data *blkcg_to_bfqgd(struct blkcg *blkcg)
-+{
-+	return cpd_to_bfqgd(blkcg_to_cpd(blkcg, &blkcg_policy_bfq));
-+}
-+
-+static void bfq_cpd_init(struct blkcg_policy_data *cpd)
-+{
-+	struct bfq_group_data *d = cpd_to_bfqgd(cpd);
-+
-+	d->weight = BFQ_DEFAULT_GRP_WEIGHT;
-+}
-+
-+static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node)
-+{
-+	struct bfq_group *bfqg;
-+
-+	bfqg = kzalloc_node(sizeof(*bfqg), gfp, node);
-+	if (!bfqg)
-+		return NULL;
-+
-+	if (bfqg_stats_init(&bfqg->stats, gfp) ||
-+	    bfqg_stats_init(&bfqg->dead_stats, gfp)) {
-+		kfree(bfqg);
-+		return NULL;
-+	}
-+
-+	return &bfqg->pd;
-+}
-+
-+static void bfq_group_set_parent(struct bfq_group *bfqg,
-+					struct bfq_group *parent)
-+{
-+	struct bfq_entity *entity;
-+
-+	BUG_ON(!parent);
-+	BUG_ON(!bfqg);
-+	BUG_ON(bfqg == parent);
-+
-+	entity = &bfqg->entity;
-+	entity->parent = parent->my_entity;
-+	entity->sched_data = &parent->sched_data;
-+}
-+
-+static void bfq_pd_init(struct blkg_policy_data *pd)
-+{
-+	struct blkcg_gq *blkg = pd_to_blkg(pd);
-+	struct bfq_group *bfqg = blkg_to_bfqg(blkg);
-+	struct bfq_data *bfqd = blkg->q->elevator->elevator_data;
-+	struct bfq_entity *entity = &bfqg->entity;
-+	struct bfq_group_data *d = blkcg_to_bfqgd(blkg->blkcg);
-+
-+	entity->orig_weight = entity->weight = entity->new_weight = d->weight;
-+	entity->my_sched_data = &bfqg->sched_data;
-+	bfqg->my_entity = entity; /*
-+				   * the root_group's will be set to NULL
-+				   * in bfq_init_queue()
-+				   */
-+	bfqg->bfqd = bfqd;
-+	bfqg->active_entities = 0;
-+}
-+
-+static void bfq_pd_free(struct blkg_policy_data *pd)
-+{
-+	struct bfq_group *bfqg = pd_to_bfqg(pd);
-+
-+	bfqg_stats_exit(&bfqg->stats);
-+	bfqg_stats_exit(&bfqg->dead_stats);
-+
-+	return kfree(bfqg);
-+}
-+
-+/* offset delta from bfqg->stats to bfqg->dead_stats */
-+static const int dead_stats_off_delta = offsetof(struct bfq_group, dead_stats) -
-+					offsetof(struct bfq_group, stats);
-+
-+/* to be used by recursive prfill, sums live and dead stats recursively */
-+static u64 bfqg_stat_pd_recursive_sum(struct blkg_policy_data *pd, int off)
-+{
-+	u64 sum = 0;
-+
-+	sum += blkg_stat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off);
-+	sum += blkg_stat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq,
-+				       off + dead_stats_off_delta);
-+	return sum;
-+}
-+
-+/* to be used by recursive prfill, sums live and dead rwstats recursively */
-+static struct blkg_rwstat
-+bfqg_rwstat_pd_recursive_sum(struct blkg_policy_data *pd, int off)
-+{
-+	struct blkg_rwstat a, b;
-+
-+	a = blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off);
-+	b = blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq,
-+				      off + dead_stats_off_delta);
-+	blkg_rwstat_add_aux(&a, &b);
-+	return a;
-+}
-+
-+static void bfq_pd_reset_stats(struct blkg_policy_data *pd)
-+{
-+	struct bfq_group *bfqg = pd_to_bfqg(pd);
-+
-+	bfqg_stats_reset(&bfqg->stats);
-+	bfqg_stats_reset(&bfqg->dead_stats);
-+}
-+
-+static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
-+					      struct blkcg *blkcg)
-+{
-+	struct request_queue *q = bfqd->queue;
-+	struct bfq_group *bfqg = NULL, *parent;
-+	struct bfq_entity *entity = NULL;
-+
-+	assert_spin_locked(bfqd->queue->queue_lock);
-+
-+	/* avoid lookup for the common case where there's no blkcg */
-+	if (blkcg == &blkcg_root) {
-+		bfqg = bfqd->root_group;
-+	} else {
-+		struct blkcg_gq *blkg;
-+
-+		blkg = blkg_lookup_create(blkcg, q);
-+		if (!IS_ERR(blkg))
-+			bfqg = blkg_to_bfqg(blkg);
-+		else /* fallback to root_group */
-+			bfqg = bfqd->root_group;
-+	}
-+
-+	BUG_ON(!bfqg);
-+
-+	/*
-+	 * Update chain of bfq_groups as we might be handling a leaf group
-+	 * which, along with some of its relatives, has not been hooked yet
-+	 * to the private hierarchy of BFQ.
-+	 */
-+	entity = &bfqg->entity;
-+	for_each_entity(entity) {
-+		bfqg = container_of(entity, struct bfq_group, entity);
-+		BUG_ON(!bfqg);
-+		if (bfqg != bfqd->root_group) {
-+			parent = bfqg_parent(bfqg);
-+			if (!parent)
-+				parent = bfqd->root_group;
-+			BUG_ON(!parent);
-+			bfq_group_set_parent(bfqg, parent);
-+		}
-+	}
-+
-+	return bfqg;
-+}
-+
-+/**
-+ * bfq_bfqq_move - migrate @bfqq to @bfqg.
-+ * @bfqd: queue descriptor.
-+ * @bfqq: the queue to move.
-+ * @entity: @bfqq's entity.
-+ * @bfqg: the group to move to.
-+ *
-+ * Move @bfqq to @bfqg, deactivating it from its old group and reactivating
-+ * it on the new one.  Avoid putting the entity on the old group idle tree.
-+ *
-+ * Must be called under the queue lock; the cgroup owning @bfqg must
-+ * not disappear (by now this just means that we are called under
-+ * rcu_read_lock()).
-+ */
-+static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			  struct bfq_entity *entity, struct bfq_group *bfqg)
-+{
-+	int busy, resume;
-+
-+	busy = bfq_bfqq_busy(bfqq);
-+	resume = !RB_EMPTY_ROOT(&bfqq->sort_list);
-+
-+	BUG_ON(resume && !entity->on_st);
-+	BUG_ON(busy && !resume && entity->on_st &&
-+	       bfqq != bfqd->in_service_queue);
-+
-+	if (busy) {
-+		BUG_ON(atomic_read(&bfqq->ref) < 2);
-+
-+		if (!resume)
-+			bfq_del_bfqq_busy(bfqd, bfqq, 0);
-+		else
-+			bfq_deactivate_bfqq(bfqd, bfqq, 0);
-+	} else if (entity->on_st)
-+		bfq_put_idle_entity(bfq_entity_service_tree(entity), entity);
-+	bfqg_put(bfqq_group(bfqq));
-+
-+	/*
-+	 * Here we use a reference to bfqg.  We don't need a refcounter
-+	 * as the cgroup reference will not be dropped, so that its
-+	 * destroy() callback will not be invoked.
-+	 */
-+	entity->parent = bfqg->my_entity;
-+	entity->sched_data = &bfqg->sched_data;
-+	bfqg_get(bfqg);
-+
-+	if (busy) {
-+		if (resume)
-+			bfq_activate_bfqq(bfqd, bfqq);
-+	}
-+
-+	if (!bfqd->in_service_queue && !bfqd->rq_in_driver)
-+		bfq_schedule_dispatch(bfqd);
-+}
-+
-+/**
-+ * __bfq_bic_change_cgroup - move @bic to @cgroup.
-+ * @bfqd: the queue descriptor.
-+ * @bic: the bic to move.
-+ * @blkcg: the blk-cgroup to move to.
-+ *
-+ * Move bic to blkcg, assuming that bfqd->queue is locked; the caller
-+ * has to make sure that the reference to cgroup is valid across the call.
-+ *
-+ * NOTE: an alternative approach might have been to store the current
-+ * cgroup in bfqq and getting a reference to it, reducing the lookup
-+ * time here, at the price of slightly more complex code.
-+ */
-+static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
-+						struct bfq_io_cq *bic,
-+						struct blkcg *blkcg)
-+{
-+	struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0);
-+	struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1);
-+	struct bfq_group *bfqg;
-+	struct bfq_entity *entity;
-+
-+	lockdep_assert_held(bfqd->queue->queue_lock);
-+
-+	bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+	if (async_bfqq) {
-+		entity = &async_bfqq->entity;
-+
-+		if (entity->sched_data != &bfqg->sched_data) {
-+			bic_set_bfqq(bic, NULL, 0);
-+			bfq_log_bfqq(bfqd, async_bfqq,
-+				     "bic_change_group: %p %d",
-+				     async_bfqq, atomic_read(&async_bfqq->ref));
-+			bfq_put_queue(async_bfqq);
-+		}
-+	}
-+
-+	if (sync_bfqq) {
-+		entity = &sync_bfqq->entity;
-+		if (entity->sched_data != &bfqg->sched_data)
-+			bfq_bfqq_move(bfqd, sync_bfqq, entity, bfqg);
-+	}
-+
-+	return bfqg;
-+}
-+
-+static void bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio)
-+{
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+	struct blkcg *blkcg;
-+	struct bfq_group *bfqg = NULL;
-+	uint64_t id;
-+
-+	rcu_read_lock();
-+	blkcg = bio_blkcg(bio);
-+	id = blkcg->css.serial_nr;
-+	rcu_read_unlock();
-+
-+	/*
-+	 * Check whether blkcg has changed.  The condition may trigger
-+	 * spuriously on a newly created cic but there's no harm.
-+	 */
-+	if (unlikely(!bfqd) || likely(bic->blkcg_id == id))
-+		return;
-+
-+	bfqg = __bfq_bic_change_cgroup(bfqd, bic, blkcg);
-+	BUG_ON(!bfqg);
-+	bic->blkcg_id = id;
-+}
-+
-+/**
-+ * bfq_flush_idle_tree - deactivate any entity on the idle tree of @st.
-+ * @st: the service tree being flushed.
-+ */
-+static void bfq_flush_idle_tree(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entity = st->first_idle;
-+
-+	for (; entity ; entity = st->first_idle)
-+		__bfq_deactivate_entity(entity, 0);
-+}
-+
-+/**
-+ * bfq_reparent_leaf_entity - move leaf entity to the root_group.
-+ * @bfqd: the device data structure with the root group.
-+ * @entity: the entity to move.
-+ */
-+static void bfq_reparent_leaf_entity(struct bfq_data *bfqd,
-+				     struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	BUG_ON(!bfqq);
-+	bfq_bfqq_move(bfqd, bfqq, entity, bfqd->root_group);
-+}
-+
-+/**
-+ * bfq_reparent_active_entities - move to the root group all active
-+ *                                entities.
-+ * @bfqd: the device data structure with the root group.
-+ * @bfqg: the group to move from.
-+ * @st: the service tree with the entities.
-+ *
-+ * Needs queue_lock to be taken and reference to be valid over the call.
-+ */
-+static void bfq_reparent_active_entities(struct bfq_data *bfqd,
-+					 struct bfq_group *bfqg,
-+					 struct bfq_service_tree *st)
-+{
-+	struct rb_root *active = &st->active;
-+	struct bfq_entity *entity = NULL;
-+
-+	if (!RB_EMPTY_ROOT(&st->active))
-+		entity = bfq_entity_of(rb_first(active));
-+
-+	for (; entity ; entity = bfq_entity_of(rb_first(active)))
-+		bfq_reparent_leaf_entity(bfqd, entity);
-+
-+	if (bfqg->sched_data.in_service_entity)
-+		bfq_reparent_leaf_entity(bfqd,
-+			bfqg->sched_data.in_service_entity);
-+}
-+
-+/**
-+ * bfq_destroy_group - destroy @bfqg.
-+ * @bfqg: the group being destroyed.
-+ *
-+ * Destroy @bfqg, making sure that it is not referenced from its parent.
-+ * blkio already grabs the queue_lock for us, so no need to use RCU-based magic
-+ */
-+static void bfq_pd_offline(struct blkg_policy_data *pd)
-+{
-+	struct bfq_service_tree *st;
-+	struct bfq_group *bfqg;
-+	struct bfq_data *bfqd;
-+	struct bfq_entity *entity;
-+	int i;
-+
-+	BUG_ON(!pd);
-+	bfqg = pd_to_bfqg(pd);
-+	BUG_ON(!bfqg);
-+	bfqd = bfqg->bfqd;
-+	BUG_ON(bfqd && !bfqd->root_group);
-+
-+	entity = bfqg->my_entity;
-+
-+	if (!entity) /* root group */
-+		return;
-+
-+	/*
-+	 * Empty all service_trees belonging to this group before
-+	 * deactivating the group itself.
-+	 */
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) {
-+		BUG_ON(!bfqg->sched_data.service_tree);
-+		st = bfqg->sched_data.service_tree + i;
-+		/*
-+		 * The idle tree may still contain bfq_queues belonging
-+		 * to exited task because they never migrated to a different
-+		 * cgroup from the one being destroyed now.  No one else
-+		 * can access them so it's safe to act without any lock.
-+		 */
-+		bfq_flush_idle_tree(st);
-+
-+		/*
-+		 * It may happen that some queues are still active
-+		 * (busy) upon group destruction (if the corresponding
-+		 * processes have been forced to terminate). We move
-+		 * all the leaf entities corresponding to these queues
-+		 * to the root_group.
-+		 * Also, it may happen that the group has an entity
-+		 * in service, which is disconnected from the active
-+		 * tree: it must be moved, too.
-+		 * There is no need to put the sync queues, as the
-+		 * scheduler has taken no reference.
-+		 */
-+		bfq_reparent_active_entities(bfqd, bfqg, st);
-+		BUG_ON(!RB_EMPTY_ROOT(&st->active));
-+		BUG_ON(!RB_EMPTY_ROOT(&st->idle));
-+	}
-+	BUG_ON(bfqg->sched_data.next_in_service);
-+	BUG_ON(bfqg->sched_data.in_service_entity);
-+
-+	__bfq_deactivate_entity(entity, 0);
-+	bfq_put_async_queues(bfqd, bfqg);
-+	BUG_ON(entity->tree);
-+
-+	bfqg_stats_xfer_dead(bfqg);
-+}
-+
-+static void bfq_end_wr_async(struct bfq_data *bfqd)
-+{
-+	struct blkcg_gq *blkg;
-+
-+	list_for_each_entry(blkg, &bfqd->queue->blkg_list, q_node) {
-+		struct bfq_group *bfqg = blkg_to_bfqg(blkg);
-+
-+		bfq_end_wr_async_queues(bfqd, bfqg);
-+	}
-+	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static u64 bfqio_cgroup_weight_read(struct cgroup_subsys_state *css,
-+				       struct cftype *cftype)
-+{
-+	struct blkcg *blkcg = css_to_blkcg(css);
-+	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
-+	int ret = -EINVAL;
-+
-+	spin_lock_irq(&blkcg->lock);
-+	ret = bfqgd->weight;
-+	spin_unlock_irq(&blkcg->lock);
-+
-+	return ret;
-+}
-+
-+static int bfqio_cgroup_weight_read_dfl(struct seq_file *sf, void *v)
-+{
-+	struct blkcg *blkcg = css_to_blkcg(seq_css(sf));
-+	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
-+
-+	spin_lock_irq(&blkcg->lock);
-+	seq_printf(sf, "%u\n", bfqgd->weight);
-+	spin_unlock_irq(&blkcg->lock);
-+
-+	return 0;
-+}
-+
-+static int bfqio_cgroup_weight_write(struct cgroup_subsys_state *css,
-+					struct cftype *cftype,
-+					u64 val)
-+{
-+	struct blkcg *blkcg = css_to_blkcg(css);
-+	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
-+	struct blkcg_gq *blkg;
-+	int ret = -EINVAL;
-+
-+	if (val < BFQ_MIN_WEIGHT || val > BFQ_MAX_WEIGHT)
-+		return ret;
-+
-+	ret = 0;
-+	spin_lock_irq(&blkcg->lock);
-+	bfqgd->weight = (unsigned short)val;
-+	hlist_for_each_entry(blkg, &blkcg->blkg_list, blkcg_node) {
-+		struct bfq_group *bfqg = blkg_to_bfqg(blkg);
-+
-+		if (!bfqg)
-+			continue;
-+		/*
-+		 * Setting the prio_changed flag of the entity
-+		 * to 1 with new_weight == weight would re-set
-+		 * the value of the weight to its ioprio mapping.
-+		 * Set the flag only if necessary.
-+		 */
-+		if ((unsigned short)val != bfqg->entity.new_weight) {
-+			bfqg->entity.new_weight = (unsigned short)val;
-+			/*
-+			 * Make sure that the above new value has been
-+			 * stored in bfqg->entity.new_weight before
-+			 * setting the prio_changed flag. In fact,
-+			 * this flag may be read asynchronously (in
-+			 * critical sections protected by a different
-+			 * lock than that held here), and finding this
-+			 * flag set may cause the execution of the code
-+			 * for updating parameters whose value may
-+			 * depend also on bfqg->entity.new_weight (in
-+			 * __bfq_entity_update_weight_prio).
-+			 * This barrier makes sure that the new value
-+			 * of bfqg->entity.new_weight is correctly
-+			 * seen in that code.
-+			 */
-+			smp_wmb();
-+			bfqg->entity.prio_changed = 1;
-+		}
-+	}
-+	spin_unlock_irq(&blkcg->lock);
-+
-+	return ret;
-+}
-+
-+static ssize_t bfqio_cgroup_weight_write_dfl(struct kernfs_open_file *of,
-+					     char *buf, size_t nbytes,
-+					     loff_t off)
-+{
-+	/* First unsigned long found in the file is used */
-+	return bfqio_cgroup_weight_write(of_css(of), NULL,
-+					 simple_strtoull(strim(buf), NULL, 0));
-+}
-+
-+static int bfqg_print_stat(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_stat,
-+			  &blkcg_policy_bfq, seq_cft(sf)->private, false);
-+	return 0;
-+}
-+
-+static int bfqg_print_rwstat(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_rwstat,
-+			  &blkcg_policy_bfq, seq_cft(sf)->private, true);
-+	return 0;
-+}
-+
-+static u64 bfqg_prfill_stat_recursive(struct seq_file *sf,
-+				      struct blkg_policy_data *pd, int off)
-+{
-+	u64 sum = bfqg_stat_pd_recursive_sum(pd, off);
-+
-+	return __blkg_prfill_u64(sf, pd, sum);
-+}
-+
-+static u64 bfqg_prfill_rwstat_recursive(struct seq_file *sf,
-+					struct blkg_policy_data *pd, int off)
-+{
-+	struct blkg_rwstat sum = bfqg_rwstat_pd_recursive_sum(pd, off);
-+
-+	return __blkg_prfill_rwstat(sf, pd, &sum);
-+}
-+
-+static int bfqg_print_stat_recursive(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_stat_recursive, &blkcg_policy_bfq,
-+			  seq_cft(sf)->private, false);
-+	return 0;
-+}
-+
-+static int bfqg_print_rwstat_recursive(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_rwstat_recursive, &blkcg_policy_bfq,
-+			  seq_cft(sf)->private, true);
-+	return 0;
-+}
-+
-+static u64 bfqg_prfill_avg_queue_size(struct seq_file *sf,
-+				      struct blkg_policy_data *pd, int off)
-+{
-+	struct bfq_group *bfqg = pd_to_bfqg(pd);
-+	u64 samples = blkg_stat_read(&bfqg->stats.avg_queue_size_samples);
-+	u64 v = 0;
-+
-+	if (samples) {
-+		v = blkg_stat_read(&bfqg->stats.avg_queue_size_sum);
-+		v = div64_u64(v, samples);
-+	}
-+	__blkg_prfill_u64(sf, pd, v);
-+	return 0;
-+}
-+
-+/* print avg_queue_size */
-+static int bfqg_print_avg_queue_size(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_avg_queue_size, &blkcg_policy_bfq,
-+			  0, false);
-+	return 0;
-+}
-+
-+static struct bfq_group *
-+bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
-+{
-+	int ret;
-+
-+	ret = blkcg_activate_policy(bfqd->queue, &blkcg_policy_bfq);
-+	if (ret)
-+		return NULL;
-+
-+	return blkg_to_bfqg(bfqd->queue->root_blkg);
-+}
-+
-+static struct blkcg_policy_data *bfq_cpd_alloc(gfp_t gfp)
-+{
-+	struct bfq_group_data *bgd;
-+
-+	bgd = kzalloc(sizeof(*bgd), GFP_KERNEL);
-+	if (!bgd)
-+		return NULL;
-+	return &bgd->pd;
-+}
-+
-+static void bfq_cpd_free(struct blkcg_policy_data *cpd)
-+{
-+	kfree(cpd_to_bfqgd(cpd));
-+}
-+
-+static struct cftype bfqio_files_dfl[] = {
-+	{
-+		.name = "weight",
-+		.flags = CFTYPE_NOT_ON_ROOT,
-+		.seq_show = bfqio_cgroup_weight_read_dfl,
-+		.write = bfqio_cgroup_weight_write_dfl,
-+	},
-+	{} /* terminate */
-+};
-+
-+static struct cftype bfqio_files[] = {
-+	{
-+		.name = "bfq.weight",
-+		.read_u64 = bfqio_cgroup_weight_read,
-+		.write_u64 = bfqio_cgroup_weight_write,
-+	},
-+	/* statistics, cover only the tasks in the bfqg */
-+	{
-+		.name = "bfq.time",
-+		.private = offsetof(struct bfq_group, stats.time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.sectors",
-+		.private = offsetof(struct bfq_group, stats.sectors),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.io_service_bytes",
-+		.private = offsetof(struct bfq_group, stats.service_bytes),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_serviced",
-+		.private = offsetof(struct bfq_group, stats.serviced),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_service_time",
-+		.private = offsetof(struct bfq_group, stats.service_time),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_wait_time",
-+		.private = offsetof(struct bfq_group, stats.wait_time),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_merged",
-+		.private = offsetof(struct bfq_group, stats.merged),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+	{
-+		.name = "bfq.io_queued",
-+		.private = offsetof(struct bfq_group, stats.queued),
-+		.seq_show = bfqg_print_rwstat,
-+	},
-+
-+	/* the same statictics which cover the bfqg and its descendants */
-+	{
-+		.name = "bfq.time_recursive",
-+		.private = offsetof(struct bfq_group, stats.time),
-+		.seq_show = bfqg_print_stat_recursive,
-+	},
-+	{
-+		.name = "bfq.sectors_recursive",
-+		.private = offsetof(struct bfq_group, stats.sectors),
-+		.seq_show = bfqg_print_stat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_service_bytes_recursive",
-+		.private = offsetof(struct bfq_group, stats.service_bytes),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_serviced_recursive",
-+		.private = offsetof(struct bfq_group, stats.serviced),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_service_time_recursive",
-+		.private = offsetof(struct bfq_group, stats.service_time),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_wait_time_recursive",
-+		.private = offsetof(struct bfq_group, stats.wait_time),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_merged_recursive",
-+		.private = offsetof(struct bfq_group, stats.merged),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.io_queued_recursive",
-+		.private = offsetof(struct bfq_group, stats.queued),
-+		.seq_show = bfqg_print_rwstat_recursive,
-+	},
-+	{
-+		.name = "bfq.avg_queue_size",
-+		.seq_show = bfqg_print_avg_queue_size,
-+	},
-+	{
-+		.name = "bfq.group_wait_time",
-+		.private = offsetof(struct bfq_group, stats.group_wait_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.idle_time",
-+		.private = offsetof(struct bfq_group, stats.idle_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.empty_time",
-+		.private = offsetof(struct bfq_group, stats.empty_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.dequeue",
-+		.private = offsetof(struct bfq_group, stats.dequeue),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{
-+		.name = "bfq.unaccounted_time",
-+		.private = offsetof(struct bfq_group, stats.unaccounted_time),
-+		.seq_show = bfqg_print_stat,
-+	},
-+	{ }	/* terminate */
-+};
-+
-+static struct blkcg_policy blkcg_policy_bfq = {
-+	.dfl_cftypes            = bfqio_files_dfl,
-+	.legacy_cftypes		= bfqio_files,
-+
-+	.pd_alloc_fn		= bfq_pd_alloc,
-+	.pd_init_fn		= bfq_pd_init,
-+	.pd_offline_fn		= bfq_pd_offline,
-+	.pd_free_fn		= bfq_pd_free,
-+	.pd_reset_stats_fn	= bfq_pd_reset_stats,
-+
-+	.cpd_alloc_fn		= bfq_cpd_alloc,
-+	.cpd_init_fn		= bfq_cpd_init,
-+	.cpd_bind_fn		= bfq_cpd_init,
-+	.cpd_free_fn		= bfq_cpd_free,
-+};
-+
-+#else
-+
-+static void bfq_init_entity(struct bfq_entity *entity,
-+			    struct bfq_group *bfqg)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	entity->weight = entity->new_weight;
-+	entity->orig_weight = entity->new_weight;
-+	if (bfqq) {
-+		bfqq->ioprio = bfqq->new_ioprio;
-+		bfqq->ioprio_class = bfqq->new_ioprio_class;
-+	}
-+	entity->sched_data = &bfqg->sched_data;
-+}
-+
-+static struct bfq_group *
-+bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio)
-+{
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+
-+	return bfqd->root_group;
-+}
-+
-+static void bfq_bfqq_move(struct bfq_data *bfqd,
-+			  struct bfq_queue *bfqq,
-+			  struct bfq_entity *entity,
-+			  struct bfq_group *bfqg)
-+{
-+}
-+
-+static void bfq_end_wr_async(struct bfq_data *bfqd)
-+{
-+	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static void bfq_disconnect_groups(struct bfq_data *bfqd)
-+{
-+	bfq_put_async_queues(bfqd, bfqd->root_group);
-+}
-+
-+static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
-+					      struct blkcg *blkcg)
-+{
-+	return bfqd->root_group;
-+}
-+
-+static struct bfq_group *
-+bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
-+{
-+	struct bfq_group *bfqg;
-+	int i;
-+
-+	bfqg = kmalloc_node(sizeof(*bfqg), GFP_KERNEL | __GFP_ZERO, node);
-+	if (!bfqg)
-+		return NULL;
-+
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
-+		bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
-+
-+	return bfqg;
-+}
-+#endif
-diff --git a/block/bfq-ioc.c b/block/bfq-ioc.c
-new file mode 100644
-index 0000000..fb7bb8f
---- /dev/null
-+++ b/block/bfq-ioc.c
-@@ -0,0 +1,36 @@
-+/*
-+ * BFQ: I/O context handling.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+/**
-+ * icq_to_bic - convert iocontext queue structure to bfq_io_cq.
-+ * @icq: the iocontext queue.
-+ */
-+static struct bfq_io_cq *icq_to_bic(struct io_cq *icq)
-+{
-+	/* bic->icq is the first member, %NULL will convert to %NULL */
-+	return container_of(icq, struct bfq_io_cq, icq);
-+}
-+
-+/**
-+ * bfq_bic_lookup - search into @ioc a bic associated to @bfqd.
-+ * @bfqd: the lookup key.
-+ * @ioc: the io_context of the process doing I/O.
-+ *
-+ * Queue lock must be held.
-+ */
-+static struct bfq_io_cq *bfq_bic_lookup(struct bfq_data *bfqd,
-+					struct io_context *ioc)
-+{
-+	if (ioc)
-+		return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue));
-+	return NULL;
-+}
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-new file mode 100644
-index 0000000..85e2169
---- /dev/null
-+++ b/block/bfq-iosched.c
-@@ -0,0 +1,3763 @@
-+/*
-+ * Budget Fair Queueing (BFQ) disk scheduler.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-+ * file.
-+ *
-+ * BFQ is a proportional-share storage-I/O scheduling algorithm based on
-+ * the slice-by-slice service scheme of CFQ. But BFQ assigns budgets,
-+ * measured in number of sectors, to processes instead of time slices. The
-+ * device is not granted to the in-service process for a given time slice,
-+ * but until it has exhausted its assigned budget. This change from the time
-+ * to the service domain allows BFQ to distribute the device throughput
-+ * among processes as desired, without any distortion due to ZBR, workload
-+ * fluctuations or other factors. BFQ uses an ad hoc internal scheduler,
-+ * called B-WF2Q+, to schedule processes according to their budgets. More
-+ * precisely, BFQ schedules queues associated to processes. Thanks to the
-+ * accurate policy of B-WF2Q+, BFQ can afford to assign high budgets to
-+ * I/O-bound processes issuing sequential requests (to boost the
-+ * throughput), and yet guarantee a low latency to interactive and soft
-+ * real-time applications.
-+ *
-+ * BFQ is described in [1], where also a reference to the initial, more
-+ * theoretical paper on BFQ can be found. The interested reader can find
-+ * in the latter paper full details on the main algorithm, as well as
-+ * formulas of the guarantees and formal proofs of all the properties.
-+ * With respect to the version of BFQ presented in these papers, this
-+ * implementation adds a few more heuristics, such as the one that
-+ * guarantees a low latency to soft real-time applications, and a
-+ * hierarchical extension based on H-WF2Q+.
-+ *
-+ * B-WF2Q+ is based on WF2Q+, that is described in [2], together with
-+ * H-WF2Q+, while the augmented tree used to implement B-WF2Q+ with O(log N)
-+ * complexity derives from the one introduced with EEVDF in [3].
-+ *
-+ * [1] P. Valente and M. Andreolini, ``Improving Application Responsiveness
-+ *     with the BFQ Disk I/O Scheduler'',
-+ *     Proceedings of the 5th Annual International Systems and Storage
-+ *     Conference (SYSTOR '12), June 2012.
-+ *
-+ * http://algogroup.unimo.it/people/paolo/disk_sched/bf1-v1-suite-results.pdf
-+ *
-+ * [2] Jon C.R. Bennett and H. Zhang, ``Hierarchical Packet Fair Queueing
-+ *     Algorithms,'' IEEE/ACM Transactions on Networking, 5(5):675-689,
-+ *     Oct 1997.
-+ *
-+ * http://www.cs.cmu.edu/~hzhang/papers/TON-97-Oct.ps.gz
-+ *
-+ * [3] I. Stoica and H. Abdel-Wahab, ``Earliest Eligible Virtual Deadline
-+ *     First: A Flexible and Accurate Mechanism for Proportional Share
-+ *     Resource Allocation,'' technical report.
-+ *
-+ * http://www.cs.berkeley.edu/~istoica/papers/eevdf-tr-95.pdf
-+ */
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/blkdev.h>
-+#include <linux/cgroup.h>
-+#include <linux/elevator.h>
-+#include <linux/jiffies.h>
-+#include <linux/rbtree.h>
-+#include <linux/ioprio.h>
-+#include "bfq.h"
-+#include "blk.h"
-+
-+/* Expiration time of sync (0) and async (1) requests, in jiffies. */
-+static const int bfq_fifo_expire[2] = { HZ / 4, HZ / 8 };
-+
-+/* Maximum backwards seek, in KiB. */
-+static const int bfq_back_max = 16 * 1024;
-+
-+/* Penalty of a backwards seek, in number of sectors. */
-+static const int bfq_back_penalty = 2;
-+
-+/* Idling period duration, in jiffies. */
-+static int bfq_slice_idle = HZ / 125;
-+
-+/* Minimum number of assigned budgets for which stats are safe to compute. */
-+static const int bfq_stats_min_budgets = 194;
-+
-+/* Default maximum budget values, in sectors and number of requests. */
-+static const int bfq_default_max_budget = 16 * 1024;
-+static const int bfq_max_budget_async_rq = 4;
-+
-+/*
-+ * Async to sync throughput distribution is controlled as follows:
-+ * when an async request is served, the entity is charged the number
-+ * of sectors of the request, multiplied by the factor below
-+ */
-+static const int bfq_async_charge_factor = 10;
-+
-+/* Default timeout values, in jiffies, approximating CFQ defaults. */
-+static const int bfq_timeout_sync = HZ / 8;
-+static int bfq_timeout_async = HZ / 25;
-+
-+struct kmem_cache *bfq_pool;
-+
-+/* Below this threshold (in ms), we consider thinktime immediate. */
-+#define BFQ_MIN_TT		2
-+
-+/* hw_tag detection: parallel requests threshold and min samples needed. */
-+#define BFQ_HW_QUEUE_THRESHOLD	4
-+#define BFQ_HW_QUEUE_SAMPLES	32
-+
-+#define BFQQ_SEEK_THR	 (sector_t)(8 * 1024)
-+#define BFQQ_SEEKY(bfqq) ((bfqq)->seek_mean > BFQQ_SEEK_THR)
-+
-+/* Min samples used for peak rate estimation (for autotuning). */
-+#define BFQ_PEAK_RATE_SAMPLES	32
-+
-+/* Shift used for peak rate fixed precision calculations. */
-+#define BFQ_RATE_SHIFT		16
-+
-+/*
-+ * By default, BFQ computes the duration of the weight raising for
-+ * interactive applications automatically, using the following formula:
-+ * duration = (R / r) * T, where r is the peak rate of the device, and
-+ * R and T are two reference parameters.
-+ * In particular, R is the peak rate of the reference device (see below),
-+ * and T is a reference time: given the systems that are likely to be
-+ * installed on the reference device according to its speed class, T is
-+ * about the maximum time needed, under BFQ and while reading two files in
-+ * parallel, to load typical large applications on these systems.
-+ * In practice, the slower/faster the device at hand is, the more/less it
-+ * takes to load applications with respect to the reference device.
-+ * Accordingly, the longer/shorter BFQ grants weight raising to interactive
-+ * applications.
-+ *
-+ * BFQ uses four different reference pairs (R, T), depending on:
-+ * . whether the device is rotational or non-rotational;
-+ * . whether the device is slow, such as old or portable HDDs, as well as
-+ *   SD cards, or fast, such as newer HDDs and SSDs.
-+ *
-+ * The device's speed class is dynamically (re)detected in
-+ * bfq_update_peak_rate() every time the estimated peak rate is updated.
-+ *
-+ * In the following definitions, R_slow[0]/R_fast[0] and T_slow[0]/T_fast[0]
-+ * are the reference values for a slow/fast rotational device, whereas
-+ * R_slow[1]/R_fast[1] and T_slow[1]/T_fast[1] are the reference values for
-+ * a slow/fast non-rotational device. Finally, device_speed_thresh are the
-+ * thresholds used to switch between speed classes.
-+ * Both the reference peak rates and the thresholds are measured in
-+ * sectors/usec, left-shifted by BFQ_RATE_SHIFT.
-+ */
-+static int R_slow[2] = {1536, 10752};
-+static int R_fast[2] = {17415, 34791};
-+/*
-+ * To improve readability, a conversion function is used to initialize the
-+ * following arrays, which entails that they can be initialized only in a
-+ * function.
-+ */
-+static int T_slow[2];
-+static int T_fast[2];
-+static int device_speed_thresh[2];
-+
-+#define BFQ_SERVICE_TREE_INIT	((struct bfq_service_tree)		\
-+				{ RB_ROOT, RB_ROOT, NULL, NULL, 0, 0 })
-+
-+#define RQ_BIC(rq)		((struct bfq_io_cq *) (rq)->elv.priv[0])
-+#define RQ_BFQQ(rq)		((rq)->elv.priv[1])
-+
-+static void bfq_schedule_dispatch(struct bfq_data *bfqd);
-+
-+#include "bfq-ioc.c"
-+#include "bfq-sched.c"
-+#include "bfq-cgroup.c"
-+
-+#define bfq_class_idle(bfqq)	((bfqq)->ioprio_class == IOPRIO_CLASS_IDLE)
-+#define bfq_class_rt(bfqq)	((bfqq)->ioprio_class == IOPRIO_CLASS_RT)
-+
-+#define bfq_sample_valid(samples)	((samples) > 80)
-+
-+/*
-+ * We regard a request as SYNC, if either it's a read or has the SYNC bit
-+ * set (in which case it could also be a direct WRITE).
-+ */
-+static int bfq_bio_sync(struct bio *bio)
-+{
-+	if (bio_data_dir(bio) == READ || (bio->bi_rw & REQ_SYNC))
-+		return 1;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Scheduler run of queue, if there are requests pending and no one in the
-+ * driver that will restart queueing.
-+ */
-+static void bfq_schedule_dispatch(struct bfq_data *bfqd)
-+{
-+	if (bfqd->queued != 0) {
-+		bfq_log(bfqd, "schedule dispatch");
-+		kblockd_schedule_work(&bfqd->unplug_work);
-+	}
-+}
-+
-+/*
-+ * Lifted from AS - choose which of rq1 and rq2 that is best served now.
-+ * We choose the request that is closesr to the head right now.  Distance
-+ * behind the head is penalized and only allowed to a certain extent.
-+ */
-+static struct request *bfq_choose_req(struct bfq_data *bfqd,
-+				      struct request *rq1,
-+				      struct request *rq2,
-+				      sector_t last)
-+{
-+	sector_t s1, s2, d1 = 0, d2 = 0;
-+	unsigned long back_max;
-+#define BFQ_RQ1_WRAP	0x01 /* request 1 wraps */
-+#define BFQ_RQ2_WRAP	0x02 /* request 2 wraps */
-+	unsigned int wrap = 0; /* bit mask: requests behind the disk head? */
-+
-+	if (!rq1 || rq1 == rq2)
-+		return rq2;
-+	if (!rq2)
-+		return rq1;
-+
-+	if (rq_is_sync(rq1) && !rq_is_sync(rq2))
-+		return rq1;
-+	else if (rq_is_sync(rq2) && !rq_is_sync(rq1))
-+		return rq2;
-+	if ((rq1->cmd_flags & REQ_META) && !(rq2->cmd_flags & REQ_META))
-+		return rq1;
-+	else if ((rq2->cmd_flags & REQ_META) && !(rq1->cmd_flags & REQ_META))
-+		return rq2;
-+
-+	s1 = blk_rq_pos(rq1);
-+	s2 = blk_rq_pos(rq2);
-+
-+	/*
-+	 * By definition, 1KiB is 2 sectors.
-+	 */
-+	back_max = bfqd->bfq_back_max * 2;
-+
-+	/*
-+	 * Strict one way elevator _except_ in the case where we allow
-+	 * short backward seeks which are biased as twice the cost of a
-+	 * similar forward seek.
-+	 */
-+	if (s1 >= last)
-+		d1 = s1 - last;
-+	else if (s1 + back_max >= last)
-+		d1 = (last - s1) * bfqd->bfq_back_penalty;
-+	else
-+		wrap |= BFQ_RQ1_WRAP;
-+
-+	if (s2 >= last)
-+		d2 = s2 - last;
-+	else if (s2 + back_max >= last)
-+		d2 = (last - s2) * bfqd->bfq_back_penalty;
-+	else
-+		wrap |= BFQ_RQ2_WRAP;
-+
-+	/* Found required data */
-+
-+	/*
-+	 * By doing switch() on the bit mask "wrap" we avoid having to
-+	 * check two variables for all permutations: --> faster!
-+	 */
-+	switch (wrap) {
-+	case 0: /* common case for CFQ: rq1 and rq2 not wrapped */
-+		if (d1 < d2)
-+			return rq1;
-+		else if (d2 < d1)
-+			return rq2;
-+
-+		if (s1 >= s2)
-+			return rq1;
-+		else
-+			return rq2;
-+
-+	case BFQ_RQ2_WRAP:
-+		return rq1;
-+	case BFQ_RQ1_WRAP:
-+		return rq2;
-+	case (BFQ_RQ1_WRAP|BFQ_RQ2_WRAP): /* both rqs wrapped */
-+	default:
-+		/*
-+		 * Since both rqs are wrapped,
-+		 * start with the one that's further behind head
-+		 * (--> only *one* back seek required),
-+		 * since back seek takes more time than forward.
-+		 */
-+		if (s1 <= s2)
-+			return rq1;
-+		else
-+			return rq2;
-+	}
-+}
-+
-+/*
-+ * Tell whether there are active queues or groups with differentiated weights.
-+ */
-+static bool bfq_differentiated_weights(struct bfq_data *bfqd)
-+{
-+	/*
-+	 * For weights to differ, at least one of the trees must contain
-+	 * at least two nodes.
-+	 */
-+	return (!RB_EMPTY_ROOT(&bfqd->queue_weights_tree) &&
-+		(bfqd->queue_weights_tree.rb_node->rb_left ||
-+		 bfqd->queue_weights_tree.rb_node->rb_right)
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	       ) ||
-+	       (!RB_EMPTY_ROOT(&bfqd->group_weights_tree) &&
-+		(bfqd->group_weights_tree.rb_node->rb_left ||
-+		 bfqd->group_weights_tree.rb_node->rb_right)
-+#endif
-+	       );
-+}
-+
-+/*
-+ * The following function returns true if every queue must receive the
-+ * same share of the throughput (this condition is used when deciding
-+ * whether idling may be disabled, see the comments in the function
-+ * bfq_bfqq_may_idle()).
-+ *
-+ * Such a scenario occurs when:
-+ * 1) all active queues have the same weight,
-+ * 2) all active groups at the same level in the groups tree have the same
-+ *    weight,
-+ * 3) all active groups at the same level in the groups tree have the same
-+ *    number of children.
-+ *
-+ * Unfortunately, keeping the necessary state for evaluating exactly the
-+ * above symmetry conditions would be quite complex and time-consuming.
-+ * Therefore this function evaluates, instead, the following stronger
-+ * sub-conditions, for which it is much easier to maintain the needed
-+ * state:
-+ * 1) all active queues have the same weight,
-+ * 2) all active groups have the same weight,
-+ * 3) all active groups have at most one active child each.
-+ * In particular, the last two conditions are always true if hierarchical
-+ * support and the cgroups interface are not enabled, thus no state needs
-+ * to be maintained in this case.
-+ */
-+static bool bfq_symmetric_scenario(struct bfq_data *bfqd)
-+{
-+	return
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		!bfqd->active_numerous_groups &&
-+#endif
-+		!bfq_differentiated_weights(bfqd);
-+}
-+
-+/*
-+ * If the weight-counter tree passed as input contains no counter for
-+ * the weight of the input entity, then add that counter; otherwise just
-+ * increment the existing counter.
-+ *
-+ * Note that weight-counter trees contain few nodes in mostly symmetric
-+ * scenarios. For example, if all queues have the same weight, then the
-+ * weight-counter tree for the queues may contain at most one node.
-+ * This holds even if low_latency is on, because weight-raised queues
-+ * are not inserted in the tree.
-+ * In most scenarios, the rate at which nodes are created/destroyed
-+ * should be low too.
-+ */
-+static void bfq_weights_tree_add(struct bfq_data *bfqd,
-+				 struct bfq_entity *entity,
-+				 struct rb_root *root)
-+{
-+	struct rb_node **new = &(root->rb_node), *parent = NULL;
-+
-+	/*
-+	 * Do not insert if the entity is already associated with a
-+	 * counter, which happens if:
-+	 *   1) the entity is associated with a queue,
-+	 *   2) a request arrival has caused the queue to become both
-+	 *      non-weight-raised, and hence change its weight, and
-+	 *      backlogged; in this respect, each of the two events
-+	 *      causes an invocation of this function,
-+	 *   3) this is the invocation of this function caused by the
-+	 *      second event. This second invocation is actually useless,
-+	 *      and we handle this fact by exiting immediately. More
-+	 *      efficient or clearer solutions might possibly be adopted.
-+	 */
-+	if (entity->weight_counter)
-+		return;
-+
-+	while (*new) {
-+		struct bfq_weight_counter *__counter = container_of(*new,
-+						struct bfq_weight_counter,
-+						weights_node);
-+		parent = *new;
-+
-+		if (entity->weight == __counter->weight) {
-+			entity->weight_counter = __counter;
-+			goto inc_counter;
-+		}
-+		if (entity->weight < __counter->weight)
-+			new = &((*new)->rb_left);
-+		else
-+			new = &((*new)->rb_right);
-+	}
-+
-+	entity->weight_counter = kzalloc(sizeof(struct bfq_weight_counter),
-+					 GFP_ATOMIC);
-+	entity->weight_counter->weight = entity->weight;
-+	rb_link_node(&entity->weight_counter->weights_node, parent, new);
-+	rb_insert_color(&entity->weight_counter->weights_node, root);
-+
-+inc_counter:
-+	entity->weight_counter->num_active++;
-+}
-+
-+/*
-+ * Decrement the weight counter associated with the entity, and, if the
-+ * counter reaches 0, remove the counter from the tree.
-+ * See the comments to the function bfq_weights_tree_add() for considerations
-+ * about overhead.
-+ */
-+static void bfq_weights_tree_remove(struct bfq_data *bfqd,
-+				    struct bfq_entity *entity,
-+				    struct rb_root *root)
-+{
-+	if (!entity->weight_counter)
-+		return;
-+
-+	BUG_ON(RB_EMPTY_ROOT(root));
-+	BUG_ON(entity->weight_counter->weight != entity->weight);
-+
-+	BUG_ON(!entity->weight_counter->num_active);
-+	entity->weight_counter->num_active--;
-+	if (entity->weight_counter->num_active > 0)
-+		goto reset_entity_pointer;
-+
-+	rb_erase(&entity->weight_counter->weights_node, root);
-+	kfree(entity->weight_counter);
-+
-+reset_entity_pointer:
-+	entity->weight_counter = NULL;
-+}
-+
-+static struct request *bfq_find_next_rq(struct bfq_data *bfqd,
-+					struct bfq_queue *bfqq,
-+					struct request *last)
-+{
-+	struct rb_node *rbnext = rb_next(&last->rb_node);
-+	struct rb_node *rbprev = rb_prev(&last->rb_node);
-+	struct request *next = NULL, *prev = NULL;
-+
-+	BUG_ON(RB_EMPTY_NODE(&last->rb_node));
-+
-+	if (rbprev)
-+		prev = rb_entry_rq(rbprev);
-+
-+	if (rbnext)
-+		next = rb_entry_rq(rbnext);
-+	else {
-+		rbnext = rb_first(&bfqq->sort_list);
-+		if (rbnext && rbnext != &last->rb_node)
-+			next = rb_entry_rq(rbnext);
-+	}
-+
-+	return bfq_choose_req(bfqd, next, prev, blk_rq_pos(last));
-+}
-+
-+/* see the definition of bfq_async_charge_factor for details */
-+static unsigned long bfq_serv_to_charge(struct request *rq,
-+					struct bfq_queue *bfqq)
-+{
-+	return blk_rq_sectors(rq) *
-+		(1 + ((!bfq_bfqq_sync(bfqq)) * (bfqq->wr_coeff == 1) *
-+		bfq_async_charge_factor));
-+}
-+
-+/**
-+ * bfq_updated_next_req - update the queue after a new next_rq selection.
-+ * @bfqd: the device data the queue belongs to.
-+ * @bfqq: the queue to update.
-+ *
-+ * If the first request of a queue changes we make sure that the queue
-+ * has enough budget to serve at least its first request (if the
-+ * request has grown).  We do this because if the queue has not enough
-+ * budget for its first request, it has to go through two dispatch
-+ * rounds to actually get it dispatched.
-+ */
-+static void bfq_updated_next_req(struct bfq_data *bfqd,
-+				 struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+	struct request *next_rq = bfqq->next_rq;
-+	unsigned long new_budget;
-+
-+	if (!next_rq)
-+		return;
-+
-+	if (bfqq == bfqd->in_service_queue)
-+		/*
-+		 * In order not to break guarantees, budgets cannot be
-+		 * changed after an entity has been selected.
-+		 */
-+		return;
-+
-+	BUG_ON(entity->tree != &st->active);
-+	BUG_ON(entity == entity->sched_data->in_service_entity);
-+
-+	new_budget = max_t(unsigned long, bfqq->max_budget,
-+			   bfq_serv_to_charge(next_rq, bfqq));
-+	if (entity->budget != new_budget) {
-+		entity->budget = new_budget;
-+		bfq_log_bfqq(bfqd, bfqq, "updated next rq: new budget %lu",
-+					 new_budget);
-+		bfq_activate_bfqq(bfqd, bfqq);
-+	}
-+}
-+
-+static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
-+{
-+	u64 dur;
-+
-+	if (bfqd->bfq_wr_max_time > 0)
-+		return bfqd->bfq_wr_max_time;
-+
-+	dur = bfqd->RT_prod;
-+	do_div(dur, bfqd->peak_rate);
-+
-+	return dur;
-+}
-+
-+/* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */
-+static void bfq_reset_burst_list(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct bfq_queue *item;
-+	struct hlist_node *n;
-+
-+	hlist_for_each_entry_safe(item, n, &bfqd->burst_list, burst_list_node)
-+		hlist_del_init(&item->burst_list_node);
-+	hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
-+	bfqd->burst_size = 1;
-+}
-+
-+/* Add bfqq to the list of queues in current burst (see bfq_handle_burst) */
-+static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	/* Increment burst size to take into account also bfqq */
-+	bfqd->burst_size++;
-+
-+	if (bfqd->burst_size == bfqd->bfq_large_burst_thresh) {
-+		struct bfq_queue *pos, *bfqq_item;
-+		struct hlist_node *n;
-+
-+		/*
-+		 * Enough queues have been activated shortly after each
-+		 * other to consider this burst as large.
-+		 */
-+		bfqd->large_burst = true;
-+
-+		/*
-+		 * We can now mark all queues in the burst list as
-+		 * belonging to a large burst.
-+		 */
-+		hlist_for_each_entry(bfqq_item, &bfqd->burst_list,
-+				     burst_list_node)
-+			bfq_mark_bfqq_in_large_burst(bfqq_item);
-+		bfq_mark_bfqq_in_large_burst(bfqq);
-+
-+		/*
-+		 * From now on, and until the current burst finishes, any
-+		 * new queue being activated shortly after the last queue
-+		 * was inserted in the burst can be immediately marked as
-+		 * belonging to a large burst. So the burst list is not
-+		 * needed any more. Remove it.
-+		 */
-+		hlist_for_each_entry_safe(pos, n, &bfqd->burst_list,
-+					  burst_list_node)
-+			hlist_del_init(&pos->burst_list_node);
-+	} else /* burst not yet large: add bfqq to the burst list */
-+		hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
-+}
-+
-+/*
-+ * If many queues happen to become active shortly after each other, then,
-+ * to help the processes associated to these queues get their job done as
-+ * soon as possible, it is usually better to not grant either weight-raising
-+ * or device idling to these queues. In this comment we describe, firstly,
-+ * the reasons why this fact holds, and, secondly, the next function, which
-+ * implements the main steps needed to properly mark these queues so that
-+ * they can then be treated in a different way.
-+ *
-+ * As for the terminology, we say that a queue becomes active, i.e.,
-+ * switches from idle to backlogged, either when it is created (as a
-+ * consequence of the arrival of an I/O request), or, if already existing,
-+ * when a new request for the queue arrives while the queue is idle.
-+ * Bursts of activations, i.e., activations of different queues occurring
-+ * shortly after each other, are typically caused by services or applications
-+ * that spawn or reactivate many parallel threads/processes. Examples are
-+ * systemd during boot or git grep.
-+ *
-+ * These services or applications benefit mostly from a high throughput:
-+ * the quicker the requests of the activated queues are cumulatively served,
-+ * the sooner the target job of these queues gets completed. As a consequence,
-+ * weight-raising any of these queues, which also implies idling the device
-+ * for it, is almost always counterproductive: in most cases it just lowers
-+ * throughput.
-+ *
-+ * On the other hand, a burst of activations may be also caused by the start
-+ * of an application that does not consist in a lot of parallel I/O-bound
-+ * threads. In fact, with a complex application, the burst may be just a
-+ * consequence of the fact that several processes need to be executed to
-+ * start-up the application. To start an application as quickly as possible,
-+ * the best thing to do is to privilege the I/O related to the application
-+ * with respect to all other I/O. Therefore, the best strategy to start as
-+ * quickly as possible an application that causes a burst of activations is
-+ * to weight-raise all the queues activated during the burst. This is the
-+ * exact opposite of the best strategy for the other type of bursts.
-+ *
-+ * In the end, to take the best action for each of the two cases, the two
-+ * types of bursts need to be distinguished. Fortunately, this seems
-+ * relatively easy to do, by looking at the sizes of the bursts. In
-+ * particular, we found a threshold such that bursts with a larger size
-+ * than that threshold are apparently caused only by services or commands
-+ * such as systemd or git grep. For brevity, hereafter we call just 'large'
-+ * these bursts. BFQ *does not* weight-raise queues whose activations occur
-+ * in a large burst. In addition, for each of these queues BFQ performs or
-+ * does not perform idling depending on which choice boosts the throughput
-+ * most. The exact choice depends on the device and request pattern at
-+ * hand.
-+ *
-+ * Turning back to the next function, it implements all the steps needed
-+ * to detect the occurrence of a large burst and to properly mark all the
-+ * queues belonging to it (so that they can then be treated in a different
-+ * way). This goal is achieved by maintaining a special "burst list" that
-+ * holds, temporarily, the queues that belong to the burst in progress. The
-+ * list is then used to mark these queues as belonging to a large burst if
-+ * the burst does become large. The main steps are the following.
-+ *
-+ * . when the very first queue is activated, the queue is inserted into the
-+ *   list (as it could be the first queue in a possible burst)
-+ *
-+ * . if the current burst has not yet become large, and a queue Q that does
-+ *   not yet belong to the burst is activated shortly after the last time
-+ *   at which a new queue entered the burst list, then the function appends
-+ *   Q to the burst list
-+ *
-+ * . if, as a consequence of the previous step, the burst size reaches
-+ *   the large-burst threshold, then
-+ *
-+ *     . all the queues in the burst list are marked as belonging to a
-+ *       large burst
-+ *
-+ *     . the burst list is deleted; in fact, the burst list already served
-+ *       its purpose (keeping temporarily track of the queues in a burst,
-+ *       so as to be able to mark them as belonging to a large burst in the
-+ *       previous sub-step), and now is not needed any more
-+ *
-+ *     . the device enters a large-burst mode
-+ *
-+ * . if a queue Q that does not belong to the burst is activated while
-+ *   the device is in large-burst mode and shortly after the last time
-+ *   at which a queue either entered the burst list or was marked as
-+ *   belonging to the current large burst, then Q is immediately marked
-+ *   as belonging to a large burst.
-+ *
-+ * . if a queue Q that does not belong to the burst is activated a while
-+ *   later, i.e., not shortly after, than the last time at which a queue
-+ *   either entered the burst list or was marked as belonging to the
-+ *   current large burst, then the current burst is deemed as finished and:
-+ *
-+ *        . the large-burst mode is reset if set
-+ *
-+ *        . the burst list is emptied
-+ *
-+ *        . Q is inserted in the burst list, as Q may be the first queue
-+ *          in a possible new burst (then the burst list contains just Q
-+ *          after this step).
-+ */
-+static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			     bool idle_for_long_time)
-+{
-+	/*
-+	 * If bfqq happened to be activated in a burst, but has been idle
-+	 * for at least as long as an interactive queue, then we assume
-+	 * that, in the overall I/O initiated in the burst, the I/O
-+	 * associated to bfqq is finished. So bfqq does not need to be
-+	 * treated as a queue belonging to a burst anymore. Accordingly,
-+	 * we reset bfqq's in_large_burst flag if set, and remove bfqq
-+	 * from the burst list if it's there. We do not decrement instead
-+	 * burst_size, because the fact that bfqq does not need to belong
-+	 * to the burst list any more does not invalidate the fact that
-+	 * bfqq may have been activated during the current burst.
-+	 */
-+	if (idle_for_long_time) {
-+		hlist_del_init(&bfqq->burst_list_node);
-+		bfq_clear_bfqq_in_large_burst(bfqq);
-+	}
-+
-+	/*
-+	 * If bfqq is already in the burst list or is part of a large
-+	 * burst, then there is nothing else to do.
-+	 */
-+	if (!hlist_unhashed(&bfqq->burst_list_node) ||
-+	    bfq_bfqq_in_large_burst(bfqq))
-+		return;
-+
-+	/*
-+	 * If bfqq's activation happens late enough, then the current
-+	 * burst is finished, and related data structures must be reset.
-+	 *
-+	 * In this respect, consider the special case where bfqq is the very
-+	 * first queue being activated. In this case, last_ins_in_burst is
-+	 * not yet significant when we get here. But it is easy to verify
-+	 * that, whether or not the following condition is true, bfqq will
-+	 * end up being inserted into the burst list. In particular the
-+	 * list will happen to contain only bfqq. And this is exactly what
-+	 * has to happen, as bfqq may be the first queue in a possible
-+	 * burst.
-+	 */
-+	if (time_is_before_jiffies(bfqd->last_ins_in_burst +
-+	    bfqd->bfq_burst_interval)) {
-+		bfqd->large_burst = false;
-+		bfq_reset_burst_list(bfqd, bfqq);
-+		return;
-+	}
-+
-+	/*
-+	 * If we get here, then bfqq is being activated shortly after the
-+	 * last queue. So, if the current burst is also large, we can mark
-+	 * bfqq as belonging to this large burst immediately.
-+	 */
-+	if (bfqd->large_burst) {
-+		bfq_mark_bfqq_in_large_burst(bfqq);
-+		return;
-+	}
-+
-+	/*
-+	 * If we get here, then a large-burst state has not yet been
-+	 * reached, but bfqq is being activated shortly after the last
-+	 * queue. Then we add bfqq to the burst.
-+	 */
-+	bfq_add_to_burst(bfqd, bfqq);
-+}
-+
-+static void bfq_add_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	struct request *next_rq, *prev;
-+	unsigned long old_wr_coeff = bfqq->wr_coeff;
-+	bool interactive = false;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "add_request %d", rq_is_sync(rq));
-+	bfqq->queued[rq_is_sync(rq)]++;
-+	bfqd->queued++;
-+
-+	elv_rb_add(&bfqq->sort_list, rq);
-+
-+	/*
-+	 * Check if this request is a better next-serve candidate.
-+	 */
-+	prev = bfqq->next_rq;
-+	next_rq = bfq_choose_req(bfqd, bfqq->next_rq, rq, bfqd->last_position);
-+	BUG_ON(!next_rq);
-+	bfqq->next_rq = next_rq;
-+
-+	if (!bfq_bfqq_busy(bfqq)) {
-+		bool soft_rt, in_burst,
-+		     idle_for_long_time = time_is_before_jiffies(
-+						bfqq->budget_timeout +
-+						bfqd->bfq_wr_min_idle_time);
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		bfqg_stats_update_io_add(bfqq_group(RQ_BFQQ(rq)), bfqq,
-+					 rq->cmd_flags);
-+#endif
-+		if (bfq_bfqq_sync(bfqq)) {
-+			bool already_in_burst =
-+			   !hlist_unhashed(&bfqq->burst_list_node) ||
-+			   bfq_bfqq_in_large_burst(bfqq);
-+			bfq_handle_burst(bfqd, bfqq, idle_for_long_time);
-+			/*
-+			 * If bfqq was not already in the current burst,
-+			 * then, at this point, bfqq either has been
-+			 * added to the current burst or has caused the
-+			 * current burst to terminate. In particular, in
-+			 * the second case, bfqq has become the first
-+			 * queue in a possible new burst.
-+			 * In both cases last_ins_in_burst needs to be
-+			 * moved forward.
-+			 */
-+			if (!already_in_burst)
-+				bfqd->last_ins_in_burst = jiffies;
-+		}
-+
-+		in_burst = bfq_bfqq_in_large_burst(bfqq);
-+		soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
-+			!in_burst &&
-+			time_is_before_jiffies(bfqq->soft_rt_next_start);
-+		interactive = !in_burst && idle_for_long_time;
-+		entity->budget = max_t(unsigned long, bfqq->max_budget,
-+				       bfq_serv_to_charge(next_rq, bfqq));
-+
-+		if (!bfq_bfqq_IO_bound(bfqq)) {
-+			if (time_before(jiffies,
-+					RQ_BIC(rq)->ttime.last_end_request +
-+					bfqd->bfq_slice_idle)) {
-+				bfqq->requests_within_timer++;
-+				if (bfqq->requests_within_timer >=
-+				    bfqd->bfq_requests_within_timer)
-+					bfq_mark_bfqq_IO_bound(bfqq);
-+			} else
-+				bfqq->requests_within_timer = 0;
-+		}
-+
-+		if (!bfqd->low_latency)
-+			goto add_bfqq_busy;
-+
-+		/*
-+		 * If the queue:
-+		 * - is not being boosted,
-+		 * - has been idle for enough time,
-+		 * - is not a sync queue or is linked to a bfq_io_cq (it is
-+		 *   shared "for its nature" or it is not shared and its
-+		 *   requests have not been redirected to a shared queue)
-+		 * start a weight-raising period.
-+		 */
-+		if (old_wr_coeff == 1 && (interactive || soft_rt) &&
-+		    (!bfq_bfqq_sync(bfqq) || bfqq->bic)) {
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			if (interactive)
-+				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+			else
-+				bfqq->wr_cur_max_time =
-+					bfqd->bfq_wr_rt_max_time;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "wrais starting at %lu, rais_max_time %u",
-+				     jiffies,
-+				     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+		} else if (old_wr_coeff > 1) {
-+			if (interactive)
-+				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+			else if (in_burst ||
-+				 (bfqq->wr_cur_max_time ==
-+				  bfqd->bfq_wr_rt_max_time &&
-+				  !soft_rt)) {
-+				bfqq->wr_coeff = 1;
-+				bfq_log_bfqq(bfqd, bfqq,
-+					"wrais ending at %lu, rais_max_time %u",
-+					jiffies,
-+					jiffies_to_msecs(bfqq->
-+						wr_cur_max_time));
-+			} else if (time_before(
-+					bfqq->last_wr_start_finish +
-+					bfqq->wr_cur_max_time,
-+					jiffies +
-+					bfqd->bfq_wr_rt_max_time) &&
-+				   soft_rt) {
-+				/*
-+				 *
-+				 * The remaining weight-raising time is lower
-+				 * than bfqd->bfq_wr_rt_max_time, which means
-+				 * that the application is enjoying weight
-+				 * raising either because deemed soft-rt in
-+				 * the near past, or because deemed interactive
-+				 * a long ago.
-+				 * In both cases, resetting now the current
-+				 * remaining weight-raising time for the
-+				 * application to the weight-raising duration
-+				 * for soft rt applications would not cause any
-+				 * latency increase for the application (as the
-+				 * new duration would be higher than the
-+				 * remaining time).
-+				 *
-+				 * In addition, the application is now meeting
-+				 * the requirements for being deemed soft rt.
-+				 * In the end we can correctly and safely
-+				 * (re)charge the weight-raising duration for
-+				 * the application with the weight-raising
-+				 * duration for soft rt applications.
-+				 *
-+				 * In particular, doing this recharge now, i.e.,
-+				 * before the weight-raising period for the
-+				 * application finishes, reduces the probability
-+				 * of the following negative scenario:
-+				 * 1) the weight of a soft rt application is
-+				 *    raised at startup (as for any newly
-+				 *    created application),
-+				 * 2) since the application is not interactive,
-+				 *    at a certain time weight-raising is
-+				 *    stopped for the application,
-+				 * 3) at that time the application happens to
-+				 *    still have pending requests, and hence
-+				 *    is destined to not have a chance to be
-+				 *    deemed soft rt before these requests are
-+				 *    completed (see the comments to the
-+				 *    function bfq_bfqq_softrt_next_start()
-+				 *    for details on soft rt detection),
-+				 * 4) these pending requests experience a high
-+				 *    latency because the application is not
-+				 *    weight-raised while they are pending.
-+				 */
-+				bfqq->last_wr_start_finish = jiffies;
-+				bfqq->wr_cur_max_time =
-+					bfqd->bfq_wr_rt_max_time;
-+			}
-+		}
-+		if (old_wr_coeff != bfqq->wr_coeff)
-+			entity->prio_changed = 1;
-+add_bfqq_busy:
-+		bfqq->last_idle_bklogged = jiffies;
-+		bfqq->service_from_backlogged = 0;
-+		bfq_clear_bfqq_softrt_update(bfqq);
-+		bfq_add_bfqq_busy(bfqd, bfqq);
-+	} else {
-+		if (bfqd->low_latency && old_wr_coeff == 1 && !rq_is_sync(rq) &&
-+		    time_is_before_jiffies(
-+				bfqq->last_wr_start_finish +
-+				bfqd->bfq_wr_min_inter_arr_async)) {
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+
-+			bfqd->wr_busy_queues++;
-+			entity->prio_changed = 1;
-+			bfq_log_bfqq(bfqd, bfqq,
-+			    "non-idle wrais starting at %lu, rais_max_time %u",
-+			    jiffies,
-+			    jiffies_to_msecs(bfqq->wr_cur_max_time));
-+		}
-+		if (prev != bfqq->next_rq)
-+			bfq_updated_next_req(bfqd, bfqq);
-+	}
-+
-+	if (bfqd->low_latency &&
-+		(old_wr_coeff == 1 || bfqq->wr_coeff == 1 || interactive))
-+		bfqq->last_wr_start_finish = jiffies;
-+}
-+
-+static struct request *bfq_find_rq_fmerge(struct bfq_data *bfqd,
-+					  struct bio *bio)
-+{
-+	struct task_struct *tsk = current;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq;
-+
-+	bic = bfq_bic_lookup(bfqd, tsk->io_context);
-+	if (!bic)
-+		return NULL;
-+
-+	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
-+	if (bfqq)
-+		return elv_rb_find(&bfqq->sort_list, bio_end_sector(bio));
-+
-+	return NULL;
-+}
-+
-+static void bfq_activate_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+
-+	bfqd->rq_in_driver++;
-+	bfqd->last_position = blk_rq_pos(rq) + blk_rq_sectors(rq);
-+	bfq_log(bfqd, "activate_request: new bfqd->last_position %llu",
-+		(unsigned long long) bfqd->last_position);
-+}
-+
-+static void bfq_deactivate_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+
-+	BUG_ON(bfqd->rq_in_driver == 0);
-+	bfqd->rq_in_driver--;
-+}
-+
-+static void bfq_remove_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	const int sync = rq_is_sync(rq);
-+
-+	if (bfqq->next_rq == rq) {
-+		bfqq->next_rq = bfq_find_next_rq(bfqd, bfqq, rq);
-+		bfq_updated_next_req(bfqd, bfqq);
-+	}
-+
-+	if (rq->queuelist.prev != &rq->queuelist)
-+		list_del_init(&rq->queuelist);
-+	BUG_ON(bfqq->queued[sync] == 0);
-+	bfqq->queued[sync]--;
-+	bfqd->queued--;
-+	elv_rb_del(&bfqq->sort_list, rq);
-+
-+	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue)
-+			bfq_del_bfqq_busy(bfqd, bfqq, 1);
-+		/*
-+		 * Remove queue from request-position tree as it is empty.
-+		 */
-+		if (bfqq->pos_root) {
-+			rb_erase(&bfqq->pos_node, bfqq->pos_root);
-+			bfqq->pos_root = NULL;
-+		}
-+	}
-+
-+	if (rq->cmd_flags & REQ_META) {
-+		BUG_ON(bfqq->meta_pending == 0);
-+		bfqq->meta_pending--;
-+	}
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_io_remove(bfqq_group(bfqq), rq->cmd_flags);
-+#endif
-+}
-+
-+static int bfq_merge(struct request_queue *q, struct request **req,
-+		     struct bio *bio)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct request *__rq;
-+
-+	__rq = bfq_find_rq_fmerge(bfqd, bio);
-+	if (__rq && elv_rq_merge_ok(__rq, bio)) {
-+		*req = __rq;
-+		return ELEVATOR_FRONT_MERGE;
-+	}
-+
-+	return ELEVATOR_NO_MERGE;
-+}
-+
-+static void bfq_merged_request(struct request_queue *q, struct request *req,
-+			       int type)
-+{
-+	if (type == ELEVATOR_FRONT_MERGE &&
-+	    rb_prev(&req->rb_node) &&
-+	    blk_rq_pos(req) <
-+	    blk_rq_pos(container_of(rb_prev(&req->rb_node),
-+				    struct request, rb_node))) {
-+		struct bfq_queue *bfqq = RQ_BFQQ(req);
-+		struct bfq_data *bfqd = bfqq->bfqd;
-+		struct request *prev, *next_rq;
-+
-+		/* Reposition request in its sort_list */
-+		elv_rb_del(&bfqq->sort_list, req);
-+		elv_rb_add(&bfqq->sort_list, req);
-+		/* Choose next request to be served for bfqq */
-+		prev = bfqq->next_rq;
-+		next_rq = bfq_choose_req(bfqd, bfqq->next_rq, req,
-+					 bfqd->last_position);
-+		BUG_ON(!next_rq);
-+		bfqq->next_rq = next_rq;
-+	}
-+}
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static void bfq_bio_merged(struct request_queue *q, struct request *req,
-+			   struct bio *bio)
-+{
-+	bfqg_stats_update_io_merged(bfqq_group(RQ_BFQQ(req)), bio->bi_rw);
-+}
-+#endif
-+
-+static void bfq_merged_requests(struct request_queue *q, struct request *rq,
-+				struct request *next)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq), *next_bfqq = RQ_BFQQ(next);
-+
-+	/*
-+	 * If next and rq belong to the same bfq_queue and next is older
-+	 * than rq, then reposition rq in the fifo (by substituting next
-+	 * with rq). Otherwise, if next and rq belong to different
-+	 * bfq_queues, never reposition rq: in fact, we would have to
-+	 * reposition it with respect to next's position in its own fifo,
-+	 * which would most certainly be too expensive with respect to
-+	 * the benefits.
-+	 */
-+	if (bfqq == next_bfqq &&
-+	    !list_empty(&rq->queuelist) && !list_empty(&next->queuelist) &&
-+	    time_before(next->fifo_time, rq->fifo_time)) {
-+		list_del_init(&rq->queuelist);
-+		list_replace_init(&next->queuelist, &rq->queuelist);
-+		rq->fifo_time = next->fifo_time;
-+	}
-+
-+	if (bfqq->next_rq == next)
-+		bfqq->next_rq = rq;
-+
-+	bfq_remove_request(next);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_io_merged(bfqq_group(bfqq), next->cmd_flags);
-+#endif
-+}
-+
-+/* Must be called with bfqq != NULL */
-+static void bfq_bfqq_end_wr(struct bfq_queue *bfqq)
-+{
-+	BUG_ON(!bfqq);
-+	if (bfq_bfqq_busy(bfqq))
-+		bfqq->bfqd->wr_busy_queues--;
-+	bfqq->wr_coeff = 1;
-+	bfqq->wr_cur_max_time = 0;
-+	/* Trigger a weight change on the next activation of the queue */
-+	bfqq->entity.prio_changed = 1;
-+}
-+
-+static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
-+				    struct bfq_group *bfqg)
-+{
-+	int i, j;
-+
-+	for (i = 0; i < 2; i++)
-+		for (j = 0; j < IOPRIO_BE_NR; j++)
-+			if (bfqg->async_bfqq[i][j])
-+				bfq_bfqq_end_wr(bfqg->async_bfqq[i][j]);
-+	if (bfqg->async_idle_bfqq)
-+		bfq_bfqq_end_wr(bfqg->async_idle_bfqq);
-+}
-+
-+static void bfq_end_wr(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq;
-+
-+	spin_lock_irq(bfqd->queue->queue_lock);
-+
-+	list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list)
-+		bfq_bfqq_end_wr(bfqq);
-+	list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list)
-+		bfq_bfqq_end_wr(bfqq);
-+	bfq_end_wr_async(bfqd);
-+
-+	spin_unlock_irq(bfqd->queue->queue_lock);
-+}
-+
-+static int bfq_allow_merge(struct request_queue *q, struct request *rq,
-+			   struct bio *bio)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_io_cq *bic;
-+
-+	/*
-+	 * Disallow merge of a sync bio into an async request.
-+	 */
-+	if (bfq_bio_sync(bio) && !rq_is_sync(rq))
-+		return 0;
-+
-+	/*
-+	 * Lookup the bfqq that this bio will be queued with. Allow
-+	 * merge only if rq is queued there.
-+	 * Queue lock is held here.
-+	 */
-+	bic = bfq_bic_lookup(bfqd, current->io_context);
-+	if (!bic)
-+		return 0;
-+
-+	return bic_to_bfqq(bic, bfq_bio_sync(bio)) == RQ_BFQQ(rq);
-+}
-+
-+static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
-+				       struct bfq_queue *bfqq)
-+{
-+	if (bfqq) {
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		bfqg_stats_update_avg_queue_size(bfqq_group(bfqq));
-+#endif
-+		bfq_mark_bfqq_must_alloc(bfqq);
-+		bfq_mark_bfqq_budget_new(bfqq);
-+		bfq_clear_bfqq_fifo_expire(bfqq);
-+
-+		bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8;
-+
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "set_in_service_queue, cur-budget = %d",
-+			     bfqq->entity.budget);
-+	}
-+
-+	bfqd->in_service_queue = bfqq;
-+}
-+
-+/*
-+ * Get and set a new queue for service.
-+ */
-+static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfq_get_next_queue(bfqd);
-+
-+	__bfq_set_in_service_queue(bfqd, bfqq);
-+	return bfqq;
-+}
-+
-+/*
-+ * If enough samples have been computed, return the current max budget
-+ * stored in bfqd, which is dynamically updated according to the
-+ * estimated disk peak rate; otherwise return the default max budget
-+ */
-+static int bfq_max_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
-+		return bfq_default_max_budget;
-+	else
-+		return bfqd->bfq_max_budget;
-+}
-+
-+/*
-+ * Return min budget, which is a fraction of the current or default
-+ * max budget (trying with 1/32)
-+ */
-+static int bfq_min_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
-+		return bfq_default_max_budget / 32;
-+	else
-+		return bfqd->bfq_max_budget / 32;
-+}
-+
-+static void bfq_arm_slice_timer(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfqd->in_service_queue;
-+	struct bfq_io_cq *bic;
-+	unsigned long sl;
-+
-+	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	/* Processes have exited, don't wait. */
-+	bic = bfqd->in_service_bic;
-+	if (!bic || atomic_read(&bic->icq.ioc->active_ref) == 0)
-+		return;
-+
-+	bfq_mark_bfqq_wait_request(bfqq);
-+
-+	/*
-+	 * We don't want to idle for seeks, but we do want to allow
-+	 * fair distribution of slice time for a process doing back-to-back
-+	 * seeks. So allow a little bit of time for him to submit a new rq.
-+	 *
-+	 * To prevent processes with (partly) seeky workloads from
-+	 * being too ill-treated, grant them a small fraction of the
-+	 * assigned budget before reducing the waiting time to
-+	 * BFQ_MIN_TT. This happened to help reduce latency.
-+	 */
-+	sl = bfqd->bfq_slice_idle;
-+	/*
-+	 * Unless the queue is being weight-raised or the scenario is
-+	 * asymmetric, grant only minimum idle time if the queue either
-+	 * has been seeky for long enough or has already proved to be
-+	 * constantly seeky.
-+	 */
-+	if (bfq_sample_valid(bfqq->seek_samples) &&
-+	    ((BFQQ_SEEKY(bfqq) && bfqq->entity.service >
-+				  bfq_max_budget(bfqq->bfqd) / 8) ||
-+	      bfq_bfqq_constantly_seeky(bfqq)) && bfqq->wr_coeff == 1 &&
-+	    bfq_symmetric_scenario(bfqd))
-+		sl = min(sl, msecs_to_jiffies(BFQ_MIN_TT));
-+	else if (bfqq->wr_coeff > 1)
-+		sl = sl * 3;
-+	bfqd->last_idling_start = ktime_get();
-+	mod_timer(&bfqd->idle_slice_timer, jiffies + sl);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_set_start_idle_time(bfqq_group(bfqq));
-+#endif
-+	bfq_log(bfqd, "arm idle: %u/%u ms",
-+		jiffies_to_msecs(sl), jiffies_to_msecs(bfqd->bfq_slice_idle));
-+}
-+
-+/*
-+ * Set the maximum time for the in-service queue to consume its
-+ * budget. This prevents seeky processes from lowering the disk
-+ * throughput (always guaranteed with a time slice scheme as in CFQ).
-+ */
-+static void bfq_set_budget_timeout(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq = bfqd->in_service_queue;
-+	unsigned int timeout_coeff;
-+
-+	if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time)
-+		timeout_coeff = 1;
-+	else
-+		timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight;
-+
-+	bfqd->last_budget_start = ktime_get();
-+
-+	bfq_clear_bfqq_budget_new(bfqq);
-+	bfqq->budget_timeout = jiffies +
-+		bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * timeout_coeff;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "set budget_timeout %u",
-+		jiffies_to_msecs(bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] *
-+		timeout_coeff));
-+}
-+
-+/*
-+ * Move request from internal lists to the request queue dispatch list.
-+ */
-+static void bfq_dispatch_insert(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	/*
-+	 * For consistency, the next instruction should have been executed
-+	 * after removing the request from the queue and dispatching it.
-+	 * We execute instead this instruction before bfq_remove_request()
-+	 * (and hence introduce a temporary inconsistency), for efficiency.
-+	 * In fact, in a forced_dispatch, this prevents two counters related
-+	 * to bfqq->dispatched to risk to be uselessly decremented if bfqq
-+	 * is not in service, and then to be incremented again after
-+	 * incrementing bfqq->dispatched.
-+	 */
-+	bfqq->dispatched++;
-+	bfq_remove_request(rq);
-+	elv_dispatch_sort(q, rq);
-+
-+	if (bfq_bfqq_sync(bfqq))
-+		bfqd->sync_flight++;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_dispatch(bfqq_group(bfqq), blk_rq_bytes(rq),
-+				   rq->cmd_flags);
-+#endif
-+}
-+
-+/*
-+ * Return expired entry, or NULL to just start from scratch in rbtree.
-+ */
-+static struct request *bfq_check_fifo(struct bfq_queue *bfqq)
-+{
-+	struct request *rq = NULL;
-+
-+	if (bfq_bfqq_fifo_expire(bfqq))
-+		return NULL;
-+
-+	bfq_mark_bfqq_fifo_expire(bfqq);
-+
-+	if (list_empty(&bfqq->fifo))
-+		return NULL;
-+
-+	rq = rq_entry_fifo(bfqq->fifo.next);
-+
-+	if (time_before(jiffies, rq->fifo_time))
-+		return NULL;
-+
-+	return rq;
-+}
-+
-+static int bfq_bfqq_budget_left(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	return entity->budget - entity->service;
-+}
-+
-+static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	__bfq_bfqd_reset_in_service(bfqd);
-+
-+	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		/*
-+		 * Overloading budget_timeout field to store the time
-+		 * at which the queue remains with no backlog; used by
-+		 * the weight-raising mechanism.
-+		 */
-+		bfqq->budget_timeout = jiffies;
-+		bfq_del_bfqq_busy(bfqd, bfqq, 1);
-+	} else
-+		bfq_activate_bfqq(bfqd, bfqq);
-+}
-+
-+/**
-+ * __bfq_bfqq_recalc_budget - try to adapt the budget to the @bfqq behavior.
-+ * @bfqd: device data.
-+ * @bfqq: queue to update.
-+ * @reason: reason for expiration.
-+ *
-+ * Handle the feedback on @bfqq budget at queue expiration.
-+ * See the body for detailed comments.
-+ */
-+static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
-+				     struct bfq_queue *bfqq,
-+				     enum bfqq_expiration reason)
-+{
-+	struct request *next_rq;
-+	int budget, min_budget;
-+
-+	budget = bfqq->max_budget;
-+	min_budget = bfq_min_budget(bfqd);
-+
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last budg %d, budg left %d",
-+		bfqq->entity.budget, bfq_bfqq_budget_left(bfqq));
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last max_budg %d, min budg %d",
-+		budget, bfq_min_budget(bfqd));
-+	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: sync %d, seeky %d",
-+		bfq_bfqq_sync(bfqq), BFQQ_SEEKY(bfqd->in_service_queue));
-+
-+	if (bfq_bfqq_sync(bfqq)) {
-+		switch (reason) {
-+		/*
-+		 * Caveat: in all the following cases we trade latency
-+		 * for throughput.
-+		 */
-+		case BFQ_BFQQ_TOO_IDLE:
-+			/*
-+			 * This is the only case where we may reduce
-+			 * the budget: if there is no request of the
-+			 * process still waiting for completion, then
-+			 * we assume (tentatively) that the timer has
-+			 * expired because the batch of requests of
-+			 * the process could have been served with a
-+			 * smaller budget.  Hence, betting that
-+			 * process will behave in the same way when it
-+			 * becomes backlogged again, we reduce its
-+			 * next budget.  As long as we guess right,
-+			 * this budget cut reduces the latency
-+			 * experienced by the process.
-+			 *
-+			 * However, if there are still outstanding
-+			 * requests, then the process may have not yet
-+			 * issued its next request just because it is
-+			 * still waiting for the completion of some of
-+			 * the still outstanding ones.  So in this
-+			 * subcase we do not reduce its budget, on the
-+			 * contrary we increase it to possibly boost
-+			 * the throughput, as discussed in the
-+			 * comments to the BUDGET_TIMEOUT case.
-+			 */
-+			if (bfqq->dispatched > 0) /* still outstanding reqs */
-+				budget = min(budget * 2, bfqd->bfq_max_budget);
-+			else {
-+				if (budget > 5 * min_budget)
-+					budget -= 4 * min_budget;
-+				else
-+					budget = min_budget;
-+			}
-+			break;
-+		case BFQ_BFQQ_BUDGET_TIMEOUT:
-+			/*
-+			 * We double the budget here because: 1) it
-+			 * gives the chance to boost the throughput if
-+			 * this is not a seeky process (which may have
-+			 * bumped into this timeout because of, e.g.,
-+			 * ZBR), 2) together with charge_full_budget
-+			 * it helps give seeky processes higher
-+			 * timestamps, and hence be served less
-+			 * frequently.
-+			 */
-+			budget = min(budget * 2, bfqd->bfq_max_budget);
-+			break;
-+		case BFQ_BFQQ_BUDGET_EXHAUSTED:
-+			/*
-+			 * The process still has backlog, and did not
-+			 * let either the budget timeout or the disk
-+			 * idling timeout expire. Hence it is not
-+			 * seeky, has a short thinktime and may be
-+			 * happy with a higher budget too. So
-+			 * definitely increase the budget of this good
-+			 * candidate to boost the disk throughput.
-+			 */
-+			budget = min(budget * 4, bfqd->bfq_max_budget);
-+			break;
-+		case BFQ_BFQQ_NO_MORE_REQUESTS:
-+		       /*
-+			* Leave the budget unchanged.
-+			*/
-+		default:
-+			return;
-+		}
-+	} else
-+		/*
-+		 * Async queues get always the maximum possible budget
-+		 * (their ability to dispatch is limited by
-+		 * @bfqd->bfq_max_budget_async_rq).
-+		 */
-+		budget = bfqd->bfq_max_budget;
-+
-+	bfqq->max_budget = budget;
-+
-+	if (bfqd->budgets_assigned >= bfq_stats_min_budgets &&
-+	    !bfqd->bfq_user_max_budget)
-+		bfqq->max_budget = min(bfqq->max_budget, bfqd->bfq_max_budget);
-+
-+	/*
-+	 * Make sure that we have enough budget for the next request.
-+	 * Since the finish time of the bfqq must be kept in sync with
-+	 * the budget, be sure to call __bfq_bfqq_expire() after the
-+	 * update.
-+	 */
-+	next_rq = bfqq->next_rq;
-+	if (next_rq)
-+		bfqq->entity.budget = max_t(unsigned long, bfqq->max_budget,
-+					    bfq_serv_to_charge(next_rq, bfqq));
-+	else
-+		bfqq->entity.budget = bfqq->max_budget;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "head sect: %u, new budget %d",
-+			next_rq ? blk_rq_sectors(next_rq) : 0,
-+			bfqq->entity.budget);
-+}
-+
-+static unsigned long bfq_calc_max_budget(u64 peak_rate, u64 timeout)
-+{
-+	unsigned long max_budget;
-+
-+	/*
-+	 * The max_budget calculated when autotuning is equal to the
-+	 * amount of sectors transfered in timeout_sync at the
-+	 * estimated peak rate.
-+	 */
-+	max_budget = (unsigned long)(peak_rate * 1000 *
-+				     timeout >> BFQ_RATE_SHIFT);
-+
-+	return max_budget;
-+}
-+
-+/*
-+ * In addition to updating the peak rate, checks whether the process
-+ * is "slow", and returns 1 if so. This slow flag is used, in addition
-+ * to the budget timeout, to reduce the amount of service provided to
-+ * seeky processes, and hence reduce their chances to lower the
-+ * throughput. See the code for more details.
-+ */
-+static bool bfq_update_peak_rate(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				 bool compensate, enum bfqq_expiration reason)
-+{
-+	u64 bw, usecs, expected, timeout;
-+	ktime_t delta;
-+	int update = 0;
-+
-+	if (!bfq_bfqq_sync(bfqq) || bfq_bfqq_budget_new(bfqq))
-+		return false;
-+
-+	if (compensate)
-+		delta = bfqd->last_idling_start;
-+	else
-+		delta = ktime_get();
-+	delta = ktime_sub(delta, bfqd->last_budget_start);
-+	usecs = ktime_to_us(delta);
-+
-+	/* Don't trust short/unrealistic values. */
-+	if (usecs < 100 || usecs >= LONG_MAX)
-+		return false;
-+
-+	/*
-+	 * Calculate the bandwidth for the last slice.  We use a 64 bit
-+	 * value to store the peak rate, in sectors per usec in fixed
-+	 * point math.  We do so to have enough precision in the estimate
-+	 * and to avoid overflows.
-+	 */
-+	bw = (u64)bfqq->entity.service << BFQ_RATE_SHIFT;
-+	do_div(bw, (unsigned long)usecs);
-+
-+	timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
-+
-+	/*
-+	 * Use only long (> 20ms) intervals to filter out spikes for
-+	 * the peak rate estimation.
-+	 */
-+	if (usecs > 20000) {
-+		if (bw > bfqd->peak_rate ||
-+		   (!BFQQ_SEEKY(bfqq) &&
-+		    reason == BFQ_BFQQ_BUDGET_TIMEOUT)) {
-+			bfq_log(bfqd, "measured bw =%llu", bw);
-+			/*
-+			 * To smooth oscillations use a low-pass filter with
-+			 * alpha=7/8, i.e.,
-+			 * new_rate = (7/8) * old_rate + (1/8) * bw
-+			 */
-+			do_div(bw, 8);
-+			if (bw == 0)
-+				return 0;
-+			bfqd->peak_rate *= 7;
-+			do_div(bfqd->peak_rate, 8);
-+			bfqd->peak_rate += bw;
-+			update = 1;
-+			bfq_log(bfqd, "new peak_rate=%llu", bfqd->peak_rate);
-+		}
-+
-+		update |= bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES - 1;
-+
-+		if (bfqd->peak_rate_samples < BFQ_PEAK_RATE_SAMPLES)
-+			bfqd->peak_rate_samples++;
-+
-+		if (bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES &&
-+		    update) {
-+			int dev_type = blk_queue_nonrot(bfqd->queue);
-+
-+			if (bfqd->bfq_user_max_budget == 0) {
-+				bfqd->bfq_max_budget =
-+					bfq_calc_max_budget(bfqd->peak_rate,
-+							    timeout);
-+				bfq_log(bfqd, "new max_budget=%d",
-+					bfqd->bfq_max_budget);
-+			}
-+			if (bfqd->device_speed == BFQ_BFQD_FAST &&
-+			    bfqd->peak_rate < device_speed_thresh[dev_type]) {
-+				bfqd->device_speed = BFQ_BFQD_SLOW;
-+				bfqd->RT_prod = R_slow[dev_type] *
-+						T_slow[dev_type];
-+			} else if (bfqd->device_speed == BFQ_BFQD_SLOW &&
-+			    bfqd->peak_rate > device_speed_thresh[dev_type]) {
-+				bfqd->device_speed = BFQ_BFQD_FAST;
-+				bfqd->RT_prod = R_fast[dev_type] *
-+						T_fast[dev_type];
-+			}
-+		}
-+	}
-+
-+	/*
-+	 * If the process has been served for a too short time
-+	 * interval to let its possible sequential accesses prevail on
-+	 * the initial seek time needed to move the disk head on the
-+	 * first sector it requested, then give the process a chance
-+	 * and for the moment return false.
-+	 */
-+	if (bfqq->entity.budget <= bfq_max_budget(bfqd) / 8)
-+		return false;
-+
-+	/*
-+	 * A process is considered ``slow'' (i.e., seeky, so that we
-+	 * cannot treat it fairly in the service domain, as it would
-+	 * slow down too much the other processes) if, when a slice
-+	 * ends for whatever reason, it has received service at a
-+	 * rate that would not be high enough to complete the budget
-+	 * before the budget timeout expiration.
-+	 */
-+	expected = bw * 1000 * timeout >> BFQ_RATE_SHIFT;
-+
-+	/*
-+	 * Caveat: processes doing IO in the slower disk zones will
-+	 * tend to be slow(er) even if not seeky. And the estimated
-+	 * peak rate will actually be an average over the disk
-+	 * surface. Hence, to not be too harsh with unlucky processes,
-+	 * we keep a budget/3 margin of safety before declaring a
-+	 * process slow.
-+	 */
-+	return expected > (4 * bfqq->entity.budget) / 3;
-+}
-+
-+/*
-+ * To be deemed as soft real-time, an application must meet two
-+ * requirements. First, the application must not require an average
-+ * bandwidth higher than the approximate bandwidth required to playback or
-+ * record a compressed high-definition video.
-+ * The next function is invoked on the completion of the last request of a
-+ * batch, to compute the next-start time instant, soft_rt_next_start, such
-+ * that, if the next request of the application does not arrive before
-+ * soft_rt_next_start, then the above requirement on the bandwidth is met.
-+ *
-+ * The second requirement is that the request pattern of the application is
-+ * isochronous, i.e., that, after issuing a request or a batch of requests,
-+ * the application stops issuing new requests until all its pending requests
-+ * have been completed. After that, the application may issue a new batch,
-+ * and so on.
-+ * For this reason the next function is invoked to compute
-+ * soft_rt_next_start only for applications that meet this requirement,
-+ * whereas soft_rt_next_start is set to infinity for applications that do
-+ * not.
-+ *
-+ * Unfortunately, even a greedy application may happen to behave in an
-+ * isochronous way if the CPU load is high. In fact, the application may
-+ * stop issuing requests while the CPUs are busy serving other processes,
-+ * then restart, then stop again for a while, and so on. In addition, if
-+ * the disk achieves a low enough throughput with the request pattern
-+ * issued by the application (e.g., because the request pattern is random
-+ * and/or the device is slow), then the application may meet the above
-+ * bandwidth requirement too. To prevent such a greedy application to be
-+ * deemed as soft real-time, a further rule is used in the computation of
-+ * soft_rt_next_start: soft_rt_next_start must be higher than the current
-+ * time plus the maximum time for which the arrival of a request is waited
-+ * for when a sync queue becomes idle, namely bfqd->bfq_slice_idle.
-+ * This filters out greedy applications, as the latter issue instead their
-+ * next request as soon as possible after the last one has been completed
-+ * (in contrast, when a batch of requests is completed, a soft real-time
-+ * application spends some time processing data).
-+ *
-+ * Unfortunately, the last filter may easily generate false positives if
-+ * only bfqd->bfq_slice_idle is used as a reference time interval and one
-+ * or both the following cases occur:
-+ * 1) HZ is so low that the duration of a jiffy is comparable to or higher
-+ *    than bfqd->bfq_slice_idle. This happens, e.g., on slow devices with
-+ *    HZ=100.
-+ * 2) jiffies, instead of increasing at a constant rate, may stop increasing
-+ *    for a while, then suddenly 'jump' by several units to recover the lost
-+ *    increments. This seems to happen, e.g., inside virtual machines.
-+ * To address this issue, we do not use as a reference time interval just
-+ * bfqd->bfq_slice_idle, but bfqd->bfq_slice_idle plus a few jiffies. In
-+ * particular we add the minimum number of jiffies for which the filter
-+ * seems to be quite precise also in embedded systems and KVM/QEMU virtual
-+ * machines.
-+ */
-+static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd,
-+						struct bfq_queue *bfqq)
-+{
-+	return max(bfqq->last_idle_bklogged +
-+		   HZ * bfqq->service_from_backlogged /
-+		   bfqd->bfq_wr_max_softrt_rate,
-+		   jiffies + bfqq->bfqd->bfq_slice_idle + 4);
-+}
-+
-+/*
-+ * Return the largest-possible time instant such that, for as long as possible,
-+ * the current time will be lower than this time instant according to the macro
-+ * time_is_before_jiffies().
-+ */
-+static unsigned long bfq_infinity_from_now(unsigned long now)
-+{
-+	return now + ULONG_MAX / 2;
-+}
-+
-+/**
-+ * bfq_bfqq_expire - expire a queue.
-+ * @bfqd: device owning the queue.
-+ * @bfqq: the queue to expire.
-+ * @compensate: if true, compensate for the time spent idling.
-+ * @reason: the reason causing the expiration.
-+ *
-+ *
-+ * If the process associated to the queue is slow (i.e., seeky), or in
-+ * case of budget timeout, or, finally, if it is async, we
-+ * artificially charge it an entire budget (independently of the
-+ * actual service it received). As a consequence, the queue will get
-+ * higher timestamps than the correct ones upon reactivation, and
-+ * hence it will be rescheduled as if it had received more service
-+ * than what it actually received. In the end, this class of processes
-+ * will receive less service in proportion to how slowly they consume
-+ * their budgets (and hence how seriously they tend to lower the
-+ * throughput).
-+ *
-+ * In contrast, when a queue expires because it has been idling for
-+ * too much or because it exhausted its budget, we do not touch the
-+ * amount of service it has received. Hence when the queue will be
-+ * reactivated and its timestamps updated, the latter will be in sync
-+ * with the actual service received by the queue until expiration.
-+ *
-+ * Charging a full budget to the first type of queues and the exact
-+ * service to the others has the effect of using the WF2Q+ policy to
-+ * schedule the former on a timeslice basis, without violating the
-+ * service domain guarantees of the latter.
-+ */
-+static void bfq_bfqq_expire(struct bfq_data *bfqd,
-+			    struct bfq_queue *bfqq,
-+			    bool compensate,
-+			    enum bfqq_expiration reason)
-+{
-+	bool slow;
-+
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
-+	/*
-+	 * Update disk peak rate for autotuning and check whether the
-+	 * process is slow (see bfq_update_peak_rate).
-+	 */
-+	slow = bfq_update_peak_rate(bfqd, bfqq, compensate, reason);
-+
-+	/*
-+	 * As above explained, 'punish' slow (i.e., seeky), timed-out
-+	 * and async queues, to favor sequential sync workloads.
-+	 *
-+	 * Processes doing I/O in the slower disk zones will tend to be
-+	 * slow(er) even if not seeky. Hence, since the estimated peak
-+	 * rate is actually an average over the disk surface, these
-+	 * processes may timeout just for bad luck. To avoid punishing
-+	 * them we do not charge a full budget to a process that
-+	 * succeeded in consuming at least 2/3 of its budget.
-+	 */
-+	if (slow || (reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
-+		     bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3))
-+		bfq_bfqq_charge_full_budget(bfqq);
-+
-+	bfqq->service_from_backlogged += bfqq->entity.service;
-+
-+	if (BFQQ_SEEKY(bfqq) && reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
-+	    !bfq_bfqq_constantly_seeky(bfqq)) {
-+		bfq_mark_bfqq_constantly_seeky(bfqq);
-+		if (!blk_queue_nonrot(bfqd->queue))
-+			bfqd->const_seeky_busy_in_flight_queues++;
-+	}
-+
-+	if (reason == BFQ_BFQQ_TOO_IDLE &&
-+	    bfqq->entity.service <= 2 * bfqq->entity.budget / 10)
-+		bfq_clear_bfqq_IO_bound(bfqq);
-+
-+	if (bfqd->low_latency && bfqq->wr_coeff == 1)
-+		bfqq->last_wr_start_finish = jiffies;
-+
-+	if (bfqd->low_latency && bfqd->bfq_wr_max_softrt_rate > 0 &&
-+	    RB_EMPTY_ROOT(&bfqq->sort_list)) {
-+		/*
-+		 * If we get here, and there are no outstanding requests,
-+		 * then the request pattern is isochronous (see the comments
-+		 * to the function bfq_bfqq_softrt_next_start()). Hence we
-+		 * can compute soft_rt_next_start. If, instead, the queue
-+		 * still has outstanding requests, then we have to wait
-+		 * for the completion of all the outstanding requests to
-+		 * discover whether the request pattern is actually
-+		 * isochronous.
-+		 */
-+		if (bfqq->dispatched == 0)
-+			bfqq->soft_rt_next_start =
-+				bfq_bfqq_softrt_next_start(bfqd, bfqq);
-+		else {
-+			/*
-+			 * The application is still waiting for the
-+			 * completion of one or more requests:
-+			 * prevent it from possibly being incorrectly
-+			 * deemed as soft real-time by setting its
-+			 * soft_rt_next_start to infinity. In fact,
-+			 * without this assignment, the application
-+			 * would be incorrectly deemed as soft
-+			 * real-time if:
-+			 * 1) it issued a new request before the
-+			 *    completion of all its in-flight
-+			 *    requests, and
-+			 * 2) at that time, its soft_rt_next_start
-+			 *    happened to be in the past.
-+			 */
-+			bfqq->soft_rt_next_start =
-+				bfq_infinity_from_now(jiffies);
-+			/*
-+			 * Schedule an update of soft_rt_next_start to when
-+			 * the task may be discovered to be isochronous.
-+			 */
-+			bfq_mark_bfqq_softrt_update(bfqq);
-+		}
-+	}
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		"expire (%d, slow %d, num_disp %d, idle_win %d)", reason,
-+		slow, bfqq->dispatched, bfq_bfqq_idle_window(bfqq));
-+
-+	/*
-+	 * Increase, decrease or leave budget unchanged according to
-+	 * reason.
-+	 */
-+	__bfq_bfqq_recalc_budget(bfqd, bfqq, reason);
-+	__bfq_bfqq_expire(bfqd, bfqq);
-+}
-+
-+/*
-+ * Budget timeout is not implemented through a dedicated timer, but
-+ * just checked on request arrivals and completions, as well as on
-+ * idle timer expirations.
-+ */
-+static bool bfq_bfqq_budget_timeout(struct bfq_queue *bfqq)
-+{
-+	if (bfq_bfqq_budget_new(bfqq) ||
-+	    time_before(jiffies, bfqq->budget_timeout))
-+		return false;
-+	return true;
-+}
-+
-+/*
-+ * If we expire a queue that is waiting for the arrival of a new
-+ * request, we may prevent the fictitious timestamp back-shifting that
-+ * allows the guarantees of the queue to be preserved (see [1] for
-+ * this tricky aspect). Hence we return true only if this condition
-+ * does not hold, or if the queue is slow enough to deserve only to be
-+ * kicked off for preserving a high throughput.
-+*/
-+static bool bfq_may_expire_for_budg_timeout(struct bfq_queue *bfqq)
-+{
-+	bfq_log_bfqq(bfqq->bfqd, bfqq,
-+		"may_budget_timeout: wait_request %d left %d timeout %d",
-+		bfq_bfqq_wait_request(bfqq),
-+			bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3,
-+		bfq_bfqq_budget_timeout(bfqq));
-+
-+	return (!bfq_bfqq_wait_request(bfqq) ||
-+		bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3)
-+		&&
-+		bfq_bfqq_budget_timeout(bfqq);
-+}
-+
-+/*
-+ * For a queue that becomes empty, device idling is allowed only if
-+ * this function returns true for that queue. As a consequence, since
-+ * device idling plays a critical role for both throughput boosting
-+ * and service guarantees, the return value of this function plays a
-+ * critical role as well.
-+ *
-+ * In a nutshell, this function returns true only if idling is
-+ * beneficial for throughput or, even if detrimental for throughput,
-+ * idling is however necessary to preserve service guarantees (low
-+ * latency, desired throughput distribution, ...). In particular, on
-+ * NCQ-capable devices, this function tries to return false, so as to
-+ * help keep the drives' internal queues full, whenever this helps the
-+ * device boost the throughput without causing any service-guarantee
-+ * issue.
-+ *
-+ * In more detail, the return value of this function is obtained by,
-+ * first, computing a number of boolean variables that take into
-+ * account throughput and service-guarantee issues, and, then,
-+ * combining these variables in a logical expression. Most of the
-+ * issues taken into account are not trivial. We discuss these issues
-+ * while introducing the variables.
-+ */
-+static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	bool idling_boosts_thr, idling_boosts_thr_without_issues,
-+		all_queues_seeky, on_hdd_and_not_all_queues_seeky,
-+		idling_needed_for_service_guarantees,
-+		asymmetric_scenario;
-+
-+	/*
-+	 * The next variable takes into account the cases where idling
-+	 * boosts the throughput.
-+	 *
-+	 * The value of the variable is computed considering, first, that
-+	 * idling is virtually always beneficial for the throughput if:
-+	 * (a) the device is not NCQ-capable, or
-+	 * (b) regardless of the presence of NCQ, the device is rotational
-+	 *     and the request pattern for bfqq is I/O-bound and sequential.
-+	 *
-+	 * Secondly, and in contrast to the above item (b), idling an
-+	 * NCQ-capable flash-based device would not boost the
-+	 * throughput even with sequential I/O; rather it would lower
-+	 * the throughput in proportion to how fast the device
-+	 * is. Accordingly, the next variable is true if any of the
-+	 * above conditions (a) and (b) is true, and, in particular,
-+	 * happens to be false if bfqd is an NCQ-capable flash-based
-+	 * device.
-+	 */
-+	idling_boosts_thr = !bfqd->hw_tag ||
-+		(!blk_queue_nonrot(bfqd->queue) && bfq_bfqq_IO_bound(bfqq) &&
-+		 bfq_bfqq_idle_window(bfqq));
-+
-+	/*
-+	 * The value of the next variable,
-+	 * idling_boosts_thr_without_issues, is equal to that of
-+	 * idling_boosts_thr, unless a special case holds. In this
-+	 * special case, described below, idling may cause problems to
-+	 * weight-raised queues.
-+	 *
-+	 * When the request pool is saturated (e.g., in the presence
-+	 * of write hogs), if the processes associated with
-+	 * non-weight-raised queues ask for requests at a lower rate,
-+	 * then processes associated with weight-raised queues have a
-+	 * higher probability to get a request from the pool
-+	 * immediately (or at least soon) when they need one. Thus
-+	 * they have a higher probability to actually get a fraction
-+	 * of the device throughput proportional to their high
-+	 * weight. This is especially true with NCQ-capable drives,
-+	 * which enqueue several requests in advance, and further
-+	 * reorder internally-queued requests.
-+	 *
-+	 * For this reason, we force to false the value of
-+	 * idling_boosts_thr_without_issues if there are weight-raised
-+	 * busy queues. In this case, and if bfqq is not weight-raised,
-+	 * this guarantees that the device is not idled for bfqq (if,
-+	 * instead, bfqq is weight-raised, then idling will be
-+	 * guaranteed by another variable, see below). Combined with
-+	 * the timestamping rules of BFQ (see [1] for details), this
-+	 * behavior causes bfqq, and hence any sync non-weight-raised
-+	 * queue, to get a lower number of requests served, and thus
-+	 * to ask for a lower number of requests from the request
-+	 * pool, before the busy weight-raised queues get served
-+	 * again. This often mitigates starvation problems in the
-+	 * presence of heavy write workloads and NCQ, thereby
-+	 * guaranteeing a higher application and system responsiveness
-+	 * in these hostile scenarios.
-+	 */
-+	idling_boosts_thr_without_issues = idling_boosts_thr &&
-+		bfqd->wr_busy_queues == 0;
-+
-+	/*
-+	 * There are then two cases where idling must be performed not
-+	 * for throughput concerns, but to preserve service
-+	 * guarantees. In the description of these cases, we say, for
-+	 * short, that a queue is sequential/random if the process
-+	 * associated to the queue issues sequential/random requests
-+	 * (in the second case the queue may be tagged as seeky or
-+	 * even constantly_seeky).
-+	 *
-+	 * To introduce the first case, we note that, since
-+	 * bfq_bfqq_idle_window(bfqq) is false if the device is
-+	 * NCQ-capable and bfqq is random (see
-+	 * bfq_update_idle_window()), then, from the above two
-+	 * assignments it follows that
-+	 * idling_boosts_thr_without_issues is false if the device is
-+	 * NCQ-capable and bfqq is random. Therefore, for this case,
-+	 * device idling would never be allowed if we used just
-+	 * idling_boosts_thr_without_issues to decide whether to allow
-+	 * it. And, beneficially, this would imply that throughput
-+	 * would always be boosted also with random I/O on NCQ-capable
-+	 * HDDs.
-+	 *
-+	 * But we must be careful on this point, to avoid an unfair
-+	 * treatment for bfqq. In fact, because of the same above
-+	 * assignments, idling_boosts_thr_without_issues is, on the
-+	 * other hand, true if 1) the device is an HDD and bfqq is
-+	 * sequential, and 2) there are no busy weight-raised
-+	 * queues. As a consequence, if we used just
-+	 * idling_boosts_thr_without_issues to decide whether to idle
-+	 * the device, then with an HDD we might easily bump into a
-+	 * scenario where queues that are sequential and I/O-bound
-+	 * would enjoy idling, whereas random queues would not. The
-+	 * latter might then get a low share of the device throughput,
-+	 * simply because the former would get many requests served
-+	 * after being set as in service, while the latter would not.
-+	 *
-+	 * To address this issue, we start by setting to true a
-+	 * sentinel variable, on_hdd_and_not_all_queues_seeky, if the
-+	 * device is rotational and not all queues with pending or
-+	 * in-flight requests are constantly seeky (i.e., there are
-+	 * active sequential queues, and bfqq might then be mistreated
-+	 * if it does not enjoy idling because it is random).
-+	 */
-+	all_queues_seeky = bfq_bfqq_constantly_seeky(bfqq) &&
-+			   bfqd->busy_in_flight_queues ==
-+			   bfqd->const_seeky_busy_in_flight_queues;
-+
-+	on_hdd_and_not_all_queues_seeky =
-+		!blk_queue_nonrot(bfqd->queue) && !all_queues_seeky;
-+
-+	/*
-+	 * To introduce the second case where idling needs to be
-+	 * performed to preserve service guarantees, we can note that
-+	 * allowing the drive to enqueue more than one request at a
-+	 * time, and hence delegating de facto final scheduling
-+	 * decisions to the drive's internal scheduler, causes loss of
-+	 * control on the actual request service order. In particular,
-+	 * the critical situation is when requests from different
-+	 * processes happens to be present, at the same time, in the
-+	 * internal queue(s) of the drive. In such a situation, the
-+	 * drive, by deciding the service order of the
-+	 * internally-queued requests, does determine also the actual
-+	 * throughput distribution among these processes. But the
-+	 * drive typically has no notion or concern about per-process
-+	 * throughput distribution, and makes its decisions only on a
-+	 * per-request basis. Therefore, the service distribution
-+	 * enforced by the drive's internal scheduler is likely to
-+	 * coincide with the desired device-throughput distribution
-+	 * only in a completely symmetric scenario where:
-+	 * (i)  each of these processes must get the same throughput as
-+	 *      the others;
-+	 * (ii) all these processes have the same I/O pattern
-+	 *      (either sequential or random).
-+	 * In fact, in such a scenario, the drive will tend to treat
-+	 * the requests of each of these processes in about the same
-+	 * way as the requests of the others, and thus to provide
-+	 * each of these processes with about the same throughput
-+	 * (which is exactly the desired throughput distribution). In
-+	 * contrast, in any asymmetric scenario, device idling is
-+	 * certainly needed to guarantee that bfqq receives its
-+	 * assigned fraction of the device throughput (see [1] for
-+	 * details).
-+	 *
-+	 * We address this issue by controlling, actually, only the
-+	 * symmetry sub-condition (i), i.e., provided that
-+	 * sub-condition (i) holds, idling is not performed,
-+	 * regardless of whether sub-condition (ii) holds. In other
-+	 * words, only if sub-condition (i) holds, then idling is
-+	 * allowed, and the device tends to be prevented from queueing
-+	 * many requests, possibly of several processes. The reason
-+	 * for not controlling also sub-condition (ii) is that, first,
-+	 * in the case of an HDD, the asymmetry in terms of types of
-+	 * I/O patterns is already taken in to account in the above
-+	 * sentinel variable
-+	 * on_hdd_and_not_all_queues_seeky. Secondly, in the case of a
-+	 * flash-based device, we prefer however to privilege
-+	 * throughput (and idling lowers throughput for this type of
-+	 * devices), for the following reasons:
-+	 * 1) differently from HDDs, the service time of random
-+	 *    requests is not orders of magnitudes lower than the service
-+	 *    time of sequential requests; thus, even if processes doing
-+	 *    sequential I/O get a preferential treatment with respect to
-+	 *    others doing random I/O, the consequences are not as
-+	 *    dramatic as with HDDs;
-+	 * 2) if a process doing random I/O does need strong
-+	 *    throughput guarantees, it is hopefully already being
-+	 *    weight-raised, or the user is likely to have assigned it a
-+	 *    higher weight than the other processes (and thus
-+	 *    sub-condition (i) is likely to be false, which triggers
-+	 *    idling).
-+	 *
-+	 * According to the above considerations, the next variable is
-+	 * true (only) if sub-condition (i) holds. To compute the
-+	 * value of this variable, we not only use the return value of
-+	 * the function bfq_symmetric_scenario(), but also check
-+	 * whether bfqq is being weight-raised, because
-+	 * bfq_symmetric_scenario() does not take into account also
-+	 * weight-raised queues (see comments to
-+	 * bfq_weights_tree_add()).
-+	 *
-+	 * As a side note, it is worth considering that the above
-+	 * device-idling countermeasures may however fail in the
-+	 * following unlucky scenario: if idling is (correctly)
-+	 * disabled in a time period during which all symmetry
-+	 * sub-conditions hold, and hence the device is allowed to
-+	 * enqueue many requests, but at some later point in time some
-+	 * sub-condition stops to hold, then it may become impossible
-+	 * to let requests be served in the desired order until all
-+	 * the requests already queued in the device have been served.
-+	 */
-+	asymmetric_scenario = bfqq->wr_coeff > 1 ||
-+		!bfq_symmetric_scenario(bfqd);
-+
-+	/*
-+	 * Finally, there is a case where maximizing throughput is the
-+	 * best choice even if it may cause unfairness toward
-+	 * bfqq. Such a case is when bfqq became active in a burst of
-+	 * queue activations. Queues that became active during a large
-+	 * burst benefit only from throughput, as discussed in the
-+	 * comments to bfq_handle_burst. Thus, if bfqq became active
-+	 * in a burst and not idling the device maximizes throughput,
-+	 * then the device must no be idled, because not idling the
-+	 * device provides bfqq and all other queues in the burst with
-+	 * maximum benefit. Combining this and the two cases above, we
-+	 * can now establish when idling is actually needed to
-+	 * preserve service guarantees.
-+	 */
-+	idling_needed_for_service_guarantees =
-+		(on_hdd_and_not_all_queues_seeky || asymmetric_scenario) &&
-+		!bfq_bfqq_in_large_burst(bfqq);
-+
-+	/*
-+	 * We have now all the components we need to compute the return
-+	 * value of the function, which is true only if both the following
-+	 * conditions hold:
-+	 * 1) bfqq is sync, because idling make sense only for sync queues;
-+	 * 2) idling either boosts the throughput (without issues), or
-+	 *    is necessary to preserve service guarantees.
-+	 */
-+	return bfq_bfqq_sync(bfqq) &&
-+		(idling_boosts_thr_without_issues ||
-+		 idling_needed_for_service_guarantees);
-+}
-+
-+/*
-+ * If the in-service queue is empty but the function bfq_bfqq_may_idle
-+ * returns true, then:
-+ * 1) the queue must remain in service and cannot be expired, and
-+ * 2) the device must be idled to wait for the possible arrival of a new
-+ *    request for the queue.
-+ * See the comments to the function bfq_bfqq_may_idle for the reasons
-+ * why performing device idling is the best choice to boost the throughput
-+ * and preserve service guarantees when bfq_bfqq_may_idle itself
-+ * returns true.
-+ */
-+static bool bfq_bfqq_must_idle(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+
-+	return RB_EMPTY_ROOT(&bfqq->sort_list) && bfqd->bfq_slice_idle != 0 &&
-+	       bfq_bfqq_may_idle(bfqq);
-+}
-+
-+/*
-+ * Select a queue for service.  If we have a current queue in service,
-+ * check whether to continue servicing it, or retrieve and set a new one.
-+ */
-+static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq;
-+	struct request *next_rq;
-+	enum bfqq_expiration reason = BFQ_BFQQ_BUDGET_TIMEOUT;
-+
-+	bfqq = bfqd->in_service_queue;
-+	if (!bfqq)
-+		goto new_queue;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue");
-+
-+	if (bfq_may_expire_for_budg_timeout(bfqq) &&
-+	    !timer_pending(&bfqd->idle_slice_timer) &&
-+	    !bfq_bfqq_must_idle(bfqq))
-+		goto expire;
-+
-+	next_rq = bfqq->next_rq;
-+	/*
-+	 * If bfqq has requests queued and it has enough budget left to
-+	 * serve them, keep the queue, otherwise expire it.
-+	 */
-+	if (next_rq) {
-+		if (bfq_serv_to_charge(next_rq, bfqq) >
-+			bfq_bfqq_budget_left(bfqq)) {
-+			reason = BFQ_BFQQ_BUDGET_EXHAUSTED;
-+			goto expire;
-+		} else {
-+			/*
-+			 * The idle timer may be pending because we may
-+			 * not disable disk idling even when a new request
-+			 * arrives.
-+			 */
-+			if (timer_pending(&bfqd->idle_slice_timer)) {
-+				/*
-+				 * If we get here: 1) at least a new request
-+				 * has arrived but we have not disabled the
-+				 * timer because the request was too small,
-+				 * 2) then the block layer has unplugged
-+				 * the device, causing the dispatch to be
-+				 * invoked.
-+				 *
-+				 * Since the device is unplugged, now the
-+				 * requests are probably large enough to
-+				 * provide a reasonable throughput.
-+				 * So we disable idling.
-+				 */
-+				bfq_clear_bfqq_wait_request(bfqq);
-+				del_timer(&bfqd->idle_slice_timer);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+				bfqg_stats_update_idle_time(bfqq_group(bfqq));
-+#endif
-+			}
-+			goto keep_queue;
-+		}
-+	}
-+
-+	/*
-+	 * No requests pending. However, if the in-service queue is idling
-+	 * for a new request, or has requests waiting for a completion and
-+	 * may idle after their completion, then keep it anyway.
-+	 */
-+	if (timer_pending(&bfqd->idle_slice_timer) ||
-+	    (bfqq->dispatched != 0 && bfq_bfqq_may_idle(bfqq))) {
-+		bfqq = NULL;
-+		goto keep_queue;
-+	}
-+
-+	reason = BFQ_BFQQ_NO_MORE_REQUESTS;
-+expire:
-+	bfq_bfqq_expire(bfqd, bfqq, false, reason);
-+new_queue:
-+	bfqq = bfq_set_in_service_queue(bfqd);
-+	bfq_log(bfqd, "select_queue: new queue %d returned",
-+		bfqq ? bfqq->pid : 0);
-+keep_queue:
-+	return bfqq;
-+}
-+
-+static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	if (bfqq->wr_coeff > 1) { /* queue is being weight-raised */
-+		bfq_log_bfqq(bfqd, bfqq,
-+			"raising period dur %u/%u msec, old coeff %u, w %d(%d)",
-+			jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish),
-+			jiffies_to_msecs(bfqq->wr_cur_max_time),
-+			bfqq->wr_coeff,
-+			bfqq->entity.weight, bfqq->entity.orig_weight);
-+
-+		BUG_ON(bfqq != bfqd->in_service_queue && entity->weight !=
-+		       entity->orig_weight * bfqq->wr_coeff);
-+		if (entity->prio_changed)
-+			bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change");
-+
-+		/*
-+		 * If the queue was activated in a burst, or
-+		 * too much time has elapsed from the beginning
-+		 * of this weight-raising period, then end weight
-+		 * raising.
-+		 */
-+		if (bfq_bfqq_in_large_burst(bfqq) ||
-+		    time_is_before_jiffies(bfqq->last_wr_start_finish +
-+					   bfqq->wr_cur_max_time)) {
-+			bfqq->last_wr_start_finish = jiffies;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "wrais ending at %lu, rais_max_time %u",
-+				     bfqq->last_wr_start_finish,
-+				     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+			bfq_bfqq_end_wr(bfqq);
-+		}
-+	}
-+	/* Update weight both if it must be raised and if it must be lowered */
-+	if ((entity->weight > entity->orig_weight) != (bfqq->wr_coeff > 1))
-+		__bfq_entity_update_weight_prio(
-+			bfq_entity_service_tree(entity),
-+			entity);
-+}
-+
-+/*
-+ * Dispatch one request from bfqq, moving it to the request queue
-+ * dispatch list.
-+ */
-+static int bfq_dispatch_request(struct bfq_data *bfqd,
-+				struct bfq_queue *bfqq)
-+{
-+	int dispatched = 0;
-+	struct request *rq;
-+	unsigned long service_to_charge;
-+
-+	BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	/* Follow expired path, else get first next available. */
-+	rq = bfq_check_fifo(bfqq);
-+	if (!rq)
-+		rq = bfqq->next_rq;
-+	service_to_charge = bfq_serv_to_charge(rq, bfqq);
-+
-+	if (service_to_charge > bfq_bfqq_budget_left(bfqq)) {
-+		/*
-+		 * This may happen if the next rq is chosen in fifo order
-+		 * instead of sector order. The budget is properly
-+		 * dimensioned to be always sufficient to serve the next
-+		 * request only if it is chosen in sector order. The reason
-+		 * is that it would be quite inefficient and little useful
-+		 * to always make sure that the budget is large enough to
-+		 * serve even the possible next rq in fifo order.
-+		 * In fact, requests are seldom served in fifo order.
-+		 *
-+		 * Expire the queue for budget exhaustion, and make sure
-+		 * that the next act_budget is enough to serve the next
-+		 * request, even if it comes from the fifo expired path.
-+		 */
-+		bfqq->next_rq = rq;
-+		/*
-+		 * Since this dispatch is failed, make sure that
-+		 * a new one will be performed
-+		 */
-+		if (!bfqd->rq_in_driver)
-+			bfq_schedule_dispatch(bfqd);
-+		goto expire;
-+	}
-+
-+	/* Finally, insert request into driver dispatch list. */
-+	bfq_bfqq_served(bfqq, service_to_charge);
-+	bfq_dispatch_insert(bfqd->queue, rq);
-+
-+	bfq_update_wr_data(bfqd, bfqq);
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+			"dispatched %u sec req (%llu), budg left %d",
-+			blk_rq_sectors(rq),
-+			(unsigned long long) blk_rq_pos(rq),
-+			bfq_bfqq_budget_left(bfqq));
-+
-+	dispatched++;
-+
-+	if (!bfqd->in_service_bic) {
-+		atomic_long_inc(&RQ_BIC(rq)->icq.ioc->refcount);
-+		bfqd->in_service_bic = RQ_BIC(rq);
-+	}
-+
-+	if (bfqd->busy_queues > 1 && ((!bfq_bfqq_sync(bfqq) &&
-+	    dispatched >= bfqd->bfq_max_budget_async_rq) ||
-+	    bfq_class_idle(bfqq)))
-+		goto expire;
-+
-+	return dispatched;
-+
-+expire:
-+	bfq_bfqq_expire(bfqd, bfqq, false, BFQ_BFQQ_BUDGET_EXHAUSTED);
-+	return dispatched;
-+}
-+
-+static int __bfq_forced_dispatch_bfqq(struct bfq_queue *bfqq)
-+{
-+	int dispatched = 0;
-+
-+	while (bfqq->next_rq) {
-+		bfq_dispatch_insert(bfqq->bfqd->queue, bfqq->next_rq);
-+		dispatched++;
-+	}
-+
-+	BUG_ON(!list_empty(&bfqq->fifo));
-+	return dispatched;
-+}
-+
-+/*
-+ * Drain our current requests.
-+ * Used for barriers and when switching io schedulers on-the-fly.
-+ */
-+static int bfq_forced_dispatch(struct bfq_data *bfqd)
-+{
-+	struct bfq_queue *bfqq, *n;
-+	struct bfq_service_tree *st;
-+	int dispatched = 0;
-+
-+	bfqq = bfqd->in_service_queue;
-+	if (bfqq)
-+		__bfq_bfqq_expire(bfqd, bfqq);
-+
-+	/*
-+	 * Loop through classes, and be careful to leave the scheduler
-+	 * in a consistent state, as feedback mechanisms and vtime
-+	 * updates cannot be disabled during the process.
-+	 */
-+	list_for_each_entry_safe(bfqq, n, &bfqd->active_list, bfqq_list) {
-+		st = bfq_entity_service_tree(&bfqq->entity);
-+
-+		dispatched += __bfq_forced_dispatch_bfqq(bfqq);
-+		bfqq->max_budget = bfq_max_budget(bfqd);
-+
-+		bfq_forget_idle(st);
-+	}
-+
-+	BUG_ON(bfqd->busy_queues != 0);
-+
-+	return dispatched;
-+}
-+
-+static int bfq_dispatch_requests(struct request_queue *q, int force)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq;
-+	int max_dispatch;
-+
-+	bfq_log(bfqd, "dispatch requests: %d busy queues", bfqd->busy_queues);
-+	if (bfqd->busy_queues == 0)
-+		return 0;
-+
-+	if (unlikely(force))
-+		return bfq_forced_dispatch(bfqd);
-+
-+	bfqq = bfq_select_queue(bfqd);
-+	if (!bfqq)
-+		return 0;
-+
-+	if (bfq_class_idle(bfqq))
-+		max_dispatch = 1;
-+
-+	if (!bfq_bfqq_sync(bfqq))
-+		max_dispatch = bfqd->bfq_max_budget_async_rq;
-+
-+	if (!bfq_bfqq_sync(bfqq) && bfqq->dispatched >= max_dispatch) {
-+		if (bfqd->busy_queues > 1)
-+			return 0;
-+		if (bfqq->dispatched >= 4 * max_dispatch)
-+			return 0;
-+	}
-+
-+	if (bfqd->sync_flight != 0 && !bfq_bfqq_sync(bfqq))
-+		return 0;
-+
-+	bfq_clear_bfqq_wait_request(bfqq);
-+	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+
-+	if (!bfq_dispatch_request(bfqd, bfqq))
-+		return 0;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "dispatched %s request",
-+			bfq_bfqq_sync(bfqq) ? "sync" : "async");
-+
-+	return 1;
-+}
-+
-+/*
-+ * Task holds one reference to the queue, dropped when task exits.  Each rq
-+ * in-flight on this queue also holds a reference, dropped when rq is freed.
-+ *
-+ * Queue lock must be held here.
-+ */
-+static void bfq_put_queue(struct bfq_queue *bfqq)
-+{
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	struct bfq_group *bfqg = bfqq_group(bfqq);
-+#endif
-+
-+	BUG_ON(atomic_read(&bfqq->ref) <= 0);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+	if (!atomic_dec_and_test(&bfqq->ref))
-+		return;
-+
-+	BUG_ON(rb_first(&bfqq->sort_list));
-+	BUG_ON(bfqq->allocated[READ] + bfqq->allocated[WRITE] != 0);
-+	BUG_ON(bfqq->entity.tree);
-+	BUG_ON(bfq_bfqq_busy(bfqq));
-+	BUG_ON(bfqd->in_service_queue == bfqq);
-+
-+	if (bfq_bfqq_sync(bfqq))
-+		/*
-+		 * The fact that this queue is being destroyed does not
-+		 * invalidate the fact that this queue may have been
-+		 * activated during the current burst. As a consequence,
-+		 * although the queue does not exist anymore, and hence
-+		 * needs to be removed from the burst list if there,
-+		 * the burst size has not to be decremented.
-+		 */
-+		hlist_del_init(&bfqq->burst_list_node);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p freed", bfqq);
-+
-+	kmem_cache_free(bfq_pool, bfqq);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_put(bfqg);
-+#endif
-+}
-+
-+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	if (bfqq == bfqd->in_service_queue) {
-+		__bfq_bfqq_expire(bfqd, bfqq);
-+		bfq_schedule_dispatch(bfqd);
-+	}
-+
-+	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+
-+	bfq_put_queue(bfqq);
-+}
-+
-+static void bfq_init_icq(struct io_cq *icq)
-+{
-+	struct bfq_io_cq *bic = icq_to_bic(icq);
-+
-+	bic->ttime.last_end_request = jiffies;
-+}
-+
-+static void bfq_exit_icq(struct io_cq *icq)
-+{
-+	struct bfq_io_cq *bic = icq_to_bic(icq);
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+
-+	if (bic->bfqq[BLK_RW_ASYNC]) {
-+		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_ASYNC]);
-+		bic->bfqq[BLK_RW_ASYNC] = NULL;
-+	}
-+
-+	if (bic->bfqq[BLK_RW_SYNC]) {
-+		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]);
-+		bic->bfqq[BLK_RW_SYNC] = NULL;
-+	}
-+}
-+
-+/*
-+ * Update the entity prio values; note that the new values will not
-+ * be used until the next (re)activation.
-+ */
-+static void
-+bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
-+{
-+	struct task_struct *tsk = current;
-+	int ioprio_class;
-+
-+	ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);
-+	switch (ioprio_class) {
-+	default:
-+		dev_err(bfqq->bfqd->queue->backing_dev_info.dev,
-+			"bfq: bad prio class %d\n", ioprio_class);
-+	case IOPRIO_CLASS_NONE:
-+		/*
-+		 * No prio set, inherit CPU scheduling settings.
-+		 */
-+		bfqq->new_ioprio = task_nice_ioprio(tsk);
-+		bfqq->new_ioprio_class = task_nice_ioclass(tsk);
-+		break;
-+	case IOPRIO_CLASS_RT:
-+		bfqq->new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+		bfqq->new_ioprio_class = IOPRIO_CLASS_RT;
-+		break;
-+	case IOPRIO_CLASS_BE:
-+		bfqq->new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+		bfqq->new_ioprio_class = IOPRIO_CLASS_BE;
-+		break;
-+	case IOPRIO_CLASS_IDLE:
-+		bfqq->new_ioprio_class = IOPRIO_CLASS_IDLE;
-+		bfqq->new_ioprio = 7;
-+		bfq_clear_bfqq_idle_window(bfqq);
-+		break;
-+	}
-+
-+	if (bfqq->new_ioprio < 0 || bfqq->new_ioprio >= IOPRIO_BE_NR) {
-+		pr_crit("bfq_set_next_ioprio_data: new_ioprio %d\n",
-+			bfqq->new_ioprio);
-+		BUG();
-+	}
-+
-+	bfqq->entity.new_weight = bfq_ioprio_to_weight(bfqq->new_ioprio);
-+	bfqq->entity.prio_changed = 1;
-+}
-+
-+static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio)
-+{
-+	struct bfq_data *bfqd;
-+	struct bfq_queue *bfqq, *new_bfqq;
-+	unsigned long uninitialized_var(flags);
-+	int ioprio = bic->icq.ioc->ioprio;
-+
-+	bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data),
-+				   &flags);
-+	/*
-+	 * This condition may trigger on a newly created bic, be sure to
-+	 * drop the lock before returning.
-+	 */
-+	if (unlikely(!bfqd) || likely(bic->ioprio == ioprio))
-+		goto out;
-+
-+	bic->ioprio = ioprio;
-+
-+	bfqq = bic->bfqq[BLK_RW_ASYNC];
-+	if (bfqq) {
-+		new_bfqq = bfq_get_queue(bfqd, bio, BLK_RW_ASYNC, bic,
-+					 GFP_ATOMIC);
-+		if (new_bfqq) {
-+			bic->bfqq[BLK_RW_ASYNC] = new_bfqq;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "check_ioprio_change: bfqq %p %d",
-+				     bfqq, atomic_read(&bfqq->ref));
-+			bfq_put_queue(bfqq);
-+		}
-+	}
-+
-+	bfqq = bic->bfqq[BLK_RW_SYNC];
-+	if (bfqq)
-+		bfq_set_next_ioprio_data(bfqq, bic);
-+
-+out:
-+	bfq_put_bfqd_unlock(bfqd, &flags);
-+}
-+
-+static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			  struct bfq_io_cq *bic, pid_t pid, int is_sync)
-+{
-+	RB_CLEAR_NODE(&bfqq->entity.rb_node);
-+	INIT_LIST_HEAD(&bfqq->fifo);
-+	INIT_HLIST_NODE(&bfqq->burst_list_node);
-+
-+	atomic_set(&bfqq->ref, 0);
-+	bfqq->bfqd = bfqd;
-+
-+	if (bic)
-+		bfq_set_next_ioprio_data(bfqq, bic);
-+
-+	if (is_sync) {
-+		if (!bfq_class_idle(bfqq))
-+			bfq_mark_bfqq_idle_window(bfqq);
-+		bfq_mark_bfqq_sync(bfqq);
-+	} else
-+		bfq_clear_bfqq_sync(bfqq);
-+	bfq_mark_bfqq_IO_bound(bfqq);
-+
-+	/* Tentative initial value to trade off between thr and lat */
-+	bfqq->max_budget = (2 * bfq_max_budget(bfqd)) / 3;
-+	bfqq->pid = pid;
-+
-+	bfqq->wr_coeff = 1;
-+	bfqq->last_wr_start_finish = 0;
-+	/*
-+	 * Set to the value for which bfqq will not be deemed as
-+	 * soft rt when it becomes backlogged.
-+	 */
-+	bfqq->soft_rt_next_start = bfq_infinity_from_now(jiffies);
-+}
-+
-+static struct bfq_queue *bfq_find_alloc_queue(struct bfq_data *bfqd,
-+					      struct bio *bio, int is_sync,
-+					      struct bfq_io_cq *bic,
-+					      gfp_t gfp_mask)
-+{
-+	struct bfq_group *bfqg;
-+	struct bfq_queue *bfqq, *new_bfqq = NULL;
-+	struct blkcg *blkcg;
-+
-+retry:
-+	rcu_read_lock();
-+
-+	blkcg = bio_blkcg(bio);
-+	bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+	/* bic always exists here */
-+	bfqq = bic_to_bfqq(bic, is_sync);
-+
-+	/*
-+	 * Always try a new alloc if we fall back to the OOM bfqq
-+	 * originally, since it should just be a temporary situation.
-+	 */
-+	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
-+		bfqq = NULL;
-+		if (new_bfqq) {
-+			bfqq = new_bfqq;
-+			new_bfqq = NULL;
-+		} else if (gfpflags_allow_blocking(gfp_mask)) {
-+			rcu_read_unlock();
-+			spin_unlock_irq(bfqd->queue->queue_lock);
-+			new_bfqq = kmem_cache_alloc_node(bfq_pool,
-+					gfp_mask | __GFP_ZERO,
-+					bfqd->queue->node);
-+			spin_lock_irq(bfqd->queue->queue_lock);
-+			if (new_bfqq)
-+				goto retry;
-+		} else {
-+			bfqq = kmem_cache_alloc_node(bfq_pool,
-+					gfp_mask | __GFP_ZERO,
-+					bfqd->queue->node);
-+		}
-+
-+		if (bfqq) {
-+			bfq_init_bfqq(bfqd, bfqq, bic, current->pid,
-+				      is_sync);
-+			bfq_init_entity(&bfqq->entity, bfqg);
-+			bfq_log_bfqq(bfqd, bfqq, "allocated");
-+		} else {
-+			bfqq = &bfqd->oom_bfqq;
-+			bfq_log_bfqq(bfqd, bfqq, "using oom bfqq");
-+		}
-+	}
-+
-+	if (new_bfqq)
-+		kmem_cache_free(bfq_pool, new_bfqq);
-+
-+	rcu_read_unlock();
-+
-+	return bfqq;
-+}
-+
-+static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd,
-+					       struct bfq_group *bfqg,
-+					       int ioprio_class, int ioprio)
-+{
-+	switch (ioprio_class) {
-+	case IOPRIO_CLASS_RT:
-+		return &bfqg->async_bfqq[0][ioprio];
-+	case IOPRIO_CLASS_NONE:
-+		ioprio = IOPRIO_NORM;
-+		/* fall through */
-+	case IOPRIO_CLASS_BE:
-+		return &bfqg->async_bfqq[1][ioprio];
-+	case IOPRIO_CLASS_IDLE:
-+		return &bfqg->async_idle_bfqq;
-+	default:
-+		BUG();
-+	}
-+}
-+
-+static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
-+				       struct bio *bio, int is_sync,
-+				       struct bfq_io_cq *bic, gfp_t gfp_mask)
-+{
-+	const int ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
-+	const int ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);
-+	struct bfq_queue **async_bfqq = NULL;
-+	struct bfq_queue *bfqq = NULL;
-+
-+	if (!is_sync) {
-+		struct blkcg *blkcg;
-+		struct bfq_group *bfqg;
-+
-+		rcu_read_lock();
-+		blkcg = bio_blkcg(bio);
-+		rcu_read_unlock();
-+		bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+		async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class,
-+						  ioprio);
-+		bfqq = *async_bfqq;
-+	}
-+
-+	if (!bfqq)
-+		bfqq = bfq_find_alloc_queue(bfqd, bio, is_sync, bic, gfp_mask);
-+
-+	/*
-+	 * Pin the queue now that it's allocated, scheduler exit will
-+	 * prune it.
-+	 */
-+	if (!is_sync && !(*async_bfqq)) {
-+		atomic_inc(&bfqq->ref);
-+		bfq_log_bfqq(bfqd, bfqq, "get_queue, bfqq not in async: %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		*async_bfqq = bfqq;
-+	}
-+
-+	atomic_inc(&bfqq->ref);
-+	bfq_log_bfqq(bfqd, bfqq, "get_queue, at end: %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+	return bfqq;
-+}
-+
-+static void bfq_update_io_thinktime(struct bfq_data *bfqd,
-+				    struct bfq_io_cq *bic)
-+{
-+	unsigned long elapsed = jiffies - bic->ttime.last_end_request;
-+	unsigned long ttime = min(elapsed, 2UL * bfqd->bfq_slice_idle);
-+
-+	bic->ttime.ttime_samples = (7*bic->ttime.ttime_samples + 256) / 8;
-+	bic->ttime.ttime_total = (7*bic->ttime.ttime_total + 256*ttime) / 8;
-+	bic->ttime.ttime_mean = (bic->ttime.ttime_total + 128) /
-+				bic->ttime.ttime_samples;
-+}
-+
-+static void bfq_update_io_seektime(struct bfq_data *bfqd,
-+				   struct bfq_queue *bfqq,
-+				   struct request *rq)
-+{
-+	sector_t sdist;
-+	u64 total;
-+
-+	if (bfqq->last_request_pos < blk_rq_pos(rq))
-+		sdist = blk_rq_pos(rq) - bfqq->last_request_pos;
-+	else
-+		sdist = bfqq->last_request_pos - blk_rq_pos(rq);
-+
-+	/*
-+	 * Don't allow the seek distance to get too large from the
-+	 * odd fragment, pagein, etc.
-+	 */
-+	if (bfqq->seek_samples == 0) /* first request, not really a seek */
-+		sdist = 0;
-+	else if (bfqq->seek_samples <= 60) /* second & third seek */
-+		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*1024);
-+	else
-+		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*64);
-+
-+	bfqq->seek_samples = (7*bfqq->seek_samples + 256) / 8;
-+	bfqq->seek_total = (7*bfqq->seek_total + (u64)256*sdist) / 8;
-+	total = bfqq->seek_total + (bfqq->seek_samples/2);
-+	do_div(total, bfqq->seek_samples);
-+	bfqq->seek_mean = (sector_t)total;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "dist=%llu mean=%llu", (u64)sdist,
-+			(u64)bfqq->seek_mean);
-+}
-+
-+/*
-+ * Disable idle window if the process thinks too long or seeks so much that
-+ * it doesn't matter.
-+ */
-+static void bfq_update_idle_window(struct bfq_data *bfqd,
-+				   struct bfq_queue *bfqq,
-+				   struct bfq_io_cq *bic)
-+{
-+	int enable_idle;
-+
-+	/* Don't idle for async or idle io prio class. */
-+	if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq))
-+		return;
-+
-+	enable_idle = bfq_bfqq_idle_window(bfqq);
-+
-+	if (atomic_read(&bic->icq.ioc->active_ref) == 0 ||
-+	    bfqd->bfq_slice_idle == 0 ||
-+		(bfqd->hw_tag && BFQQ_SEEKY(bfqq) &&
-+			bfqq->wr_coeff == 1))
-+		enable_idle = 0;
-+	else if (bfq_sample_valid(bic->ttime.ttime_samples)) {
-+		if (bic->ttime.ttime_mean > bfqd->bfq_slice_idle &&
-+			bfqq->wr_coeff == 1)
-+			enable_idle = 0;
-+		else
-+			enable_idle = 1;
-+	}
-+	bfq_log_bfqq(bfqd, bfqq, "update_idle_window: enable_idle %d",
-+		enable_idle);
-+
-+	if (enable_idle)
-+		bfq_mark_bfqq_idle_window(bfqq);
-+	else
-+		bfq_clear_bfqq_idle_window(bfqq);
-+}
-+
-+/*
-+ * Called when a new fs request (rq) is added to bfqq.  Check if there's
-+ * something we should do about it.
-+ */
-+static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			    struct request *rq)
-+{
-+	struct bfq_io_cq *bic = RQ_BIC(rq);
-+
-+	if (rq->cmd_flags & REQ_META)
-+		bfqq->meta_pending++;
-+
-+	bfq_update_io_thinktime(bfqd, bic);
-+	bfq_update_io_seektime(bfqd, bfqq, rq);
-+	if (!BFQQ_SEEKY(bfqq) && bfq_bfqq_constantly_seeky(bfqq)) {
-+		bfq_clear_bfqq_constantly_seeky(bfqq);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->const_seeky_busy_in_flight_queues);
-+			bfqd->const_seeky_busy_in_flight_queues--;
-+		}
-+	}
-+	if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 ||
-+	    !BFQQ_SEEKY(bfqq))
-+		bfq_update_idle_window(bfqd, bfqq, bic);
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		     "rq_enqueued: idle_window=%d (seeky %d, mean %llu)",
-+		     bfq_bfqq_idle_window(bfqq), BFQQ_SEEKY(bfqq),
-+		     (unsigned long long) bfqq->seek_mean);
-+
-+	bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq);
-+
-+	if (bfqq == bfqd->in_service_queue && bfq_bfqq_wait_request(bfqq)) {
-+		bool small_req = bfqq->queued[rq_is_sync(rq)] == 1 &&
-+				 blk_rq_sectors(rq) < 32;
-+		bool budget_timeout = bfq_bfqq_budget_timeout(bfqq);
-+
-+		/*
-+		 * There is just this request queued: if the request
-+		 * is small and the queue is not to be expired, then
-+		 * just exit.
-+		 *
-+		 * In this way, if the disk is being idled to wait for
-+		 * a new request from the in-service queue, we avoid
-+		 * unplugging the device and committing the disk to serve
-+		 * just a small request. On the contrary, we wait for
-+		 * the block layer to decide when to unplug the device:
-+		 * hopefully, new requests will be merged to this one
-+		 * quickly, then the device will be unplugged and
-+		 * larger requests will be dispatched.
-+		 */
-+		if (small_req && !budget_timeout)
-+			return;
-+
-+		/*
-+		 * A large enough request arrived, or the queue is to
-+		 * be expired: in both cases disk idling is to be
-+		 * stopped, so clear wait_request flag and reset
-+		 * timer.
-+		 */
-+		bfq_clear_bfqq_wait_request(bfqq);
-+		del_timer(&bfqd->idle_slice_timer);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		bfqg_stats_update_idle_time(bfqq_group(bfqq));
-+#endif
-+
-+		/*
-+		 * The queue is not empty, because a new request just
-+		 * arrived. Hence we can safely expire the queue, in
-+		 * case of budget timeout, without risking that the
-+		 * timestamps of the queue are not updated correctly.
-+		 * See [1] for more details.
-+		 */
-+		if (budget_timeout)
-+			bfq_bfqq_expire(bfqd, bfqq, false,
-+					BFQ_BFQQ_BUDGET_TIMEOUT);
-+
-+		/*
-+		 * Let the request rip immediately, or let a new queue be
-+		 * selected if bfqq has just been expired.
-+		 */
-+		__blk_run_queue(bfqd->queue);
-+	}
-+}
-+
-+static void bfq_insert_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	assert_spin_locked(bfqd->queue->queue_lock);
-+
-+	bfq_add_request(rq);
-+
-+	rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)];
-+	list_add_tail(&rq->queuelist, &bfqq->fifo);
-+
-+	bfq_rq_enqueued(bfqd, bfqq, rq);
-+}
-+
-+static void bfq_update_hw_tag(struct bfq_data *bfqd)
-+{
-+	bfqd->max_rq_in_driver = max(bfqd->max_rq_in_driver,
-+				     bfqd->rq_in_driver);
-+
-+	if (bfqd->hw_tag == 1)
-+		return;
-+
-+	/*
-+	 * This sample is valid if the number of outstanding requests
-+	 * is large enough to allow a queueing behavior.  Note that the
-+	 * sum is not exact, as it's not taking into account deactivated
-+	 * requests.
-+	 */
-+	if (bfqd->rq_in_driver + bfqd->queued < BFQ_HW_QUEUE_THRESHOLD)
-+		return;
-+
-+	if (bfqd->hw_tag_samples++ < BFQ_HW_QUEUE_SAMPLES)
-+		return;
-+
-+	bfqd->hw_tag = bfqd->max_rq_in_driver > BFQ_HW_QUEUE_THRESHOLD;
-+	bfqd->max_rq_in_driver = 0;
-+	bfqd->hw_tag_samples = 0;
-+}
-+
-+static void bfq_completed_request(struct request_queue *q, struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+	bool sync = bfq_bfqq_sync(bfqq);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "completed one req with %u sects left (%d)",
-+		     blk_rq_sectors(rq), sync);
-+
-+	bfq_update_hw_tag(bfqd);
-+
-+	BUG_ON(!bfqd->rq_in_driver);
-+	BUG_ON(!bfqq->dispatched);
-+	bfqd->rq_in_driver--;
-+	bfqq->dispatched--;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_completion(bfqq_group(bfqq),
-+				     rq_start_time_ns(rq),
-+				     rq_io_start_time_ns(rq), rq->cmd_flags);
-+#endif
-+
-+	if (!bfqq->dispatched && !bfq_bfqq_busy(bfqq)) {
-+		bfq_weights_tree_remove(bfqd, &bfqq->entity,
-+					&bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->busy_in_flight_queues);
-+			bfqd->busy_in_flight_queues--;
-+			if (bfq_bfqq_constantly_seeky(bfqq)) {
-+				BUG_ON(!bfqd->
-+					const_seeky_busy_in_flight_queues);
-+				bfqd->const_seeky_busy_in_flight_queues--;
-+			}
-+		}
-+	}
-+
-+	if (sync) {
-+		bfqd->sync_flight--;
-+		RQ_BIC(rq)->ttime.last_end_request = jiffies;
-+	}
-+
-+	/*
-+	 * If we are waiting to discover whether the request pattern of the
-+	 * task associated with the queue is actually isochronous, and
-+	 * both requisites for this condition to hold are satisfied, then
-+	 * compute soft_rt_next_start (see the comments to the function
-+	 * bfq_bfqq_softrt_next_start()).
-+	 */
-+	if (bfq_bfqq_softrt_update(bfqq) && bfqq->dispatched == 0 &&
-+	    RB_EMPTY_ROOT(&bfqq->sort_list))
-+		bfqq->soft_rt_next_start =
-+			bfq_bfqq_softrt_next_start(bfqd, bfqq);
-+
-+	/*
-+	 * If this is the in-service queue, check if it needs to be expired,
-+	 * or if we want to idle in case it has no pending requests.
-+	 */
-+	if (bfqd->in_service_queue == bfqq) {
-+		if (bfq_bfqq_budget_new(bfqq))
-+			bfq_set_budget_timeout(bfqd);
-+
-+		if (bfq_bfqq_must_idle(bfqq)) {
-+			bfq_arm_slice_timer(bfqd);
-+			goto out;
-+		} else if (bfq_may_expire_for_budg_timeout(bfqq))
-+			bfq_bfqq_expire(bfqd, bfqq, false,
-+					BFQ_BFQQ_BUDGET_TIMEOUT);
-+		else if (RB_EMPTY_ROOT(&bfqq->sort_list) &&
-+			 (bfqq->dispatched == 0 ||
-+			  !bfq_bfqq_may_idle(bfqq)))
-+			bfq_bfqq_expire(bfqd, bfqq, false,
-+					BFQ_BFQQ_NO_MORE_REQUESTS);
-+	}
-+
-+	if (!bfqd->rq_in_driver)
-+		bfq_schedule_dispatch(bfqd);
-+
-+out:
-+	return;
-+}
-+
-+static int __bfq_may_queue(struct bfq_queue *bfqq)
-+{
-+	if (bfq_bfqq_wait_request(bfqq) && bfq_bfqq_must_alloc(bfqq)) {
-+		bfq_clear_bfqq_must_alloc(bfqq);
-+		return ELV_MQUEUE_MUST;
-+	}
-+
-+	return ELV_MQUEUE_MAY;
-+}
-+
-+static int bfq_may_queue(struct request_queue *q, int rw)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct task_struct *tsk = current;
-+	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq;
-+
-+	/*
-+	 * Don't force setup of a queue from here, as a call to may_queue
-+	 * does not necessarily imply that a request actually will be
-+	 * queued. So just lookup a possibly existing queue, or return
-+	 * 'may queue' if that fails.
-+	 */
-+	bic = bfq_bic_lookup(bfqd, tsk->io_context);
-+	if (!bic)
-+		return ELV_MQUEUE_MAY;
-+
-+	bfqq = bic_to_bfqq(bic, rw_is_sync(rw));
-+	if (bfqq)
-+		return __bfq_may_queue(bfqq);
-+
-+	return ELV_MQUEUE_MAY;
-+}
-+
-+/*
-+ * Queue lock held here.
-+ */
-+static void bfq_put_request(struct request *rq)
-+{
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+
-+	if (bfqq) {
-+		const int rw = rq_data_dir(rq);
-+
-+		BUG_ON(!bfqq->allocated[rw]);
-+		bfqq->allocated[rw]--;
-+
-+		rq->elv.priv[0] = NULL;
-+		rq->elv.priv[1] = NULL;
-+
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "put_request %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+	}
-+}
-+
-+/*
-+ * Allocate bfq data structures associated with this request.
-+ */
-+static int bfq_set_request(struct request_queue *q, struct request *rq,
-+			   struct bio *bio, gfp_t gfp_mask)
-+{
-+	struct bfq_data *bfqd = q->elevator->elevator_data;
-+	struct bfq_io_cq *bic = icq_to_bic(rq->elv.icq);
-+	const int rw = rq_data_dir(rq);
-+	const int is_sync = rq_is_sync(rq);
-+	struct bfq_queue *bfqq;
-+	unsigned long flags;
-+
-+	might_sleep_if(gfpflags_allow_blocking(gfp_mask));
-+
-+	bfq_check_ioprio_change(bic, bio);
-+
-+	spin_lock_irqsave(q->queue_lock, flags);
-+
-+	if (!bic)
-+		goto queue_fail;
-+
-+	bfq_bic_update_cgroup(bic, bio);
-+
-+	bfqq = bic_to_bfqq(bic, is_sync);
-+	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
-+		bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, gfp_mask);
-+		bic_set_bfqq(bic, bfqq, is_sync);
-+		if (is_sync) {
-+			if (bfqd->large_burst)
-+				bfq_mark_bfqq_in_large_burst(bfqq);
-+			else
-+				bfq_clear_bfqq_in_large_burst(bfqq);
-+		}
-+	}
-+
-+	bfqq->allocated[rw]++;
-+	atomic_inc(&bfqq->ref);
-+	bfq_log_bfqq(bfqd, bfqq, "set_request: bfqq %p, %d", bfqq,
-+		     atomic_read(&bfqq->ref));
-+
-+	rq->elv.priv[0] = bic;
-+	rq->elv.priv[1] = bfqq;
-+
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
-+	return 0;
-+
-+queue_fail:
-+	bfq_schedule_dispatch(bfqd);
-+	spin_unlock_irqrestore(q->queue_lock, flags);
-+
-+	return 1;
-+}
-+
-+static void bfq_kick_queue(struct work_struct *work)
-+{
-+	struct bfq_data *bfqd =
-+		container_of(work, struct bfq_data, unplug_work);
-+	struct request_queue *q = bfqd->queue;
-+
-+	spin_lock_irq(q->queue_lock);
-+	__blk_run_queue(q);
-+	spin_unlock_irq(q->queue_lock);
-+}
-+
-+/*
-+ * Handler of the expiration of the timer running if the in-service queue
-+ * is idling inside its time slice.
-+ */
-+static void bfq_idle_slice_timer(unsigned long data)
-+{
-+	struct bfq_data *bfqd = (struct bfq_data *)data;
-+	struct bfq_queue *bfqq;
-+	unsigned long flags;
-+	enum bfqq_expiration reason;
-+
-+	spin_lock_irqsave(bfqd->queue->queue_lock, flags);
-+
-+	bfqq = bfqd->in_service_queue;
-+	/*
-+	 * Theoretical race here: the in-service queue can be NULL or
-+	 * different from the queue that was idling if the timer handler
-+	 * spins on the queue_lock and a new request arrives for the
-+	 * current queue and there is a full dispatch cycle that changes
-+	 * the in-service queue.  This can hardly happen, but in the worst
-+	 * case we just expire a queue too early.
-+	 */
-+	if (bfqq) {
-+		bfq_log_bfqq(bfqd, bfqq, "slice_timer expired");
-+		if (bfq_bfqq_budget_timeout(bfqq))
-+			/*
-+			 * Also here the queue can be safely expired
-+			 * for budget timeout without wasting
-+			 * guarantees
-+			 */
-+			reason = BFQ_BFQQ_BUDGET_TIMEOUT;
-+		else if (bfqq->queued[0] == 0 && bfqq->queued[1] == 0)
-+			/*
-+			 * The queue may not be empty upon timer expiration,
-+			 * because we may not disable the timer when the
-+			 * first request of the in-service queue arrives
-+			 * during disk idling.
-+			 */
-+			reason = BFQ_BFQQ_TOO_IDLE;
-+		else
-+			goto schedule_dispatch;
-+
-+		bfq_bfqq_expire(bfqd, bfqq, true, reason);
-+	}
-+
-+schedule_dispatch:
-+	bfq_schedule_dispatch(bfqd);
-+
-+	spin_unlock_irqrestore(bfqd->queue->queue_lock, flags);
-+}
-+
-+static void bfq_shutdown_timer_wq(struct bfq_data *bfqd)
-+{
-+	del_timer_sync(&bfqd->idle_slice_timer);
-+	cancel_work_sync(&bfqd->unplug_work);
-+}
-+
-+static void __bfq_put_async_bfqq(struct bfq_data *bfqd,
-+					struct bfq_queue **bfqq_ptr)
-+{
-+	struct bfq_group *root_group = bfqd->root_group;
-+	struct bfq_queue *bfqq = *bfqq_ptr;
-+
-+	bfq_log(bfqd, "put_async_bfqq: %p", bfqq);
-+	if (bfqq) {
-+		bfq_bfqq_move(bfqd, bfqq, &bfqq->entity, root_group);
-+		bfq_log_bfqq(bfqd, bfqq, "put_async_bfqq: putting %p, %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+		*bfqq_ptr = NULL;
-+	}
-+}
-+
-+/*
-+ * Release all the bfqg references to its async queues.  If we are
-+ * deallocating the group these queues may still contain requests, so
-+ * we reparent them to the root cgroup (i.e., the only one that will
-+ * exist for sure until all the requests on a device are gone).
-+ */
-+static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg)
-+{
-+	int i, j;
-+
-+	for (i = 0; i < 2; i++)
-+		for (j = 0; j < IOPRIO_BE_NR; j++)
-+			__bfq_put_async_bfqq(bfqd, &bfqg->async_bfqq[i][j]);
-+
-+	__bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq);
-+}
-+
-+static void bfq_exit_queue(struct elevator_queue *e)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	struct request_queue *q = bfqd->queue;
-+	struct bfq_queue *bfqq, *n;
-+
-+	bfq_shutdown_timer_wq(bfqd);
-+
-+	spin_lock_irq(q->queue_lock);
-+
-+	BUG_ON(bfqd->in_service_queue);
-+	list_for_each_entry_safe(bfqq, n, &bfqd->idle_list, bfqq_list)
-+		bfq_deactivate_bfqq(bfqd, bfqq, 0);
-+
-+	spin_unlock_irq(q->queue_lock);
-+
-+	bfq_shutdown_timer_wq(bfqd);
-+
-+	synchronize_rcu();
-+
-+	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	blkcg_deactivate_policy(q, &blkcg_policy_bfq);
-+#else
-+	kfree(bfqd->root_group);
-+#endif
-+
-+	kfree(bfqd);
-+}
-+
-+static void bfq_init_root_group(struct bfq_group *root_group,
-+				struct bfq_data *bfqd)
-+{
-+	int i;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	root_group->entity.parent = NULL;
-+	root_group->my_entity = NULL;
-+	root_group->bfqd = bfqd;
-+#endif
-+	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
-+		root_group->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
-+}
-+
-+static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
-+{
-+	struct bfq_data *bfqd;
-+	struct elevator_queue *eq;
-+
-+	eq = elevator_alloc(q, e);
-+	if (!eq)
-+		return -ENOMEM;
-+
-+	bfqd = kzalloc_node(sizeof(*bfqd), GFP_KERNEL, q->node);
-+	if (!bfqd) {
-+		kobject_put(&eq->kobj);
-+		return -ENOMEM;
-+	}
-+	eq->elevator_data = bfqd;
-+
-+	/*
-+	 * Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues.
-+	 * Grab a permanent reference to it, so that the normal code flow
-+	 * will not attempt to free it.
-+	 */
-+	bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, NULL, 1, 0);
-+	atomic_inc(&bfqd->oom_bfqq.ref);
-+	bfqd->oom_bfqq.new_ioprio = BFQ_DEFAULT_QUEUE_IOPRIO;
-+	bfqd->oom_bfqq.new_ioprio_class = IOPRIO_CLASS_BE;
-+	bfqd->oom_bfqq.entity.new_weight =
-+		bfq_ioprio_to_weight(bfqd->oom_bfqq.new_ioprio);
-+	/*
-+	 * Trigger weight initialization, according to ioprio, at the
-+	 * oom_bfqq's first activation. The oom_bfqq's ioprio and ioprio
-+	 * class won't be changed any more.
-+	 */
-+	bfqd->oom_bfqq.entity.prio_changed = 1;
-+
-+	bfqd->queue = q;
-+
-+	spin_lock_irq(q->queue_lock);
-+	q->elevator = eq;
-+	spin_unlock_irq(q->queue_lock);
-+
-+	bfqd->root_group = bfq_create_group_hierarchy(bfqd, q->node);
-+	if (!bfqd->root_group)
-+		goto out_free;
-+	bfq_init_root_group(bfqd->root_group, bfqd);
-+	bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqd->active_numerous_groups = 0;
-+#endif
-+
-+	init_timer(&bfqd->idle_slice_timer);
-+	bfqd->idle_slice_timer.function = bfq_idle_slice_timer;
-+	bfqd->idle_slice_timer.data = (unsigned long)bfqd;
-+
-+	bfqd->queue_weights_tree = RB_ROOT;
-+	bfqd->group_weights_tree = RB_ROOT;
-+
-+	INIT_WORK(&bfqd->unplug_work, bfq_kick_queue);
-+
-+	INIT_LIST_HEAD(&bfqd->active_list);
-+	INIT_LIST_HEAD(&bfqd->idle_list);
-+	INIT_HLIST_HEAD(&bfqd->burst_list);
-+
-+	bfqd->hw_tag = -1;
-+
-+	bfqd->bfq_max_budget = bfq_default_max_budget;
-+
-+	bfqd->bfq_fifo_expire[0] = bfq_fifo_expire[0];
-+	bfqd->bfq_fifo_expire[1] = bfq_fifo_expire[1];
-+	bfqd->bfq_back_max = bfq_back_max;
-+	bfqd->bfq_back_penalty = bfq_back_penalty;
-+	bfqd->bfq_slice_idle = bfq_slice_idle;
-+	bfqd->bfq_class_idle_last_service = 0;
-+	bfqd->bfq_max_budget_async_rq = bfq_max_budget_async_rq;
-+	bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async;
-+	bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync;
-+
-+	bfqd->bfq_requests_within_timer = 120;
-+
-+	bfqd->bfq_large_burst_thresh = 11;
-+	bfqd->bfq_burst_interval = msecs_to_jiffies(500);
-+
-+	bfqd->low_latency = true;
-+
-+	bfqd->bfq_wr_coeff = 20;
-+	bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300);
-+	bfqd->bfq_wr_max_time = 0;
-+	bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000);
-+	bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500);
-+	bfqd->bfq_wr_max_softrt_rate = 7000; /*
-+					      * Approximate rate required
-+					      * to playback or record a
-+					      * high-definition compressed
-+					      * video.
-+					      */
-+	bfqd->wr_busy_queues = 0;
-+	bfqd->busy_in_flight_queues = 0;
-+	bfqd->const_seeky_busy_in_flight_queues = 0;
-+
-+	/*
-+	 * Begin by assuming, optimistically, that the device peak rate is
-+	 * equal to the highest reference rate.
-+	 */
-+	bfqd->RT_prod = R_fast[blk_queue_nonrot(bfqd->queue)] *
-+			T_fast[blk_queue_nonrot(bfqd->queue)];
-+	bfqd->peak_rate = R_fast[blk_queue_nonrot(bfqd->queue)];
-+	bfqd->device_speed = BFQ_BFQD_FAST;
-+
-+	return 0;
-+
-+out_free:
-+	kfree(bfqd);
-+	kobject_put(&eq->kobj);
-+	return -ENOMEM;
-+}
-+
-+static void bfq_slab_kill(void)
-+{
-+	kmem_cache_destroy(bfq_pool);
-+}
-+
-+static int __init bfq_slab_setup(void)
-+{
-+	bfq_pool = KMEM_CACHE(bfq_queue, 0);
-+	if (!bfq_pool)
-+		return -ENOMEM;
-+	return 0;
-+}
-+
-+static ssize_t bfq_var_show(unsigned int var, char *page)
-+{
-+	return sprintf(page, "%d\n", var);
-+}
-+
-+static ssize_t bfq_var_store(unsigned long *var, const char *page,
-+			     size_t count)
-+{
-+	unsigned long new_val;
-+	int ret = kstrtoul(page, 10, &new_val);
-+
-+	if (ret == 0)
-+		*var = new_val;
-+
-+	return count;
-+}
-+
-+static ssize_t bfq_wr_max_time_show(struct elevator_queue *e, char *page)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+
-+	return sprintf(page, "%d\n", bfqd->bfq_wr_max_time > 0 ?
-+		       jiffies_to_msecs(bfqd->bfq_wr_max_time) :
-+		       jiffies_to_msecs(bfq_wr_duration(bfqd)));
-+}
-+
-+static ssize_t bfq_weights_show(struct elevator_queue *e, char *page)
-+{
-+	struct bfq_queue *bfqq;
-+	struct bfq_data *bfqd = e->elevator_data;
-+	ssize_t num_char = 0;
-+
-+	num_char += sprintf(page + num_char, "Tot reqs queued %d\n\n",
-+			    bfqd->queued);
-+
-+	spin_lock_irq(bfqd->queue->queue_lock);
-+
-+	num_char += sprintf(page + num_char, "Active:\n");
-+	list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) {
-+		num_char += sprintf(page + num_char,
-+				    "pid%d: weight %hu, nr_queued %d %d, ",
-+				    bfqq->pid,
-+				    bfqq->entity.weight,
-+				    bfqq->queued[0],
-+				    bfqq->queued[1]);
-+		num_char += sprintf(page + num_char,
-+				    "dur %d/%u\n",
-+				    jiffies_to_msecs(
-+					    jiffies -
-+					    bfqq->last_wr_start_finish),
-+				    jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	}
-+
-+	num_char += sprintf(page + num_char, "Idle:\n");
-+	list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) {
-+		num_char += sprintf(page + num_char,
-+				    "pid%d: weight %hu, dur %d/%u\n",
-+				    bfqq->pid,
-+				    bfqq->entity.weight,
-+				    jiffies_to_msecs(jiffies -
-+						     bfqq->last_wr_start_finish),
-+				    jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	}
-+
-+	spin_unlock_irq(bfqd->queue->queue_lock);
-+
-+	return num_char;
-+}
-+
-+#define SHOW_FUNCTION(__FUNC, __VAR, __CONV)				\
-+static ssize_t __FUNC(struct elevator_queue *e, char *page)		\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	unsigned int __data = __VAR;					\
-+	if (__CONV)							\
-+		__data = jiffies_to_msecs(__data);			\
-+	return bfq_var_show(__data, (page));				\
-+}
-+SHOW_FUNCTION(bfq_fifo_expire_sync_show, bfqd->bfq_fifo_expire[1], 1);
-+SHOW_FUNCTION(bfq_fifo_expire_async_show, bfqd->bfq_fifo_expire[0], 1);
-+SHOW_FUNCTION(bfq_back_seek_max_show, bfqd->bfq_back_max, 0);
-+SHOW_FUNCTION(bfq_back_seek_penalty_show, bfqd->bfq_back_penalty, 0);
-+SHOW_FUNCTION(bfq_slice_idle_show, bfqd->bfq_slice_idle, 1);
-+SHOW_FUNCTION(bfq_max_budget_show, bfqd->bfq_user_max_budget, 0);
-+SHOW_FUNCTION(bfq_max_budget_async_rq_show,
-+	      bfqd->bfq_max_budget_async_rq, 0);
-+SHOW_FUNCTION(bfq_timeout_sync_show, bfqd->bfq_timeout[BLK_RW_SYNC], 1);
-+SHOW_FUNCTION(bfq_timeout_async_show, bfqd->bfq_timeout[BLK_RW_ASYNC], 1);
-+SHOW_FUNCTION(bfq_low_latency_show, bfqd->low_latency, 0);
-+SHOW_FUNCTION(bfq_wr_coeff_show, bfqd->bfq_wr_coeff, 0);
-+SHOW_FUNCTION(bfq_wr_rt_max_time_show, bfqd->bfq_wr_rt_max_time, 1);
-+SHOW_FUNCTION(bfq_wr_min_idle_time_show, bfqd->bfq_wr_min_idle_time, 1);
-+SHOW_FUNCTION(bfq_wr_min_inter_arr_async_show, bfqd->bfq_wr_min_inter_arr_async,
-+	1);
-+SHOW_FUNCTION(bfq_wr_max_softrt_rate_show, bfqd->bfq_wr_max_softrt_rate, 0);
-+#undef SHOW_FUNCTION
-+
-+#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV)			\
-+static ssize_t								\
-+__FUNC(struct elevator_queue *e, const char *page, size_t count)	\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	unsigned long uninitialized_var(__data);			\
-+	int ret = bfq_var_store(&__data, (page), count);		\
-+	if (__data < (MIN))						\
-+		__data = (MIN);						\
-+	else if (__data > (MAX))					\
-+		__data = (MAX);						\
-+	if (__CONV)							\
-+		*(__PTR) = msecs_to_jiffies(__data);			\
-+	else								\
-+		*(__PTR) = __data;					\
-+	return ret;							\
-+}
-+STORE_FUNCTION(bfq_fifo_expire_sync_store, &bfqd->bfq_fifo_expire[1], 1,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_fifo_expire_async_store, &bfqd->bfq_fifo_expire[0], 1,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_back_seek_max_store, &bfqd->bfq_back_max, 0, INT_MAX, 0);
-+STORE_FUNCTION(bfq_back_seek_penalty_store, &bfqd->bfq_back_penalty, 1,
-+		INT_MAX, 0);
-+STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_max_budget_async_rq_store, &bfqd->bfq_max_budget_async_rq,
-+		1, INT_MAX, 0);
-+STORE_FUNCTION(bfq_timeout_async_store, &bfqd->bfq_timeout[BLK_RW_ASYNC], 0,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_coeff_store, &bfqd->bfq_wr_coeff, 1, INT_MAX, 0);
-+STORE_FUNCTION(bfq_wr_max_time_store, &bfqd->bfq_wr_max_time, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_rt_max_time_store, &bfqd->bfq_wr_rt_max_time, 0, INT_MAX,
-+		1);
-+STORE_FUNCTION(bfq_wr_min_idle_time_store, &bfqd->bfq_wr_min_idle_time, 0,
-+		INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_min_inter_arr_async_store,
-+		&bfqd->bfq_wr_min_inter_arr_async, 0, INT_MAX, 1);
-+STORE_FUNCTION(bfq_wr_max_softrt_rate_store, &bfqd->bfq_wr_max_softrt_rate, 0,
-+		INT_MAX, 0);
-+#undef STORE_FUNCTION
-+
-+/* do nothing for the moment */
-+static ssize_t bfq_weights_store(struct elevator_queue *e,
-+				    const char *page, size_t count)
-+{
-+	return count;
-+}
-+
-+static unsigned long bfq_estimated_max_budget(struct bfq_data *bfqd)
-+{
-+	u64 timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
-+
-+	if (bfqd->peak_rate_samples >= BFQ_PEAK_RATE_SAMPLES)
-+		return bfq_calc_max_budget(bfqd->peak_rate, timeout);
-+	else
-+		return bfq_default_max_budget;
-+}
-+
-+static ssize_t bfq_max_budget_store(struct elevator_queue *e,
-+				    const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data == 0)
-+		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+	else {
-+		if (__data > INT_MAX)
-+			__data = INT_MAX;
-+		bfqd->bfq_max_budget = __data;
-+	}
-+
-+	bfqd->bfq_user_max_budget = __data;
-+
-+	return ret;
-+}
-+
-+static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
-+				      const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data < 1)
-+		__data = 1;
-+	else if (__data > INT_MAX)
-+		__data = INT_MAX;
-+
-+	bfqd->bfq_timeout[BLK_RW_SYNC] = msecs_to_jiffies(__data);
-+	if (bfqd->bfq_user_max_budget == 0)
-+		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+
-+	return ret;
-+}
-+
-+static ssize_t bfq_low_latency_store(struct elevator_queue *e,
-+				     const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data > 1)
-+		__data = 1;
-+	if (__data == 0 && bfqd->low_latency != 0)
-+		bfq_end_wr(bfqd);
-+	bfqd->low_latency = __data;
-+
-+	return ret;
-+}
-+
-+#define BFQ_ATTR(name) \
-+	__ATTR(name, S_IRUGO|S_IWUSR, bfq_##name##_show, bfq_##name##_store)
-+
-+static struct elv_fs_entry bfq_attrs[] = {
-+	BFQ_ATTR(fifo_expire_sync),
-+	BFQ_ATTR(fifo_expire_async),
-+	BFQ_ATTR(back_seek_max),
-+	BFQ_ATTR(back_seek_penalty),
-+	BFQ_ATTR(slice_idle),
-+	BFQ_ATTR(max_budget),
-+	BFQ_ATTR(max_budget_async_rq),
-+	BFQ_ATTR(timeout_sync),
-+	BFQ_ATTR(timeout_async),
-+	BFQ_ATTR(low_latency),
-+	BFQ_ATTR(wr_coeff),
-+	BFQ_ATTR(wr_max_time),
-+	BFQ_ATTR(wr_rt_max_time),
-+	BFQ_ATTR(wr_min_idle_time),
-+	BFQ_ATTR(wr_min_inter_arr_async),
-+	BFQ_ATTR(wr_max_softrt_rate),
-+	BFQ_ATTR(weights),
-+	__ATTR_NULL
-+};
-+
-+static struct elevator_type iosched_bfq = {
-+	.ops = {
-+		.elevator_merge_fn =		bfq_merge,
-+		.elevator_merged_fn =		bfq_merged_request,
-+		.elevator_merge_req_fn =	bfq_merged_requests,
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		.elevator_bio_merged_fn =	bfq_bio_merged,
-+#endif
-+		.elevator_allow_merge_fn =	bfq_allow_merge,
-+		.elevator_dispatch_fn =		bfq_dispatch_requests,
-+		.elevator_add_req_fn =		bfq_insert_request,
-+		.elevator_activate_req_fn =	bfq_activate_request,
-+		.elevator_deactivate_req_fn =	bfq_deactivate_request,
-+		.elevator_completed_req_fn =	bfq_completed_request,
-+		.elevator_former_req_fn =	elv_rb_former_request,
-+		.elevator_latter_req_fn =	elv_rb_latter_request,
-+		.elevator_init_icq_fn =		bfq_init_icq,
-+		.elevator_exit_icq_fn =		bfq_exit_icq,
-+		.elevator_set_req_fn =		bfq_set_request,
-+		.elevator_put_req_fn =		bfq_put_request,
-+		.elevator_may_queue_fn =	bfq_may_queue,
-+		.elevator_init_fn =		bfq_init_queue,
-+		.elevator_exit_fn =		bfq_exit_queue,
-+	},
-+	.icq_size =		sizeof(struct bfq_io_cq),
-+	.icq_align =		__alignof__(struct bfq_io_cq),
-+	.elevator_attrs =	bfq_attrs,
-+	.elevator_name =	"bfq",
-+	.elevator_owner =	THIS_MODULE,
-+};
-+
-+static int __init bfq_init(void)
-+{
-+	int ret;
-+
-+	/*
-+	 * Can be 0 on HZ < 1000 setups.
-+	 */
-+	if (bfq_slice_idle == 0)
-+		bfq_slice_idle = 1;
-+
-+	if (bfq_timeout_async == 0)
-+		bfq_timeout_async = 1;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	ret = blkcg_policy_register(&blkcg_policy_bfq);
-+	if (ret)
-+		return ret;
-+#endif
-+
-+	ret = -ENOMEM;
-+	if (bfq_slab_setup())
-+		goto err_pol_unreg;
-+
-+	/*
-+	 * Times to load large popular applications for the typical systems
-+	 * installed on the reference devices (see the comments before the
-+	 * definitions of the two arrays).
-+	 */
-+	T_slow[0] = msecs_to_jiffies(2600);
-+	T_slow[1] = msecs_to_jiffies(1000);
-+	T_fast[0] = msecs_to_jiffies(5500);
-+	T_fast[1] = msecs_to_jiffies(2000);
-+
-+	/*
-+	 * Thresholds that determine the switch between speed classes (see
-+	 * the comments before the definition of the array).
-+	 */
-+	device_speed_thresh[0] = (R_fast[0] + R_slow[0]) / 2;
-+	device_speed_thresh[1] = (R_fast[1] + R_slow[1]) / 2;
-+
-+	ret = elv_register(&iosched_bfq);
-+	if (ret)
-+		goto err_pol_unreg;
-+
-+	pr_info("BFQ I/O-scheduler: v7r11");
-+
-+	return 0;
-+
-+err_pol_unreg:
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	blkcg_policy_unregister(&blkcg_policy_bfq);
-+#endif
-+	return ret;
-+}
-+
-+static void __exit bfq_exit(void)
-+{
-+	elv_unregister(&iosched_bfq);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	blkcg_policy_unregister(&blkcg_policy_bfq);
-+#endif
-+	bfq_slab_kill();
-+}
-+
-+module_init(bfq_init);
-+module_exit(bfq_exit);
-+
-+MODULE_AUTHOR("Arianna Avanzini, Fabio Checconi, Paolo Valente");
-+MODULE_LICENSE("GPL");
-diff --git a/block/bfq-sched.c b/block/bfq-sched.c
-new file mode 100644
-index 0000000..a5ed694
---- /dev/null
-+++ b/block/bfq-sched.c
-@@ -0,0 +1,1199 @@
-+/*
-+ * BFQ: Hierarchical B-WF2Q+ scheduler.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+#define for_each_entity(entity)	\
-+	for (; entity ; entity = entity->parent)
-+
-+#define for_each_entity_safe(entity, parent) \
-+	for (; entity && ({ parent = entity->parent; 1; }); entity = parent)
-+
-+
-+static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
-+						 int extract,
-+						 struct bfq_data *bfqd);
-+
-+static struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
-+
-+static void bfq_update_budget(struct bfq_entity *next_in_service)
-+{
-+	struct bfq_entity *bfqg_entity;
-+	struct bfq_group *bfqg;
-+	struct bfq_sched_data *group_sd;
-+
-+	BUG_ON(!next_in_service);
-+
-+	group_sd = next_in_service->sched_data;
-+
-+	bfqg = container_of(group_sd, struct bfq_group, sched_data);
-+	/*
-+	 * bfq_group's my_entity field is not NULL only if the group
-+	 * is not the root group. We must not touch the root entity
-+	 * as it must never become an in-service entity.
-+	 */
-+	bfqg_entity = bfqg->my_entity;
-+	if (bfqg_entity)
-+		bfqg_entity->budget = next_in_service->budget;
-+}
-+
-+static int bfq_update_next_in_service(struct bfq_sched_data *sd)
-+{
-+	struct bfq_entity *next_in_service;
-+
-+	if (sd->in_service_entity)
-+		/* will update/requeue at the end of service */
-+		return 0;
-+
-+	/*
-+	 * NOTE: this can be improved in many ways, such as returning
-+	 * 1 (and thus propagating upwards the update) only when the
-+	 * budget changes, or caching the bfqq that will be scheduled
-+	 * next from this subtree.  By now we worry more about
-+	 * correctness than about performance...
-+	 */
-+	next_in_service = bfq_lookup_next_entity(sd, 0, NULL);
-+	sd->next_in_service = next_in_service;
-+
-+	if (next_in_service)
-+		bfq_update_budget(next_in_service);
-+
-+	return 1;
-+}
-+
-+static void bfq_check_next_in_service(struct bfq_sched_data *sd,
-+				      struct bfq_entity *entity)
-+{
-+	BUG_ON(sd->next_in_service != entity);
-+}
-+#else
-+#define for_each_entity(entity)	\
-+	for (; entity ; entity = NULL)
-+
-+#define for_each_entity_safe(entity, parent) \
-+	for (parent = NULL; entity ; entity = parent)
-+
-+static int bfq_update_next_in_service(struct bfq_sched_data *sd)
-+{
-+	return 0;
-+}
-+
-+static void bfq_check_next_in_service(struct bfq_sched_data *sd,
-+				      struct bfq_entity *entity)
-+{
-+}
-+
-+static void bfq_update_budget(struct bfq_entity *next_in_service)
-+{
-+}
-+#endif
-+
-+/*
-+ * Shift for timestamp calculations.  This actually limits the maximum
-+ * service allowed in one timestamp delta (small shift values increase it),
-+ * the maximum total weight that can be used for the queues in the system
-+ * (big shift values increase it), and the period of virtual time
-+ * wraparounds.
-+ */
-+#define WFQ_SERVICE_SHIFT	22
-+
-+/**
-+ * bfq_gt - compare two timestamps.
-+ * @a: first ts.
-+ * @b: second ts.
-+ *
-+ * Return @a > @b, dealing with wrapping correctly.
-+ */
-+static int bfq_gt(u64 a, u64 b)
-+{
-+	return (s64)(a - b) > 0;
-+}
-+
-+static struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = NULL;
-+
-+	BUG_ON(!entity);
-+
-+	if (!entity->my_sched_data)
-+		bfqq = container_of(entity, struct bfq_queue, entity);
-+
-+	return bfqq;
-+}
-+
-+
-+/**
-+ * bfq_delta - map service into the virtual time domain.
-+ * @service: amount of service.
-+ * @weight: scale factor (weight of an entity or weight sum).
-+ */
-+static u64 bfq_delta(unsigned long service, unsigned long weight)
-+{
-+	u64 d = (u64)service << WFQ_SERVICE_SHIFT;
-+
-+	do_div(d, weight);
-+	return d;
-+}
-+
-+/**
-+ * bfq_calc_finish - assign the finish time to an entity.
-+ * @entity: the entity to act upon.
-+ * @service: the service to be charged to the entity.
-+ */
-+static void bfq_calc_finish(struct bfq_entity *entity, unsigned long service)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	BUG_ON(entity->weight == 0);
-+
-+	entity->finish = entity->start +
-+		bfq_delta(service, entity->weight);
-+
-+	if (bfqq) {
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			"calc_finish: serv %lu, w %d",
-+			service, entity->weight);
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			"calc_finish: start %llu, finish %llu, delta %llu",
-+			entity->start, entity->finish,
-+			bfq_delta(service, entity->weight));
-+	}
-+}
-+
-+/**
-+ * bfq_entity_of - get an entity from a node.
-+ * @node: the node field of the entity.
-+ *
-+ * Convert a node pointer to the relative entity.  This is used only
-+ * to simplify the logic of some functions and not as the generic
-+ * conversion mechanism because, e.g., in the tree walking functions,
-+ * the check for a %NULL value would be redundant.
-+ */
-+static struct bfq_entity *bfq_entity_of(struct rb_node *node)
-+{
-+	struct bfq_entity *entity = NULL;
-+
-+	if (node)
-+		entity = rb_entry(node, struct bfq_entity, rb_node);
-+
-+	return entity;
-+}
-+
-+/**
-+ * bfq_extract - remove an entity from a tree.
-+ * @root: the tree root.
-+ * @entity: the entity to remove.
-+ */
-+static void bfq_extract(struct rb_root *root, struct bfq_entity *entity)
-+{
-+	BUG_ON(entity->tree != root);
-+
-+	entity->tree = NULL;
-+	rb_erase(&entity->rb_node, root);
-+}
-+
-+/**
-+ * bfq_idle_extract - extract an entity from the idle tree.
-+ * @st: the service tree of the owning @entity.
-+ * @entity: the entity being removed.
-+ */
-+static void bfq_idle_extract(struct bfq_service_tree *st,
-+			     struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *next;
-+
-+	BUG_ON(entity->tree != &st->idle);
-+
-+	if (entity == st->first_idle) {
-+		next = rb_next(&entity->rb_node);
-+		st->first_idle = bfq_entity_of(next);
-+	}
-+
-+	if (entity == st->last_idle) {
-+		next = rb_prev(&entity->rb_node);
-+		st->last_idle = bfq_entity_of(next);
-+	}
-+
-+	bfq_extract(&st->idle, entity);
-+
-+	if (bfqq)
-+		list_del(&bfqq->bfqq_list);
-+}
-+
-+/**
-+ * bfq_insert - generic tree insertion.
-+ * @root: tree root.
-+ * @entity: entity to insert.
-+ *
-+ * This is used for the idle and the active tree, since they are both
-+ * ordered by finish time.
-+ */
-+static void bfq_insert(struct rb_root *root, struct bfq_entity *entity)
-+{
-+	struct bfq_entity *entry;
-+	struct rb_node **node = &root->rb_node;
-+	struct rb_node *parent = NULL;
-+
-+	BUG_ON(entity->tree);
-+
-+	while (*node) {
-+		parent = *node;
-+		entry = rb_entry(parent, struct bfq_entity, rb_node);
-+
-+		if (bfq_gt(entry->finish, entity->finish))
-+			node = &parent->rb_left;
-+		else
-+			node = &parent->rb_right;
-+	}
-+
-+	rb_link_node(&entity->rb_node, parent, node);
-+	rb_insert_color(&entity->rb_node, root);
-+
-+	entity->tree = root;
-+}
-+
-+/**
-+ * bfq_update_min - update the min_start field of a entity.
-+ * @entity: the entity to update.
-+ * @node: one of its children.
-+ *
-+ * This function is called when @entity may store an invalid value for
-+ * min_start due to updates to the active tree.  The function  assumes
-+ * that the subtree rooted at @node (which may be its left or its right
-+ * child) has a valid min_start value.
-+ */
-+static void bfq_update_min(struct bfq_entity *entity, struct rb_node *node)
-+{
-+	struct bfq_entity *child;
-+
-+	if (node) {
-+		child = rb_entry(node, struct bfq_entity, rb_node);
-+		if (bfq_gt(entity->min_start, child->min_start))
-+			entity->min_start = child->min_start;
-+	}
-+}
-+
-+/**
-+ * bfq_update_active_node - recalculate min_start.
-+ * @node: the node to update.
-+ *
-+ * @node may have changed position or one of its children may have moved,
-+ * this function updates its min_start value.  The left and right subtrees
-+ * are assumed to hold a correct min_start value.
-+ */
-+static void bfq_update_active_node(struct rb_node *node)
-+{
-+	struct bfq_entity *entity = rb_entry(node, struct bfq_entity, rb_node);
-+
-+	entity->min_start = entity->start;
-+	bfq_update_min(entity, node->rb_right);
-+	bfq_update_min(entity, node->rb_left);
-+}
-+
-+/**
-+ * bfq_update_active_tree - update min_start for the whole active tree.
-+ * @node: the starting node.
-+ *
-+ * @node must be the deepest modified node after an update.  This function
-+ * updates its min_start using the values held by its children, assuming
-+ * that they did not change, and then updates all the nodes that may have
-+ * changed in the path to the root.  The only nodes that may have changed
-+ * are the ones in the path or their siblings.
-+ */
-+static void bfq_update_active_tree(struct rb_node *node)
-+{
-+	struct rb_node *parent;
-+
-+up:
-+	bfq_update_active_node(node);
-+
-+	parent = rb_parent(node);
-+	if (!parent)
-+		return;
-+
-+	if (node == parent->rb_left && parent->rb_right)
-+		bfq_update_active_node(parent->rb_right);
-+	else if (parent->rb_left)
-+		bfq_update_active_node(parent->rb_left);
-+
-+	node = parent;
-+	goto up;
-+}
-+
-+static void bfq_weights_tree_add(struct bfq_data *bfqd,
-+				 struct bfq_entity *entity,
-+				 struct rb_root *root);
-+
-+static void bfq_weights_tree_remove(struct bfq_data *bfqd,
-+				    struct bfq_entity *entity,
-+				    struct rb_root *root);
-+
-+
-+/**
-+ * bfq_active_insert - insert an entity in the active tree of its
-+ *                     group/device.
-+ * @st: the service tree of the entity.
-+ * @entity: the entity being inserted.
-+ *
-+ * The active tree is ordered by finish time, but an extra key is kept
-+ * per each node, containing the minimum value for the start times of
-+ * its children (and the node itself), so it's possible to search for
-+ * the eligible node with the lowest finish time in logarithmic time.
-+ */
-+static void bfq_active_insert(struct bfq_service_tree *st,
-+			      struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *node = &entity->rb_node;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	struct bfq_sched_data *sd = NULL;
-+	struct bfq_group *bfqg = NULL;
-+	struct bfq_data *bfqd = NULL;
-+#endif
-+
-+	bfq_insert(&st->active, entity);
-+
-+	if (node->rb_left)
-+		node = node->rb_left;
-+	else if (node->rb_right)
-+		node = node->rb_right;
-+
-+	bfq_update_active_tree(node);
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	sd = entity->sched_data;
-+	bfqg = container_of(sd, struct bfq_group, sched_data);
-+	BUG_ON(!bfqg);
-+	bfqd = (struct bfq_data *)bfqg->bfqd;
-+#endif
-+	if (bfqq)
-+		list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	else { /* bfq_group */
-+		BUG_ON(!bfqd);
-+		bfq_weights_tree_add(bfqd, entity, &bfqd->group_weights_tree);
-+	}
-+	if (bfqg != bfqd->root_group) {
-+		BUG_ON(!bfqg);
-+		BUG_ON(!bfqd);
-+		bfqg->active_entities++;
-+		if (bfqg->active_entities == 2)
-+			bfqd->active_numerous_groups++;
-+	}
-+#endif
-+}
-+
-+/**
-+ * bfq_ioprio_to_weight - calc a weight from an ioprio.
-+ * @ioprio: the ioprio value to convert.
-+ */
-+static unsigned short bfq_ioprio_to_weight(int ioprio)
-+{
-+	BUG_ON(ioprio < 0 || ioprio >= IOPRIO_BE_NR);
-+	return IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF - ioprio;
-+}
-+
-+/**
-+ * bfq_weight_to_ioprio - calc an ioprio from a weight.
-+ * @weight: the weight value to convert.
-+ *
-+ * To preserve as much as possible the old only-ioprio user interface,
-+ * 0 is used as an escape ioprio value for weights (numerically) equal or
-+ * larger than IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF.
-+ */
-+static unsigned short bfq_weight_to_ioprio(int weight)
-+{
-+	BUG_ON(weight < BFQ_MIN_WEIGHT || weight > BFQ_MAX_WEIGHT);
-+	return IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF - weight < 0 ?
-+		0 : IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF - weight;
-+}
-+
-+static void bfq_get_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+	if (bfqq) {
-+		atomic_inc(&bfqq->ref);
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+	}
-+}
-+
-+/**
-+ * bfq_find_deepest - find the deepest node that an extraction can modify.
-+ * @node: the node being removed.
-+ *
-+ * Do the first step of an extraction in an rb tree, looking for the
-+ * node that will replace @node, and returning the deepest node that
-+ * the following modifications to the tree can touch.  If @node is the
-+ * last node in the tree return %NULL.
-+ */
-+static struct rb_node *bfq_find_deepest(struct rb_node *node)
-+{
-+	struct rb_node *deepest;
-+
-+	if (!node->rb_right && !node->rb_left)
-+		deepest = rb_parent(node);
-+	else if (!node->rb_right)
-+		deepest = node->rb_left;
-+	else if (!node->rb_left)
-+		deepest = node->rb_right;
-+	else {
-+		deepest = rb_next(node);
-+		if (deepest->rb_right)
-+			deepest = deepest->rb_right;
-+		else if (rb_parent(deepest) != node)
-+			deepest = rb_parent(deepest);
-+	}
-+
-+	return deepest;
-+}
-+
-+/**
-+ * bfq_active_extract - remove an entity from the active tree.
-+ * @st: the service_tree containing the tree.
-+ * @entity: the entity being removed.
-+ */
-+static void bfq_active_extract(struct bfq_service_tree *st,
-+			       struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct rb_node *node;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	struct bfq_sched_data *sd = NULL;
-+	struct bfq_group *bfqg = NULL;
-+	struct bfq_data *bfqd = NULL;
-+#endif
-+
-+	node = bfq_find_deepest(&entity->rb_node);
-+	bfq_extract(&st->active, entity);
-+
-+	if (node)
-+		bfq_update_active_tree(node);
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	sd = entity->sched_data;
-+	bfqg = container_of(sd, struct bfq_group, sched_data);
-+	BUG_ON(!bfqg);
-+	bfqd = (struct bfq_data *)bfqg->bfqd;
-+#endif
-+	if (bfqq)
-+		list_del(&bfqq->bfqq_list);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	else { /* bfq_group */
-+		BUG_ON(!bfqd);
-+		bfq_weights_tree_remove(bfqd, entity,
-+					&bfqd->group_weights_tree);
-+	}
-+	if (bfqg != bfqd->root_group) {
-+		BUG_ON(!bfqg);
-+		BUG_ON(!bfqd);
-+		BUG_ON(!bfqg->active_entities);
-+		bfqg->active_entities--;
-+		if (bfqg->active_entities == 1) {
-+			BUG_ON(!bfqd->active_numerous_groups);
-+			bfqd->active_numerous_groups--;
-+		}
-+	}
-+#endif
-+}
-+
-+/**
-+ * bfq_idle_insert - insert an entity into the idle tree.
-+ * @st: the service tree containing the tree.
-+ * @entity: the entity to insert.
-+ */
-+static void bfq_idle_insert(struct bfq_service_tree *st,
-+			    struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct bfq_entity *first_idle = st->first_idle;
-+	struct bfq_entity *last_idle = st->last_idle;
-+
-+	if (!first_idle || bfq_gt(first_idle->finish, entity->finish))
-+		st->first_idle = entity;
-+	if (!last_idle || bfq_gt(entity->finish, last_idle->finish))
-+		st->last_idle = entity;
-+
-+	bfq_insert(&st->idle, entity);
-+
-+	if (bfqq)
-+		list_add(&bfqq->bfqq_list, &bfqq->bfqd->idle_list);
-+}
-+
-+/**
-+ * bfq_forget_entity - remove an entity from the wfq trees.
-+ * @st: the service tree.
-+ * @entity: the entity being removed.
-+ *
-+ * Update the device status and forget everything about @entity, putting
-+ * the device reference to it, if it is a queue.  Entities belonging to
-+ * groups are not refcounted.
-+ */
-+static void bfq_forget_entity(struct bfq_service_tree *st,
-+			      struct bfq_entity *entity)
-+{
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	struct bfq_sched_data *sd;
-+
-+	BUG_ON(!entity->on_st);
-+
-+	entity->on_st = 0;
-+	st->wsum -= entity->weight;
-+	if (bfqq) {
-+		sd = entity->sched_data;
-+		bfq_log_bfqq(bfqq->bfqd, bfqq, "forget_entity: %p %d",
-+			     bfqq, atomic_read(&bfqq->ref));
-+		bfq_put_queue(bfqq);
-+	}
-+}
-+
-+/**
-+ * bfq_put_idle_entity - release the idle tree ref of an entity.
-+ * @st: service tree for the entity.
-+ * @entity: the entity being released.
-+ */
-+static void bfq_put_idle_entity(struct bfq_service_tree *st,
-+				struct bfq_entity *entity)
-+{
-+	bfq_idle_extract(st, entity);
-+	bfq_forget_entity(st, entity);
-+}
-+
-+/**
-+ * bfq_forget_idle - update the idle tree if necessary.
-+ * @st: the service tree to act upon.
-+ *
-+ * To preserve the global O(log N) complexity we only remove one entry here;
-+ * as the idle tree will not grow indefinitely this can be done safely.
-+ */
-+static void bfq_forget_idle(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *first_idle = st->first_idle;
-+	struct bfq_entity *last_idle = st->last_idle;
-+
-+	if (RB_EMPTY_ROOT(&st->active) && last_idle &&
-+	    !bfq_gt(last_idle->finish, st->vtime)) {
-+		/*
-+		 * Forget the whole idle tree, increasing the vtime past
-+		 * the last finish time of idle entities.
-+		 */
-+		st->vtime = last_idle->finish;
-+	}
-+
-+	if (first_idle && !bfq_gt(first_idle->finish, st->vtime))
-+		bfq_put_idle_entity(st, first_idle);
-+}
-+
-+static struct bfq_service_tree *
-+__bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
-+			 struct bfq_entity *entity)
-+{
-+	struct bfq_service_tree *new_st = old_st;
-+
-+	if (entity->prio_changed) {
-+		struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+		unsigned short prev_weight, new_weight;
-+		struct bfq_data *bfqd = NULL;
-+		struct rb_root *root;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		struct bfq_sched_data *sd;
-+		struct bfq_group *bfqg;
-+#endif
-+
-+		if (bfqq)
-+			bfqd = bfqq->bfqd;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		else {
-+			sd = entity->my_sched_data;
-+			bfqg = container_of(sd, struct bfq_group, sched_data);
-+			BUG_ON(!bfqg);
-+			bfqd = (struct bfq_data *)bfqg->bfqd;
-+			BUG_ON(!bfqd);
-+		}
-+#endif
-+
-+		BUG_ON(old_st->wsum < entity->weight);
-+		old_st->wsum -= entity->weight;
-+
-+		if (entity->new_weight != entity->orig_weight) {
-+			if (entity->new_weight < BFQ_MIN_WEIGHT ||
-+			    entity->new_weight > BFQ_MAX_WEIGHT) {
-+				pr_crit("update_weight_prio: new_weight %d\n",
-+					entity->new_weight);
-+				BUG();
-+			}
-+			entity->orig_weight = entity->new_weight;
-+			if (bfqq)
-+				bfqq->ioprio =
-+				  bfq_weight_to_ioprio(entity->orig_weight);
-+		}
-+
-+		if (bfqq)
-+			bfqq->ioprio_class = bfqq->new_ioprio_class;
-+		entity->prio_changed = 0;
-+
-+		/*
-+		 * NOTE: here we may be changing the weight too early,
-+		 * this will cause unfairness.  The correct approach
-+		 * would have required additional complexity to defer
-+		 * weight changes to the proper time instants (i.e.,
-+		 * when entity->finish <= old_st->vtime).
-+		 */
-+		new_st = bfq_entity_service_tree(entity);
-+
-+		prev_weight = entity->weight;
-+		new_weight = entity->orig_weight *
-+			     (bfqq ? bfqq->wr_coeff : 1);
-+		/*
-+		 * If the weight of the entity changes, remove the entity
-+		 * from its old weight counter (if there is a counter
-+		 * associated with the entity), and add it to the counter
-+		 * associated with its new weight.
-+		 */
-+		if (prev_weight != new_weight) {
-+			root = bfqq ? &bfqd->queue_weights_tree :
-+				      &bfqd->group_weights_tree;
-+			bfq_weights_tree_remove(bfqd, entity, root);
-+		}
-+		entity->weight = new_weight;
-+		/*
-+		 * Add the entity to its weights tree only if it is
-+		 * not associated with a weight-raised queue.
-+		 */
-+		if (prev_weight != new_weight &&
-+		    (bfqq ? bfqq->wr_coeff == 1 : 1))
-+			/* If we get here, root has been initialized. */
-+			bfq_weights_tree_add(bfqd, entity, root);
-+
-+		new_st->wsum += entity->weight;
-+
-+		if (new_st != old_st)
-+			entity->start = new_st->vtime;
-+	}
-+
-+	return new_st;
-+}
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg);
-+#endif
-+
-+/**
-+ * bfq_bfqq_served - update the scheduler status after selection for
-+ *                   service.
-+ * @bfqq: the queue being served.
-+ * @served: bytes to transfer.
-+ *
-+ * NOTE: this can be optimized, as the timestamps of upper level entities
-+ * are synchronized every time a new bfqq is selected for service.  By now,
-+ * we keep it to better check consistency.
-+ */
-+static void bfq_bfqq_served(struct bfq_queue *bfqq, int served)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+	struct bfq_service_tree *st;
-+
-+	for_each_entity(entity) {
-+		st = bfq_entity_service_tree(entity);
-+
-+		entity->service += served;
-+		BUG_ON(entity->service > entity->budget);
-+		BUG_ON(st->wsum == 0);
-+
-+		st->vtime += bfq_delta(served, st->wsum);
-+		bfq_forget_idle(st);
-+	}
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_set_start_empty_time(bfqq_group(bfqq));
-+#endif
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "bfqq_served %d secs", served);
-+}
-+
-+/**
-+ * bfq_bfqq_charge_full_budget - set the service to the entity budget.
-+ * @bfqq: the queue that needs a service update.
-+ *
-+ * When it's not possible to be fair in the service domain, because
-+ * a queue is not consuming its budget fast enough (the meaning of
-+ * fast depends on the timeout parameter), we charge it a full
-+ * budget.  In this way we should obtain a sort of time-domain
-+ * fairness among all the seeky/slow queues.
-+ */
-+static void bfq_bfqq_charge_full_budget(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "charge_full_budget");
-+
-+	bfq_bfqq_served(bfqq, entity->budget - entity->service);
-+}
-+
-+/**
-+ * __bfq_activate_entity - activate an entity.
-+ * @entity: the entity being activated.
-+ *
-+ * Called whenever an entity is activated, i.e., it is not active and one
-+ * of its children receives a new request, or has to be reactivated due to
-+ * budget exhaustion.  It uses the current budget of the entity (and the
-+ * service received if @entity is active) of the queue to calculate its
-+ * timestamps.
-+ */
-+static void __bfq_activate_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sd = entity->sched_data;
-+	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+
-+	if (entity == sd->in_service_entity) {
-+		BUG_ON(entity->tree);
-+		/*
-+		 * If we are requeueing the current entity we have
-+		 * to take care of not charging to it service it has
-+		 * not received.
-+		 */
-+		bfq_calc_finish(entity, entity->service);
-+		entity->start = entity->finish;
-+		sd->in_service_entity = NULL;
-+	} else if (entity->tree == &st->active) {
-+		/*
-+		 * Requeueing an entity due to a change of some
-+		 * next_in_service entity below it.  We reuse the
-+		 * old start time.
-+		 */
-+		bfq_active_extract(st, entity);
-+	} else if (entity->tree == &st->idle) {
-+		/*
-+		 * Must be on the idle tree, bfq_idle_extract() will
-+		 * check for that.
-+		 */
-+		bfq_idle_extract(st, entity);
-+		entity->start = bfq_gt(st->vtime, entity->finish) ?
-+				       st->vtime : entity->finish;
-+	} else {
-+		/*
-+		 * The finish time of the entity may be invalid, and
-+		 * it is in the past for sure, otherwise the queue
-+		 * would have been on the idle tree.
-+		 */
-+		entity->start = st->vtime;
-+		st->wsum += entity->weight;
-+		bfq_get_entity(entity);
-+
-+		BUG_ON(entity->on_st);
-+		entity->on_st = 1;
-+	}
-+
-+	st = __bfq_entity_update_weight_prio(st, entity);
-+	bfq_calc_finish(entity, entity->budget);
-+	bfq_active_insert(st, entity);
-+}
-+
-+/**
-+ * bfq_activate_entity - activate an entity and its ancestors if necessary.
-+ * @entity: the entity to activate.
-+ *
-+ * Activate @entity and all the entities on the path from it to the root.
-+ */
-+static void bfq_activate_entity(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sd;
-+
-+	for_each_entity(entity) {
-+		__bfq_activate_entity(entity);
-+
-+		sd = entity->sched_data;
-+		if (!bfq_update_next_in_service(sd))
-+			/*
-+			 * No need to propagate the activation to the
-+			 * upper entities, as they will be updated when
-+			 * the in-service entity is rescheduled.
-+			 */
-+			break;
-+	}
-+}
-+
-+/**
-+ * __bfq_deactivate_entity - deactivate an entity from its service tree.
-+ * @entity: the entity to deactivate.
-+ * @requeue: if false, the entity will not be put into the idle tree.
-+ *
-+ * Deactivate an entity, independently from its previous state.  If the
-+ * entity was not on a service tree just return, otherwise if it is on
-+ * any scheduler tree, extract it from that tree, and if necessary
-+ * and if the caller did not specify @requeue, put it on the idle tree.
-+ *
-+ * Return %1 if the caller should update the entity hierarchy, i.e.,
-+ * if the entity was in service or if it was the next_in_service for
-+ * its sched_data; return %0 otherwise.
-+ */
-+static int __bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
-+{
-+	struct bfq_sched_data *sd = entity->sched_data;
-+	struct bfq_service_tree *st;
-+	int was_in_service;
-+	int ret = 0;
-+
-+	if (sd == NULL || !entity->on_st) /* never activated, or inactive */
-+		return 0;
-+
-+	st = bfq_entity_service_tree(entity);
-+	was_in_service = entity == sd->in_service_entity;
-+
-+	BUG_ON(was_in_service && entity->tree);
-+
-+	if (was_in_service) {
-+		bfq_calc_finish(entity, entity->service);
-+		sd->in_service_entity = NULL;
-+	} else if (entity->tree == &st->active)
-+		bfq_active_extract(st, entity);
-+	else if (entity->tree == &st->idle)
-+		bfq_idle_extract(st, entity);
-+	else if (entity->tree)
-+		BUG();
-+
-+	if (was_in_service || sd->next_in_service == entity)
-+		ret = bfq_update_next_in_service(sd);
-+
-+	if (!requeue || !bfq_gt(entity->finish, st->vtime))
-+		bfq_forget_entity(st, entity);
-+	else
-+		bfq_idle_insert(st, entity);
-+
-+	BUG_ON(sd->in_service_entity == entity);
-+	BUG_ON(sd->next_in_service == entity);
-+
-+	return ret;
-+}
-+
-+/**
-+ * bfq_deactivate_entity - deactivate an entity.
-+ * @entity: the entity to deactivate.
-+ * @requeue: true if the entity can be put on the idle tree
-+ */
-+static void bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
-+{
-+	struct bfq_sched_data *sd;
-+	struct bfq_entity *parent;
-+
-+	for_each_entity_safe(entity, parent) {
-+		sd = entity->sched_data;
-+
-+		if (!__bfq_deactivate_entity(entity, requeue))
-+			/*
-+			 * The parent entity is still backlogged, and
-+			 * we don't need to update it as it is still
-+			 * in service.
-+			 */
-+			break;
-+
-+		if (sd->next_in_service)
-+			/*
-+			 * The parent entity is still backlogged and
-+			 * the budgets on the path towards the root
-+			 * need to be updated.
-+			 */
-+			goto update;
-+
-+		/*
-+		 * If we reach there the parent is no more backlogged and
-+		 * we want to propagate the dequeue upwards.
-+		 */
-+		requeue = 1;
-+	}
-+
-+	return;
-+
-+update:
-+	entity = parent;
-+	for_each_entity(entity) {
-+		__bfq_activate_entity(entity);
-+
-+		sd = entity->sched_data;
-+		if (!bfq_update_next_in_service(sd))
-+			break;
-+	}
-+}
-+
-+/**
-+ * bfq_update_vtime - update vtime if necessary.
-+ * @st: the service tree to act upon.
-+ *
-+ * If necessary update the service tree vtime to have at least one
-+ * eligible entity, skipping to its start time.  Assumes that the
-+ * active tree of the device is not empty.
-+ *
-+ * NOTE: this hierarchical implementation updates vtimes quite often,
-+ * we may end up with reactivated processes getting timestamps after a
-+ * vtime skip done because we needed a ->first_active entity on some
-+ * intermediate node.
-+ */
-+static void bfq_update_vtime(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entry;
-+	struct rb_node *node = st->active.rb_node;
-+
-+	entry = rb_entry(node, struct bfq_entity, rb_node);
-+	if (bfq_gt(entry->min_start, st->vtime)) {
-+		st->vtime = entry->min_start;
-+		bfq_forget_idle(st);
-+	}
-+}
-+
-+/**
-+ * bfq_first_active_entity - find the eligible entity with
-+ *                           the smallest finish time
-+ * @st: the service tree to select from.
-+ *
-+ * This function searches the first schedulable entity, starting from the
-+ * root of the tree and going on the left every time on this side there is
-+ * a subtree with at least one eligible (start >= vtime) entity. The path on
-+ * the right is followed only if a) the left subtree contains no eligible
-+ * entities and b) no eligible entity has been found yet.
-+ */
-+static struct bfq_entity *bfq_first_active_entity(struct bfq_service_tree *st)
-+{
-+	struct bfq_entity *entry, *first = NULL;
-+	struct rb_node *node = st->active.rb_node;
-+
-+	while (node) {
-+		entry = rb_entry(node, struct bfq_entity, rb_node);
-+left:
-+		if (!bfq_gt(entry->start, st->vtime))
-+			first = entry;
-+
-+		BUG_ON(bfq_gt(entry->min_start, st->vtime));
-+
-+		if (node->rb_left) {
-+			entry = rb_entry(node->rb_left,
-+					 struct bfq_entity, rb_node);
-+			if (!bfq_gt(entry->min_start, st->vtime)) {
-+				node = node->rb_left;
-+				goto left;
-+			}
-+		}
-+		if (first)
-+			break;
-+		node = node->rb_right;
-+	}
-+
-+	BUG_ON(!first && !RB_EMPTY_ROOT(&st->active));
-+	return first;
-+}
-+
-+/**
-+ * __bfq_lookup_next_entity - return the first eligible entity in @st.
-+ * @st: the service tree.
-+ *
-+ * Update the virtual time in @st and return the first eligible entity
-+ * it contains.
-+ */
-+static struct bfq_entity *__bfq_lookup_next_entity(struct bfq_service_tree *st,
-+						   bool force)
-+{
-+	struct bfq_entity *entity, *new_next_in_service = NULL;
-+
-+	if (RB_EMPTY_ROOT(&st->active))
-+		return NULL;
-+
-+	bfq_update_vtime(st);
-+	entity = bfq_first_active_entity(st);
-+	BUG_ON(bfq_gt(entity->start, st->vtime));
-+
-+	/*
-+	 * If the chosen entity does not match with the sched_data's
-+	 * next_in_service and we are forcedly serving the IDLE priority
-+	 * class tree, bubble up budget update.
-+	 */
-+	if (unlikely(force && entity != entity->sched_data->next_in_service)) {
-+		new_next_in_service = entity;
-+		for_each_entity(new_next_in_service)
-+			bfq_update_budget(new_next_in_service);
-+	}
-+
-+	return entity;
-+}
-+
-+/**
-+ * bfq_lookup_next_entity - return the first eligible entity in @sd.
-+ * @sd: the sched_data.
-+ * @extract: if true the returned entity will be also extracted from @sd.
-+ *
-+ * NOTE: since we cache the next_in_service entity at each level of the
-+ * hierarchy, the complexity of the lookup can be decreased with
-+ * absolutely no effort just returning the cached next_in_service value;
-+ * we prefer to do full lookups to test the consistency of * the data
-+ * structures.
-+ */
-+static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
-+						 int extract,
-+						 struct bfq_data *bfqd)
-+{
-+	struct bfq_service_tree *st = sd->service_tree;
-+	struct bfq_entity *entity;
-+	int i = 0;
-+
-+	BUG_ON(sd->in_service_entity);
-+
-+	if (bfqd &&
-+	    jiffies - bfqd->bfq_class_idle_last_service > BFQ_CL_IDLE_TIMEOUT) {
-+		entity = __bfq_lookup_next_entity(st + BFQ_IOPRIO_CLASSES - 1,
-+						  true);
-+		if (entity) {
-+			i = BFQ_IOPRIO_CLASSES - 1;
-+			bfqd->bfq_class_idle_last_service = jiffies;
-+			sd->next_in_service = entity;
-+		}
-+	}
-+	for (; i < BFQ_IOPRIO_CLASSES; i++) {
-+		entity = __bfq_lookup_next_entity(st + i, false);
-+		if (entity) {
-+			if (extract) {
-+				bfq_check_next_in_service(sd, entity);
-+				bfq_active_extract(st + i, entity);
-+				sd->in_service_entity = entity;
-+				sd->next_in_service = NULL;
-+			}
-+			break;
-+		}
-+	}
-+
-+	return entity;
-+}
-+
-+/*
-+ * Get next queue for service.
-+ */
-+static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd)
-+{
-+	struct bfq_entity *entity = NULL;
-+	struct bfq_sched_data *sd;
-+	struct bfq_queue *bfqq;
-+
-+	BUG_ON(bfqd->in_service_queue);
-+
-+	if (bfqd->busy_queues == 0)
-+		return NULL;
-+
-+	sd = &bfqd->root_group->sched_data;
-+	for (; sd ; sd = entity->my_sched_data) {
-+		entity = bfq_lookup_next_entity(sd, 1, bfqd);
-+		BUG_ON(!entity);
-+		entity->service = 0;
-+	}
-+
-+	bfqq = bfq_entity_to_bfqq(entity);
-+	BUG_ON(!bfqq);
-+
-+	return bfqq;
-+}
-+
-+static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)
-+{
-+	if (bfqd->in_service_bic) {
-+		put_io_context(bfqd->in_service_bic->icq.ioc);
-+		bfqd->in_service_bic = NULL;
-+	}
-+
-+	bfqd->in_service_queue = NULL;
-+	del_timer(&bfqd->idle_slice_timer);
-+}
-+
-+static void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				int requeue)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	if (bfqq == bfqd->in_service_queue)
-+		__bfq_bfqd_reset_in_service(bfqd);
-+
-+	bfq_deactivate_entity(entity, requeue);
-+}
-+
-+static void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	bfq_activate_entity(entity);
-+}
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static void bfqg_stats_update_dequeue(struct bfq_group *bfqg);
-+#endif
-+
-+/*
-+ * Called when the bfqq no longer has requests pending, remove it from
-+ * the service tree.
-+ */
-+static void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+			      int requeue)
-+{
-+	BUG_ON(!bfq_bfqq_busy(bfqq));
-+	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+	bfq_log_bfqq(bfqd, bfqq, "del from busy");
-+
-+	bfq_clear_bfqq_busy(bfqq);
-+
-+	BUG_ON(bfqd->busy_queues == 0);
-+	bfqd->busy_queues--;
-+
-+	if (!bfqq->dispatched) {
-+		bfq_weights_tree_remove(bfqd, &bfqq->entity,
-+					&bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			BUG_ON(!bfqd->busy_in_flight_queues);
-+			bfqd->busy_in_flight_queues--;
-+			if (bfq_bfqq_constantly_seeky(bfqq)) {
-+				BUG_ON(!bfqd->
-+					const_seeky_busy_in_flight_queues);
-+				bfqd->const_seeky_busy_in_flight_queues--;
-+			}
-+		}
-+	}
-+	if (bfqq->wr_coeff > 1)
-+		bfqd->wr_busy_queues--;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	bfqg_stats_update_dequeue(bfqq_group(bfqq));
-+#endif
-+
-+	bfq_deactivate_bfqq(bfqd, bfqq, requeue);
-+}
-+
-+/*
-+ * Called when an inactive queue receives a new request.
-+ */
-+static void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	BUG_ON(bfq_bfqq_busy(bfqq));
-+	BUG_ON(bfqq == bfqd->in_service_queue);
-+
-+	bfq_log_bfqq(bfqd, bfqq, "add to busy");
-+
-+	bfq_activate_bfqq(bfqd, bfqq);
-+
-+	bfq_mark_bfqq_busy(bfqq);
-+	bfqd->busy_queues++;
-+
-+	if (!bfqq->dispatched) {
-+		if (bfqq->wr_coeff == 1)
-+			bfq_weights_tree_add(bfqd, &bfqq->entity,
-+					     &bfqd->queue_weights_tree);
-+		if (!blk_queue_nonrot(bfqd->queue)) {
-+			bfqd->busy_in_flight_queues++;
-+			if (bfq_bfqq_constantly_seeky(bfqq))
-+				bfqd->const_seeky_busy_in_flight_queues++;
-+		}
-+	}
-+	if (bfqq->wr_coeff > 1)
-+		bfqd->wr_busy_queues++;
-+}
-diff --git a/block/bfq.h b/block/bfq.h
-new file mode 100644
-index 0000000..2bf54ae
---- /dev/null
-+++ b/block/bfq.h
-@@ -0,0 +1,801 @@
-+/*
-+ * BFQ-v7r11 for 4.5.0: data structures and common functions prototypes.
-+ *
-+ * Based on ideas and code from CFQ:
-+ * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-+ *
-+ * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-+ *		      Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ */
-+
-+#ifndef _BFQ_H
-+#define _BFQ_H
-+
-+#include <linux/blktrace_api.h>
-+#include <linux/hrtimer.h>
-+#include <linux/ioprio.h>
-+#include <linux/rbtree.h>
-+#include <linux/blk-cgroup.h>
-+
-+#define BFQ_IOPRIO_CLASSES	3
-+#define BFQ_CL_IDLE_TIMEOUT	(HZ/5)
-+
-+#define BFQ_MIN_WEIGHT			1
-+#define BFQ_MAX_WEIGHT			1000
-+#define BFQ_WEIGHT_CONVERSION_COEFF	10
-+
-+#define BFQ_DEFAULT_QUEUE_IOPRIO	4
-+
-+#define BFQ_DEFAULT_GRP_WEIGHT	10
-+#define BFQ_DEFAULT_GRP_IOPRIO	0
-+#define BFQ_DEFAULT_GRP_CLASS	IOPRIO_CLASS_BE
-+
-+struct bfq_entity;
-+
-+/**
-+ * struct bfq_service_tree - per ioprio_class service tree.
-+ * @active: tree for active entities (i.e., those backlogged).
-+ * @idle: tree for idle entities (i.e., those not backlogged, with V <= F_i).
-+ * @first_idle: idle entity with minimum F_i.
-+ * @last_idle: idle entity with maximum F_i.
-+ * @vtime: scheduler virtual time.
-+ * @wsum: scheduler weight sum; active and idle entities contribute to it.
-+ *
-+ * Each service tree represents a B-WF2Q+ scheduler on its own.  Each
-+ * ioprio_class has its own independent scheduler, and so its own
-+ * bfq_service_tree.  All the fields are protected by the queue lock
-+ * of the containing bfqd.
-+ */
-+struct bfq_service_tree {
-+	struct rb_root active;
-+	struct rb_root idle;
-+
-+	struct bfq_entity *first_idle;
-+	struct bfq_entity *last_idle;
-+
-+	u64 vtime;
-+	unsigned long wsum;
-+};
-+
-+/**
-+ * struct bfq_sched_data - multi-class scheduler.
-+ * @in_service_entity: entity in service.
-+ * @next_in_service: head-of-the-line entity in the scheduler.
-+ * @service_tree: array of service trees, one per ioprio_class.
-+ *
-+ * bfq_sched_data is the basic scheduler queue.  It supports three
-+ * ioprio_classes, and can be used either as a toplevel queue or as
-+ * an intermediate queue on a hierarchical setup.
-+ * @next_in_service points to the active entity of the sched_data
-+ * service trees that will be scheduled next.
-+ *
-+ * The supported ioprio_classes are the same as in CFQ, in descending
-+ * priority order, IOPRIO_CLASS_RT, IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE.
-+ * Requests from higher priority queues are served before all the
-+ * requests from lower priority queues; among requests of the same
-+ * queue requests are served according to B-WF2Q+.
-+ * All the fields are protected by the queue lock of the containing bfqd.
-+ */
-+struct bfq_sched_data {
-+	struct bfq_entity *in_service_entity;
-+	struct bfq_entity *next_in_service;
-+	struct bfq_service_tree service_tree[BFQ_IOPRIO_CLASSES];
-+};
-+
-+/**
-+ * struct bfq_weight_counter - counter of the number of all active entities
-+ *                             with a given weight.
-+ * @weight: weight of the entities that this counter refers to.
-+ * @num_active: number of active entities with this weight.
-+ * @weights_node: weights tree member (see bfq_data's @queue_weights_tree
-+ *                and @group_weights_tree).
-+ */
-+struct bfq_weight_counter {
-+	short int weight;
-+	unsigned int num_active;
-+	struct rb_node weights_node;
-+};
-+
-+/**
-+ * struct bfq_entity - schedulable entity.
-+ * @rb_node: service_tree member.
-+ * @weight_counter: pointer to the weight counter associated with this entity.
-+ * @on_st: flag, true if the entity is on a tree (either the active or
-+ *         the idle one of its service_tree).
-+ * @finish: B-WF2Q+ finish timestamp (aka F_i).
-+ * @start: B-WF2Q+ start timestamp (aka S_i).
-+ * @tree: tree the entity is enqueued into; %NULL if not on a tree.
-+ * @min_start: minimum start time of the (active) subtree rooted at
-+ *             this entity; used for O(log N) lookups into active trees.
-+ * @service: service received during the last round of service.
-+ * @budget: budget used to calculate F_i; F_i = S_i + @budget / @weight.
-+ * @weight: weight of the queue
-+ * @parent: parent entity, for hierarchical scheduling.
-+ * @my_sched_data: for non-leaf nodes in the cgroup hierarchy, the
-+ *                 associated scheduler queue, %NULL on leaf nodes.
-+ * @sched_data: the scheduler queue this entity belongs to.
-+ * @ioprio: the ioprio in use.
-+ * @new_weight: when a weight change is requested, the new weight value.
-+ * @orig_weight: original weight, used to implement weight boosting
-+ * @prio_changed: flag, true when the user requested a weight, ioprio or
-+ *		  ioprio_class change.
-+ *
-+ * A bfq_entity is used to represent either a bfq_queue (leaf node in the
-+ * cgroup hierarchy) or a bfq_group into the upper level scheduler.  Each
-+ * entity belongs to the sched_data of the parent group in the cgroup
-+ * hierarchy.  Non-leaf entities have also their own sched_data, stored
-+ * in @my_sched_data.
-+ *
-+ * Each entity stores independently its priority values; this would
-+ * allow different weights on different devices, but this
-+ * functionality is not exported to userspace by now.  Priorities and
-+ * weights are updated lazily, first storing the new values into the
-+ * new_* fields, then setting the @prio_changed flag.  As soon as
-+ * there is a transition in the entity state that allows the priority
-+ * update to take place the effective and the requested priority
-+ * values are synchronized.
-+ *
-+ * Unless cgroups are used, the weight value is calculated from the
-+ * ioprio to export the same interface as CFQ.  When dealing with
-+ * ``well-behaved'' queues (i.e., queues that do not spend too much
-+ * time to consume their budget and have true sequential behavior, and
-+ * when there are no external factors breaking anticipation) the
-+ * relative weights at each level of the cgroups hierarchy should be
-+ * guaranteed.  All the fields are protected by the queue lock of the
-+ * containing bfqd.
-+ */
-+struct bfq_entity {
-+	struct rb_node rb_node;
-+	struct bfq_weight_counter *weight_counter;
-+
-+	int on_st;
-+
-+	u64 finish;
-+	u64 start;
-+
-+	struct rb_root *tree;
-+
-+	u64 min_start;
-+
-+	int service, budget;
-+	unsigned short weight, new_weight;
-+	unsigned short orig_weight;
-+
-+	struct bfq_entity *parent;
-+
-+	struct bfq_sched_data *my_sched_data;
-+	struct bfq_sched_data *sched_data;
-+
-+	int prio_changed;
-+};
-+
-+struct bfq_group;
-+
-+/**
-+ * struct bfq_queue - leaf schedulable entity.
-+ * @ref: reference counter.
-+ * @bfqd: parent bfq_data.
-+ * @new_ioprio: when an ioprio change is requested, the new ioprio value.
-+ * @ioprio_class: the ioprio_class in use.
-+ * @new_ioprio_class: when an ioprio_class change is requested, the new
-+ *                    ioprio_class value.
-+ * @new_bfqq: shared bfq_queue if queue is cooperating with
-+ *           one or more other queues.
-+ * @sort_list: sorted list of pending requests.
-+ * @next_rq: if fifo isn't expired, next request to serve.
-+ * @queued: nr of requests queued in @sort_list.
-+ * @allocated: currently allocated requests.
-+ * @meta_pending: pending metadata requests.
-+ * @fifo: fifo list of requests in sort_list.
-+ * @entity: entity representing this queue in the scheduler.
-+ * @max_budget: maximum budget allowed from the feedback mechanism.
-+ * @budget_timeout: budget expiration (in jiffies).
-+ * @dispatched: number of requests on the dispatch list or inside driver.
-+ * @flags: status flags.
-+ * @bfqq_list: node for active/idle bfqq list inside our bfqd.
-+ * @burst_list_node: node for the device's burst list.
-+ * @seek_samples: number of seeks sampled
-+ * @seek_total: sum of the distances of the seeks sampled
-+ * @seek_mean: mean seek distance
-+ * @last_request_pos: position of the last request enqueued
-+ * @requests_within_timer: number of consecutive pairs of request completion
-+ *                         and arrival, such that the queue becomes idle
-+ *                         after the completion, but the next request arrives
-+ *                         within an idle time slice; used only if the queue's
-+ *                         IO_bound has been cleared.
-+ * @pid: pid of the process owning the queue, used for logging purposes.
-+ * @last_wr_start_finish: start time of the current weight-raising period if
-+ *                        the @bfq-queue is being weight-raised, otherwise
-+ *                        finish time of the last weight-raising period
-+ * @wr_cur_max_time: current max raising time for this queue
-+ * @soft_rt_next_start: minimum time instant such that, only if a new
-+ *                      request is enqueued after this time instant in an
-+ *                      idle @bfq_queue with no outstanding requests, then
-+ *                      the task associated with the queue it is deemed as
-+ *                      soft real-time (see the comments to the function
-+ *                      bfq_bfqq_softrt_next_start())
-+ * @last_idle_bklogged: time of the last transition of the @bfq_queue from
-+ *                      idle to backlogged
-+ * @service_from_backlogged: cumulative service received from the @bfq_queue
-+ *                           since the last transition from idle to
-+ *                           backlogged
-+ * @bic: pointer to the bfq_io_cq owning the bfq_queue, set to %NULL if the
-+ *	 queue is shared
-+ *
-+ * A bfq_queue is a leaf request queue; it can be associated with an
-+ * io_context or more, if it  is  async or shared  between  cooperating
-+ * processes. @cgroup holds a reference to the cgroup, to be sure that it
-+ * does not disappear while a bfqq still references it (mostly to avoid
-+ * races between request issuing and task migration followed by cgroup
-+ * destruction).
-+ * All the fields are protected by the queue lock of the containing bfqd.
-+ */
-+struct bfq_queue {
-+	atomic_t ref;
-+	struct bfq_data *bfqd;
-+
-+	unsigned short ioprio, new_ioprio;
-+	unsigned short ioprio_class, new_ioprio_class;
-+
-+	/* fields for cooperating queues handling */
-+	struct bfq_queue *new_bfqq;
-+	struct rb_node pos_node;
-+	struct rb_root *pos_root;
-+
-+	struct rb_root sort_list;
-+	struct request *next_rq;
-+	int queued[2];
-+	int allocated[2];
-+	int meta_pending;
-+	struct list_head fifo;
-+
-+	struct bfq_entity entity;
-+
-+	int max_budget;
-+	unsigned long budget_timeout;
-+
-+	int dispatched;
-+
-+	unsigned int flags;
-+
-+	struct list_head bfqq_list;
-+
-+	struct hlist_node burst_list_node;
-+
-+	unsigned int seek_samples;
-+	u64 seek_total;
-+	sector_t seek_mean;
-+	sector_t last_request_pos;
-+
-+	unsigned int requests_within_timer;
-+
-+	pid_t pid;
-+	struct bfq_io_cq *bic;
-+
-+	/* weight-raising fields */
-+	unsigned long wr_cur_max_time;
-+	unsigned long soft_rt_next_start;
-+	unsigned long last_wr_start_finish;
-+	unsigned int wr_coeff;
-+	unsigned long last_idle_bklogged;
-+	unsigned long service_from_backlogged;
-+};
-+
-+/**
-+ * struct bfq_ttime - per process thinktime stats.
-+ * @ttime_total: total process thinktime
-+ * @ttime_samples: number of thinktime samples
-+ * @ttime_mean: average process thinktime
-+ */
-+struct bfq_ttime {
-+	unsigned long last_end_request;
-+
-+	unsigned long ttime_total;
-+	unsigned long ttime_samples;
-+	unsigned long ttime_mean;
-+};
-+
-+/**
-+ * struct bfq_io_cq - per (request_queue, io_context) structure.
-+ * @icq: associated io_cq structure
-+ * @bfqq: array of two process queues, the sync and the async
-+ * @ttime: associated @bfq_ttime struct
-+ * @ioprio: per (request_queue, blkcg) ioprio.
-+ * @blkcg_id: id of the blkcg the related io_cq belongs to.
-+ */
-+struct bfq_io_cq {
-+	struct io_cq icq; /* must be the first member */
-+	struct bfq_queue *bfqq[2];
-+	struct bfq_ttime ttime;
-+	int ioprio;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	uint64_t blkcg_id; /* the current blkcg ID */
-+#endif
-+};
-+
-+enum bfq_device_speed {
-+	BFQ_BFQD_FAST,
-+	BFQ_BFQD_SLOW,
-+};
-+
-+/**
-+ * struct bfq_data - per device data structure.
-+ * @queue: request queue for the managed device.
-+ * @root_group: root bfq_group for the device.
-+ * @active_numerous_groups: number of bfq_groups containing more than one
-+ *                          active @bfq_entity.
-+ * @queue_weights_tree: rbtree of weight counters of @bfq_queues, sorted by
-+ *                      weight. Used to keep track of whether all @bfq_queues
-+ *                     have the same weight. The tree contains one counter
-+ *                     for each distinct weight associated to some active
-+ *                     and not weight-raised @bfq_queue (see the comments to
-+ *                      the functions bfq_weights_tree_[add|remove] for
-+ *                     further details).
-+ * @group_weights_tree: rbtree of non-queue @bfq_entity weight counters, sorted
-+ *                      by weight. Used to keep track of whether all
-+ *                     @bfq_groups have the same weight. The tree contains
-+ *                     one counter for each distinct weight associated to
-+ *                     some active @bfq_group (see the comments to the
-+ *                     functions bfq_weights_tree_[add|remove] for further
-+ *                     details).
-+ * @busy_queues: number of bfq_queues containing requests (including the
-+ *		 queue in service, even if it is idling).
-+ * @busy_in_flight_queues: number of @bfq_queues containing pending or
-+ *                         in-flight requests, plus the @bfq_queue in
-+ *                         service, even if idle but waiting for the
-+ *                         possible arrival of its next sync request. This
-+ *                         field is updated only if the device is rotational,
-+ *                         but used only if the device is also NCQ-capable.
-+ *                         The reason why the field is updated also for non-
-+ *                         NCQ-capable rotational devices is related to the
-+ *                         fact that the value of @hw_tag may be set also
-+ *                         later than when busy_in_flight_queues may need to
-+ *                         be incremented for the first time(s). Taking also
-+ *                         this possibility into account, to avoid unbalanced
-+ *                         increments/decrements, would imply more overhead
-+ *                         than just updating busy_in_flight_queues
-+ *                         regardless of the value of @hw_tag.
-+ * @const_seeky_busy_in_flight_queues: number of constantly-seeky @bfq_queues
-+ *                                     (that is, seeky queues that expired
-+ *                                     for budget timeout at least once)
-+ *                                     containing pending or in-flight
-+ *                                     requests, including the in-service
-+ *                                     @bfq_queue if constantly seeky. This
-+ *                                     field is updated only if the device
-+ *                                     is rotational, but used only if the
-+ *                                     device is also NCQ-capable (see the
-+ *                                     comments to @busy_in_flight_queues).
-+ * @wr_busy_queues: number of weight-raised busy @bfq_queues.
-+ * @queued: number of queued requests.
-+ * @rq_in_driver: number of requests dispatched and waiting for completion.
-+ * @sync_flight: number of sync requests in the driver.
-+ * @max_rq_in_driver: max number of reqs in driver in the last
-+ *                    @hw_tag_samples completed requests.
-+ * @hw_tag_samples: nr of samples used to calculate hw_tag.
-+ * @hw_tag: flag set to one if the driver is showing a queueing behavior.
-+ * @budgets_assigned: number of budgets assigned.
-+ * @idle_slice_timer: timer set when idling for the next sequential request
-+ *                    from the queue in service.
-+ * @unplug_work: delayed work to restart dispatching on the request queue.
-+ * @in_service_queue: bfq_queue in service.
-+ * @in_service_bic: bfq_io_cq (bic) associated with the @in_service_queue.
-+ * @last_position: on-disk position of the last served request.
-+ * @last_budget_start: beginning of the last budget.
-+ * @last_idling_start: beginning of the last idle slice.
-+ * @peak_rate: peak transfer rate observed for a budget.
-+ * @peak_rate_samples: number of samples used to calculate @peak_rate.
-+ * @bfq_max_budget: maximum budget allotted to a bfq_queue before
-+ *                  rescheduling.
-+ * @active_list: list of all the bfq_queues active on the device.
-+ * @idle_list: list of all the bfq_queues idle on the device.
-+ * @bfq_fifo_expire: timeout for async/sync requests; when it expires
-+ *                   requests are served in fifo order.
-+ * @bfq_back_penalty: weight of backward seeks wrt forward ones.
-+ * @bfq_back_max: maximum allowed backward seek.
-+ * @bfq_slice_idle: maximum idling time.
-+ * @bfq_user_max_budget: user-configured max budget value
-+ *                       (0 for auto-tuning).
-+ * @bfq_max_budget_async_rq: maximum budget (in nr of requests) allotted to
-+ *                           async queues.
-+ * @bfq_timeout: timeout for bfq_queues to consume their budget; used to
-+ *               to prevent seeky queues to impose long latencies to well
-+ *               behaved ones (this also implies that seeky queues cannot
-+ *               receive guarantees in the service domain; after a timeout
-+ *               they are charged for the whole allocated budget, to try
-+ *               to preserve a behavior reasonably fair among them, but
-+ *               without service-domain guarantees).
-+ * @bfq_coop_thresh: number of queue merges after which a @bfq_queue is
-+ *                   no more granted any weight-raising.
-+ * @bfq_failed_cooperations: number of consecutive failed cooperation
-+ *                           chances after which weight-raising is restored
-+ *                           to a queue subject to more than bfq_coop_thresh
-+ *                           queue merges.
-+ * @bfq_requests_within_timer: number of consecutive requests that must be
-+ *                             issued within the idle time slice to set
-+ *                             again idling to a queue which was marked as
-+ *                             non-I/O-bound (see the definition of the
-+ *                             IO_bound flag for further details).
-+ * @last_ins_in_burst: last time at which a queue entered the current
-+ *                     burst of queues being activated shortly after
-+ *                     each other; for more details about this and the
-+ *                     following parameters related to a burst of
-+ *                     activations, see the comments to the function
-+ *                     @bfq_handle_burst.
-+ * @bfq_burst_interval: reference time interval used to decide whether a
-+ *                      queue has been activated shortly after
-+ *                      @last_ins_in_burst.
-+ * @burst_size: number of queues in the current burst of queue activations.
-+ * @bfq_large_burst_thresh: maximum burst size above which the current
-+ *			    queue-activation burst is deemed as 'large'.
-+ * @large_burst: true if a large queue-activation burst is in progress.
-+ * @burst_list: head of the burst list (as for the above fields, more details
-+ *		in the comments to the function bfq_handle_burst).
-+ * @low_latency: if set to true, low-latency heuristics are enabled.
-+ * @bfq_wr_coeff: maximum factor by which the weight of a weight-raised
-+ *                queue is multiplied.
-+ * @bfq_wr_max_time: maximum duration of a weight-raising period (jiffies).
-+ * @bfq_wr_rt_max_time: maximum duration for soft real-time processes.
-+ * @bfq_wr_min_idle_time: minimum idle period after which weight-raising
-+ *			  may be reactivated for a queue (in jiffies).
-+ * @bfq_wr_min_inter_arr_async: minimum period between request arrivals
-+ *				after which weight-raising may be
-+ *				reactivated for an already busy queue
-+ *				(in jiffies).
-+ * @bfq_wr_max_softrt_rate: max service-rate for a soft real-time queue,
-+ *			    sectors per seconds.
-+ * @RT_prod: cached value of the product R*T used for computing the maximum
-+ *	     duration of the weight raising automatically.
-+ * @device_speed: device-speed class for the low-latency heuristic.
-+ * @oom_bfqq: fallback dummy bfqq for extreme OOM conditions.
-+ *
-+ * All the fields are protected by the @queue lock.
-+ */
-+struct bfq_data {
-+	struct request_queue *queue;
-+
-+	struct bfq_group *root_group;
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	int active_numerous_groups;
-+#endif
-+
-+	struct rb_root queue_weights_tree;
-+	struct rb_root group_weights_tree;
-+
-+	int busy_queues;
-+	int busy_in_flight_queues;
-+	int const_seeky_busy_in_flight_queues;
-+	int wr_busy_queues;
-+	int queued;
-+	int rq_in_driver;
-+	int sync_flight;
-+
-+	int max_rq_in_driver;
-+	int hw_tag_samples;
-+	int hw_tag;
-+
-+	int budgets_assigned;
-+
-+	struct timer_list idle_slice_timer;
-+	struct work_struct unplug_work;
-+
-+	struct bfq_queue *in_service_queue;
-+	struct bfq_io_cq *in_service_bic;
-+
-+	sector_t last_position;
-+
-+	ktime_t last_budget_start;
-+	ktime_t last_idling_start;
-+	int peak_rate_samples;
-+	u64 peak_rate;
-+	int bfq_max_budget;
-+
-+	struct list_head active_list;
-+	struct list_head idle_list;
-+
-+	unsigned int bfq_fifo_expire[2];
-+	unsigned int bfq_back_penalty;
-+	unsigned int bfq_back_max;
-+	unsigned int bfq_slice_idle;
-+	u64 bfq_class_idle_last_service;
-+
-+	int bfq_user_max_budget;
-+	int bfq_max_budget_async_rq;
-+	unsigned int bfq_timeout[2];
-+
-+	unsigned int bfq_coop_thresh;
-+	unsigned int bfq_failed_cooperations;
-+	unsigned int bfq_requests_within_timer;
-+
-+	unsigned long last_ins_in_burst;
-+	unsigned long bfq_burst_interval;
-+	int burst_size;
-+	unsigned long bfq_large_burst_thresh;
-+	bool large_burst;
-+	struct hlist_head burst_list;
-+
-+	bool low_latency;
-+
-+	/* parameters of the low_latency heuristics */
-+	unsigned int bfq_wr_coeff;
-+	unsigned int bfq_wr_max_time;
-+	unsigned int bfq_wr_rt_max_time;
-+	unsigned int bfq_wr_min_idle_time;
-+	unsigned long bfq_wr_min_inter_arr_async;
-+	unsigned int bfq_wr_max_softrt_rate;
-+	u64 RT_prod;
-+	enum bfq_device_speed device_speed;
-+
-+	struct bfq_queue oom_bfqq;
-+};
-+
-+enum bfqq_state_flags {
-+	BFQ_BFQQ_FLAG_busy = 0,		/* has requests or is in service */
-+	BFQ_BFQQ_FLAG_wait_request,	/* waiting for a request */
-+	BFQ_BFQQ_FLAG_must_alloc,	/* must be allowed rq alloc */
-+	BFQ_BFQQ_FLAG_fifo_expire,	/* FIFO checked in this slice */
-+	BFQ_BFQQ_FLAG_idle_window,	/* slice idling enabled */
-+	BFQ_BFQQ_FLAG_sync,		/* synchronous queue */
-+	BFQ_BFQQ_FLAG_budget_new,	/* no completion with this budget */
-+	BFQ_BFQQ_FLAG_IO_bound,		/*
-+					 * bfqq has timed-out at least once
-+					 * having consumed at most 2/10 of
-+					 * its budget
-+					 */
-+	BFQ_BFQQ_FLAG_in_large_burst,	/*
-+					 * bfqq activated in a large burst,
-+					 * see comments to bfq_handle_burst.
-+					 */
-+	BFQ_BFQQ_FLAG_constantly_seeky,	/*
-+					 * bfqq has proved to be slow and
-+					 * seeky until budget timeout
-+					 */
-+	BFQ_BFQQ_FLAG_softrt_update,	/*
-+					 * may need softrt-next-start
-+					 * update
-+					 */
-+};
-+
-+#define BFQ_BFQQ_FNS(name)						\
-+static void bfq_mark_bfqq_##name(struct bfq_queue *bfqq)		\
-+{									\
-+	(bfqq)->flags |= (1 << BFQ_BFQQ_FLAG_##name);			\
-+}									\
-+static void bfq_clear_bfqq_##name(struct bfq_queue *bfqq)		\
-+{									\
-+	(bfqq)->flags &= ~(1 << BFQ_BFQQ_FLAG_##name);			\
-+}									\
-+static int bfq_bfqq_##name(const struct bfq_queue *bfqq)		\
-+{									\
-+	return ((bfqq)->flags & (1 << BFQ_BFQQ_FLAG_##name)) != 0;	\
-+}
-+
-+BFQ_BFQQ_FNS(busy);
-+BFQ_BFQQ_FNS(wait_request);
-+BFQ_BFQQ_FNS(must_alloc);
-+BFQ_BFQQ_FNS(fifo_expire);
-+BFQ_BFQQ_FNS(idle_window);
-+BFQ_BFQQ_FNS(sync);
-+BFQ_BFQQ_FNS(budget_new);
-+BFQ_BFQQ_FNS(IO_bound);
-+BFQ_BFQQ_FNS(in_large_burst);
-+BFQ_BFQQ_FNS(constantly_seeky);
-+BFQ_BFQQ_FNS(softrt_update);
-+#undef BFQ_BFQQ_FNS
-+
-+/* Logging facilities. */
-+#define bfq_log_bfqq(bfqd, bfqq, fmt, args...) \
-+	blk_add_trace_msg((bfqd)->queue, "bfq%d " fmt, (bfqq)->pid, ##args)
-+
-+#define bfq_log(bfqd, fmt, args...) \
-+	blk_add_trace_msg((bfqd)->queue, "bfq " fmt, ##args)
-+
-+/* Expiration reasons. */
-+enum bfqq_expiration {
-+	BFQ_BFQQ_TOO_IDLE = 0,		/*
-+					 * queue has been idling for
-+					 * too long
-+					 */
-+	BFQ_BFQQ_BUDGET_TIMEOUT,	/* budget took too long to be used */
-+	BFQ_BFQQ_BUDGET_EXHAUSTED,	/* budget consumed */
-+	BFQ_BFQQ_NO_MORE_REQUESTS,	/* the queue has no more requests */
-+};
-+
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+
-+struct bfqg_stats {
-+	/* total bytes transferred */
-+	struct blkg_rwstat		service_bytes;
-+	/* total IOs serviced, post merge */
-+	struct blkg_rwstat		serviced;
-+	/* number of ios merged */
-+	struct blkg_rwstat		merged;
-+	/* total time spent on device in ns, may not be accurate w/ queueing */
-+	struct blkg_rwstat		service_time;
-+	/* total time spent waiting in scheduler queue in ns */
-+	struct blkg_rwstat		wait_time;
-+	/* number of IOs queued up */
-+	struct blkg_rwstat		queued;
-+	/* total sectors transferred */
-+	struct blkg_stat		sectors;
-+	/* total disk time and nr sectors dispatched by this group */
-+	struct blkg_stat		time;
-+	/* time not charged to this cgroup */
-+	struct blkg_stat		unaccounted_time;
-+	/* sum of number of ios queued across all samples */
-+	struct blkg_stat		avg_queue_size_sum;
-+	/* count of samples taken for average */
-+	struct blkg_stat		avg_queue_size_samples;
-+	/* how many times this group has been removed from service tree */
-+	struct blkg_stat		dequeue;
-+	/* total time spent waiting for it to be assigned a timeslice. */
-+	struct blkg_stat		group_wait_time;
-+	/* time spent idling for this blkcg_gq */
-+	struct blkg_stat		idle_time;
-+	/* total time with empty current active q with other requests queued */
-+	struct blkg_stat		empty_time;
-+	/* fields after this shouldn't be cleared on stat reset */
-+	uint64_t			start_group_wait_time;
-+	uint64_t			start_idle_time;
-+	uint64_t			start_empty_time;
-+	uint16_t			flags;
-+};
-+
-+/*
-+ * struct bfq_group_data - per-blkcg storage for the blkio subsystem.
-+ *
-+ * @ps: @blkcg_policy_storage that this structure inherits
-+ * @weight: weight of the bfq_group
-+ */
-+struct bfq_group_data {
-+	/* must be the first member */
-+	struct blkcg_policy_data pd;
-+
-+	unsigned short weight;
-+};
-+
-+/**
-+ * struct bfq_group - per (device, cgroup) data structure.
-+ * @entity: schedulable entity to insert into the parent group sched_data.
-+ * @sched_data: own sched_data, to contain child entities (they may be
-+ *              both bfq_queues and bfq_groups).
-+ * @bfqd: the bfq_data for the device this group acts upon.
-+ * @async_bfqq: array of async queues for all the tasks belonging to
-+ *              the group, one queue per ioprio value per ioprio_class,
-+ *              except for the idle class that has only one queue.
-+ * @async_idle_bfqq: async queue for the idle class (ioprio is ignored).
-+ * @my_entity: pointer to @entity, %NULL for the toplevel group; used
-+ *             to avoid too many special cases during group creation/
-+ *             migration.
-+ * @active_entities: number of active entities belonging to the group;
-+ *                   unused for the root group. Used to know whether there
-+ *                   are groups with more than one active @bfq_entity
-+ *                   (see the comments to the function
-+ *                   bfq_bfqq_must_not_expire()).
-+ *
-+ * Each (device, cgroup) pair has its own bfq_group, i.e., for each cgroup
-+ * there is a set of bfq_groups, each one collecting the lower-level
-+ * entities belonging to the group that are acting on the same device.
-+ *
-+ * Locking works as follows:
-+ *    o @bfqd is protected by the queue lock, RCU is used to access it
-+ *      from the readers.
-+ *    o All the other fields are protected by the @bfqd queue lock.
-+ */
-+struct bfq_group {
-+	/* must be the first member */
-+	struct blkg_policy_data pd;
-+
-+	struct bfq_entity entity;
-+	struct bfq_sched_data sched_data;
-+
-+	void *bfqd;
-+
-+	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
-+	struct bfq_queue *async_idle_bfqq;
-+
-+	struct bfq_entity *my_entity;
-+
-+	int active_entities;
-+
-+	struct bfqg_stats stats;
-+	struct bfqg_stats dead_stats;	/* stats pushed from dead children */
-+};
-+
-+#else
-+struct bfq_group {
-+	struct bfq_sched_data sched_data;
-+
-+	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
-+	struct bfq_queue *async_idle_bfqq;
-+};
-+#endif
-+
-+static struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity);
-+
-+static struct bfq_service_tree *
-+bfq_entity_service_tree(struct bfq_entity *entity)
-+{
-+	struct bfq_sched_data *sched_data = entity->sched_data;
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	unsigned int idx = bfqq ? bfqq->ioprio_class - 1 :
-+				  BFQ_DEFAULT_GRP_CLASS;
-+
-+	BUG_ON(idx >= BFQ_IOPRIO_CLASSES);
-+	BUG_ON(sched_data == NULL);
-+
-+	return sched_data->service_tree + idx;
-+}
-+
-+static struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, bool is_sync)
-+{
-+	return bic->bfqq[is_sync];
-+}
-+
-+static void bic_set_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq,
-+			 bool is_sync)
-+{
-+	bic->bfqq[is_sync] = bfqq;
-+}
-+
-+static struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic)
-+{
-+	return bic->icq.q->elevator->elevator_data;
-+}
-+
-+/**
-+ * bfq_get_bfqd_locked - get a lock to a bfqd using a RCU protected pointer.
-+ * @ptr: a pointer to a bfqd.
-+ * @flags: storage for the flags to be saved.
-+ *
-+ * This function allows bfqg->bfqd to be protected by the
-+ * queue lock of the bfqd they reference; the pointer is dereferenced
-+ * under RCU, so the storage for bfqd is assured to be safe as long
-+ * as the RCU read side critical section does not end.  After the
-+ * bfqd->queue->queue_lock is taken the pointer is rechecked, to be
-+ * sure that no other writer accessed it.  If we raced with a writer,
-+ * the function returns NULL, with the queue unlocked, otherwise it
-+ * returns the dereferenced pointer, with the queue locked.
-+ */
-+static struct bfq_data *bfq_get_bfqd_locked(void **ptr, unsigned long *flags)
-+{
-+	struct bfq_data *bfqd;
-+
-+	rcu_read_lock();
-+	bfqd = rcu_dereference(*(struct bfq_data **)ptr);
-+
-+	if (bfqd != NULL) {
-+		spin_lock_irqsave(bfqd->queue->queue_lock, *flags);
-+		if (ptr == NULL)
-+			printk(KERN_CRIT "get_bfqd_locked pointer NULL\n");
-+		else if (*ptr == bfqd)
-+			goto out;
-+		spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
-+	}
-+
-+	bfqd = NULL;
-+out:
-+	rcu_read_unlock();
-+	return bfqd;
-+}
-+
-+static void bfq_put_bfqd_unlock(struct bfq_data *bfqd, unsigned long *flags)
-+{
-+	spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
-+}
-+
-+static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio);
-+static void bfq_put_queue(struct bfq_queue *bfqq);
-+static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
-+static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
-+				       struct bio *bio, int is_sync,
-+				       struct bfq_io_cq *bic, gfp_t gfp_mask);
-+static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
-+				    struct bfq_group *bfqg);
-+static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg);
-+static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
-+
-+#endif /* _BFQ_H */
--- 
-2.7.4 (Apple Git-66)
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch
deleted file mode 100644
index 82cdd7ac2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch
+++ /dev/null
@@ -1,1102 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From 409e62551360d2802992b0175062237352793a2a Mon Sep 17 00:00:00 2001
-From: Mauro Andreolini <mauro.andreolini@unimore.it>
-Date: Sun, 6 Sep 2015 16:09:05 +0200
-Subject: [PATCH 3/4] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r11, to
- port to 4.8.0
-
-A set of processes may happen  to  perform interleaved reads, i.e.,requests
-whose union would give rise to a  sequential read  pattern.  There are two
-typical  cases: in the first  case,   processes  read  fixed-size chunks of
-data at a fixed distance from each other, while in the second case processes
-may read variable-size chunks at  variable distances. The latter case occurs
-for  example with  QEMU, which  splits the  I/O generated  by the  guest into
-multiple chunks,  and lets these chunks  be served by a  pool of cooperating
-processes,  iteratively  assigning  the  next  chunk of  I/O  to  the first
-available  process. CFQ  uses actual  queue merging  for the  first type of
-rocesses, whereas it  uses preemption to get a sequential  read pattern out
-of the read requests  performed by the second type of  processes. In the end
-it uses  two different  mechanisms to  achieve the  same goal: boosting the
-throughput with interleaved I/O.
-
-This patch introduces  Early Queue Merge (EQM), a unified mechanism to get a
-sequential  read pattern  with both  types of  processes. The  main idea is
-checking newly arrived requests against the next request of the active queue
-both in case of actual request insert and in case of request merge. By doing
-so, both the types of processes can be handled by just merging their queues.
-EQM is  then simpler and  more compact than the  pair of mechanisms used in
-CFQ.
-
-Finally, EQM  also preserves the  typical low-latency properties of BFQ, by
-properly restoring the weight-raising state of a queue when it gets back to
-a non-merged state.
-
-Signed-off-by: Mauro Andreolini <mauro.andreolini@unimore.it>
-Signed-off-by: Arianna Avanzini <avanzini@google.com>
-Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- block/bfq-cgroup.c  |   5 +
- block/bfq-iosched.c | 685 +++++++++++++++++++++++++++++++++++++++++++++++++++-
- block/bfq.h         |  66 +++++
- 3 files changed, 743 insertions(+), 13 deletions(-)
-
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-index 8b08a57..0367996 100644
---- a/block/bfq-cgroup.c
-+++ b/block/bfq-cgroup.c
-@@ -440,6 +440,7 @@ static void bfq_pd_init(struct blkg_policy_data *pd)
- 				   */
- 	bfqg->bfqd = bfqd;
- 	bfqg->active_entities = 0;
-+	bfqg->rq_pos_tree = RB_ROOT;
- }
- 
- static void bfq_pd_free(struct blkg_policy_data *pd)
-@@ -533,6 +534,9 @@ static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
- 	return bfqg;
- }
- 
-+static void bfq_pos_tree_add_move(struct bfq_data *bfqd,
-+				  struct bfq_queue *bfqq);
-+
- /**
-  * bfq_bfqq_move - migrate @bfqq to @bfqg.
-  * @bfqd: queue descriptor.
-@@ -580,6 +584,7 @@ static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	bfqg_get(bfqg);
- 
- 	if (busy) {
-+		bfq_pos_tree_add_move(bfqd, bfqq);
- 		if (resume)
- 			bfq_activate_bfqq(bfqd, bfqq);
- 	}
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index 85e2169..cf3e9b1 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -295,6 +295,72 @@ static struct request *bfq_choose_req(struct bfq_data *bfqd,
- 	}
- }
- 
-+static struct bfq_queue *
-+bfq_rq_pos_tree_lookup(struct bfq_data *bfqd, struct rb_root *root,
-+		     sector_t sector, struct rb_node **ret_parent,
-+		     struct rb_node ***rb_link)
-+{
-+	struct rb_node **p, *parent;
-+	struct bfq_queue *bfqq = NULL;
-+
-+	parent = NULL;
-+	p = &root->rb_node;
-+	while (*p) {
-+		struct rb_node **n;
-+
-+		parent = *p;
-+		bfqq = rb_entry(parent, struct bfq_queue, pos_node);
-+
-+		/*
-+		 * Sort strictly based on sector. Smallest to the left,
-+		 * largest to the right.
-+		 */
-+		if (sector > blk_rq_pos(bfqq->next_rq))
-+			n = &(*p)->rb_right;
-+		else if (sector < blk_rq_pos(bfqq->next_rq))
-+			n = &(*p)->rb_left;
-+		else
-+			break;
-+		p = n;
-+		bfqq = NULL;
-+	}
-+
-+	*ret_parent = parent;
-+	if (rb_link)
-+		*rb_link = p;
-+
-+	bfq_log(bfqd, "rq_pos_tree_lookup %llu: returning %d",
-+		(unsigned long long) sector,
-+		bfqq ? bfqq->pid : 0);
-+
-+	return bfqq;
-+}
-+
-+static void bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-+{
-+	struct rb_node **p, *parent;
-+	struct bfq_queue *__bfqq;
-+
-+	if (bfqq->pos_root) {
-+		rb_erase(&bfqq->pos_node, bfqq->pos_root);
-+		bfqq->pos_root = NULL;
-+	}
-+
-+	if (bfq_class_idle(bfqq))
-+		return;
-+	if (!bfqq->next_rq)
-+		return;
-+
-+	bfqq->pos_root = &bfq_bfqq_to_bfqg(bfqq)->rq_pos_tree;
-+	__bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root,
-+			blk_rq_pos(bfqq->next_rq), &parent, &p);
-+	if (!__bfqq) {
-+		rb_link_node(&bfqq->pos_node, parent, p);
-+		rb_insert_color(&bfqq->pos_node, bfqq->pos_root);
-+	} else
-+		bfqq->pos_root = NULL;
-+}
-+
- /*
-  * Tell whether there are active queues or groups with differentiated weights.
-  */
-@@ -527,6 +593,57 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
- 	return dur;
- }
- 
-+static unsigned int bfq_bfqq_cooperations(struct bfq_queue *bfqq)
-+{
-+	return bfqq->bic ? bfqq->bic->cooperations : 0;
-+}
-+
-+static void
-+bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
-+{
-+	if (bic->saved_idle_window)
-+		bfq_mark_bfqq_idle_window(bfqq);
-+	else
-+		bfq_clear_bfqq_idle_window(bfqq);
-+	if (bic->saved_IO_bound)
-+		bfq_mark_bfqq_IO_bound(bfqq);
-+	else
-+		bfq_clear_bfqq_IO_bound(bfqq);
-+	/* Assuming that the flag in_large_burst is already correctly set */
-+	if (bic->wr_time_left && bfqq->bfqd->low_latency &&
-+	    !bfq_bfqq_in_large_burst(bfqq) &&
-+	    bic->cooperations < bfqq->bfqd->bfq_coop_thresh) {
-+		/*
-+		 * Start a weight raising period with the duration given by
-+		 * the raising_time_left snapshot.
-+		 */
-+		if (bfq_bfqq_busy(bfqq))
-+			bfqq->bfqd->wr_busy_queues++;
-+		bfqq->wr_coeff = bfqq->bfqd->bfq_wr_coeff;
-+		bfqq->wr_cur_max_time = bic->wr_time_left;
-+		bfqq->last_wr_start_finish = jiffies;
-+		bfqq->entity.prio_changed = 1;
-+	}
-+	/*
-+	 * Clear wr_time_left to prevent bfq_bfqq_save_state() from
-+	 * getting confused about the queue's need of a weight-raising
-+	 * period.
-+	 */
-+	bic->wr_time_left = 0;
-+}
-+
-+static int bfqq_process_refs(struct bfq_queue *bfqq)
-+{
-+	int process_refs, io_refs;
-+
-+	lockdep_assert_held(bfqq->bfqd->queue->queue_lock);
-+
-+	io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE];
-+	process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st;
-+	BUG_ON(process_refs < 0);
-+	return process_refs;
-+}
-+
- /* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */
- static void bfq_reset_burst_list(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
-@@ -763,8 +880,14 @@ static void bfq_add_request(struct request *rq)
- 	BUG_ON(!next_rq);
- 	bfqq->next_rq = next_rq;
- 
-+	/*
-+	 * Adjust priority tree position, if next_rq changes.
-+	 */
-+	if (prev != bfqq->next_rq)
-+		bfq_pos_tree_add_move(bfqd, bfqq);
-+
- 	if (!bfq_bfqq_busy(bfqq)) {
--		bool soft_rt, in_burst,
-+		bool soft_rt, coop_or_in_burst,
- 		     idle_for_long_time = time_is_before_jiffies(
- 						bfqq->budget_timeout +
- 						bfqd->bfq_wr_min_idle_time);
-@@ -792,11 +915,12 @@ static void bfq_add_request(struct request *rq)
- 				bfqd->last_ins_in_burst = jiffies;
- 		}
- 
--		in_burst = bfq_bfqq_in_large_burst(bfqq);
-+		coop_or_in_burst = bfq_bfqq_in_large_burst(bfqq) ||
-+			bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh;
- 		soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
--			!in_burst &&
-+			!coop_or_in_burst &&
- 			time_is_before_jiffies(bfqq->soft_rt_next_start);
--		interactive = !in_burst && idle_for_long_time;
-+		interactive = !coop_or_in_burst && idle_for_long_time;
- 		entity->budget = max_t(unsigned long, bfqq->max_budget,
- 				       bfq_serv_to_charge(next_rq, bfqq));
- 
-@@ -815,6 +939,9 @@ static void bfq_add_request(struct request *rq)
- 		if (!bfqd->low_latency)
- 			goto add_bfqq_busy;
- 
-+		if (bfq_bfqq_just_split(bfqq))
-+			goto set_prio_changed;
-+
- 		/*
- 		 * If the queue:
- 		 * - is not being boosted,
-@@ -839,7 +966,7 @@ static void bfq_add_request(struct request *rq)
- 		} else if (old_wr_coeff > 1) {
- 			if (interactive)
- 				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
--			else if (in_burst ||
-+			else if (coop_or_in_burst ||
- 				 (bfqq->wr_cur_max_time ==
- 				  bfqd->bfq_wr_rt_max_time &&
- 				  !soft_rt)) {
-@@ -904,6 +1031,7 @@ static void bfq_add_request(struct request *rq)
- 					bfqd->bfq_wr_rt_max_time;
- 			}
- 		}
-+set_prio_changed:
- 		if (old_wr_coeff != bfqq->wr_coeff)
- 			entity->prio_changed = 1;
- add_bfqq_busy:
-@@ -1046,6 +1174,15 @@ static void bfq_merged_request(struct request_queue *q, struct request *req,
- 					 bfqd->last_position);
- 		BUG_ON(!next_rq);
- 		bfqq->next_rq = next_rq;
-+		/*
-+		 * If next_rq changes, update both the queue's budget to
-+		 * fit the new request and the queue's position in its
-+		 * rq_pos_tree.
-+		 */
-+		if (prev != bfqq->next_rq) {
-+			bfq_updated_next_req(bfqd, bfqq);
-+			bfq_pos_tree_add_move(bfqd, bfqq);
-+		}
- 	}
- }
- 
-@@ -1128,11 +1265,346 @@ static void bfq_end_wr(struct bfq_data *bfqd)
- 	spin_unlock_irq(bfqd->queue->queue_lock);
- }
- 
-+static sector_t bfq_io_struct_pos(void *io_struct, bool request)
-+{
-+	if (request)
-+		return blk_rq_pos(io_struct);
-+	else
-+		return ((struct bio *)io_struct)->bi_iter.bi_sector;
-+}
-+
-+static int bfq_rq_close_to_sector(void *io_struct, bool request,
-+				  sector_t sector)
-+{
-+	return abs(bfq_io_struct_pos(io_struct, request) - sector) <=
-+	       BFQQ_SEEK_THR;
-+}
-+
-+static struct bfq_queue *bfqq_find_close(struct bfq_data *bfqd,
-+					 struct bfq_queue *bfqq,
-+					 sector_t sector)
-+{
-+	struct rb_root *root = &bfq_bfqq_to_bfqg(bfqq)->rq_pos_tree;
-+	struct rb_node *parent, *node;
-+	struct bfq_queue *__bfqq;
-+
-+	if (RB_EMPTY_ROOT(root))
-+		return NULL;
-+
-+	/*
-+	 * First, if we find a request starting at the end of the last
-+	 * request, choose it.
-+	 */
-+	__bfqq = bfq_rq_pos_tree_lookup(bfqd, root, sector, &parent, NULL);
-+	if (__bfqq)
-+		return __bfqq;
-+
-+	/*
-+	 * If the exact sector wasn't found, the parent of the NULL leaf
-+	 * will contain the closest sector (rq_pos_tree sorted by
-+	 * next_request position).
-+	 */
-+	__bfqq = rb_entry(parent, struct bfq_queue, pos_node);
-+	if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector))
-+		return __bfqq;
-+
-+	if (blk_rq_pos(__bfqq->next_rq) < sector)
-+		node = rb_next(&__bfqq->pos_node);
-+	else
-+		node = rb_prev(&__bfqq->pos_node);
-+	if (!node)
-+		return NULL;
-+
-+	__bfqq = rb_entry(node, struct bfq_queue, pos_node);
-+	if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector))
-+		return __bfqq;
-+
-+	return NULL;
-+}
-+
-+static struct bfq_queue *bfq_find_close_cooperator(struct bfq_data *bfqd,
-+						   struct bfq_queue *cur_bfqq,
-+						   sector_t sector)
-+{
-+	struct bfq_queue *bfqq;
-+
-+	/*
-+	 * We shall notice if some of the queues are cooperating,
-+	 * e.g., working closely on the same area of the device. In
-+	 * that case, we can group them together and: 1) don't waste
-+	 * time idling, and 2) serve the union of their requests in
-+	 * the best possible order for throughput.
-+	 */
-+	bfqq = bfqq_find_close(bfqd, cur_bfqq, sector);
-+	if (!bfqq || bfqq == cur_bfqq)
-+		return NULL;
-+
-+	return bfqq;
-+}
-+
-+static struct bfq_queue *
-+bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
-+{
-+	int process_refs, new_process_refs;
-+	struct bfq_queue *__bfqq;
-+
-+	/*
-+	 * If there are no process references on the new_bfqq, then it is
-+	 * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain
-+	 * may have dropped their last reference (not just their last process
-+	 * reference).
-+	 */
-+	if (!bfqq_process_refs(new_bfqq))
-+		return NULL;
-+
-+	/* Avoid a circular list and skip interim queue merges. */
-+	while ((__bfqq = new_bfqq->new_bfqq)) {
-+		if (__bfqq == bfqq)
-+			return NULL;
-+		new_bfqq = __bfqq;
-+	}
-+
-+	process_refs = bfqq_process_refs(bfqq);
-+	new_process_refs = bfqq_process_refs(new_bfqq);
-+	/*
-+	 * If the process for the bfqq has gone away, there is no
-+	 * sense in merging the queues.
-+	 */
-+	if (process_refs == 0 || new_process_refs == 0)
-+		return NULL;
-+
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d",
-+		new_bfqq->pid);
-+
-+	/*
-+	 * Merging is just a redirection: the requests of the process
-+	 * owning one of the two queues are redirected to the other queue.
-+	 * The latter queue, in its turn, is set as shared if this is the
-+	 * first time that the requests of some process are redirected to
-+	 * it.
-+	 *
-+	 * We redirect bfqq to new_bfqq and not the opposite, because we
-+	 * are in the context of the process owning bfqq, hence we have
-+	 * the io_cq of this process. So we can immediately configure this
-+	 * io_cq to redirect the requests of the process to new_bfqq.
-+	 *
-+	 * NOTE, even if new_bfqq coincides with the in-service queue, the
-+	 * io_cq of new_bfqq is not available, because, if the in-service
-+	 * queue is shared, bfqd->in_service_bic may not point to the
-+	 * io_cq of the in-service queue.
-+	 * Redirecting the requests of the process owning bfqq to the
-+	 * currently in-service queue is in any case the best option, as
-+	 * we feed the in-service queue with new requests close to the
-+	 * last request served and, by doing so, hopefully increase the
-+	 * throughput.
-+	 */
-+	bfqq->new_bfqq = new_bfqq;
-+	atomic_add(process_refs, &new_bfqq->ref);
-+	return new_bfqq;
-+}
-+
-+static bool bfq_may_be_close_cooperator(struct bfq_queue *bfqq,
-+					struct bfq_queue *new_bfqq)
-+{
-+	if (bfq_class_idle(bfqq) || bfq_class_idle(new_bfqq) ||
-+	    (bfqq->ioprio_class != new_bfqq->ioprio_class))
-+		return false;
-+
-+	/*
-+	 * If either of the queues has already been detected as seeky,
-+	 * then merging it with the other queue is unlikely to lead to
-+	 * sequential I/O.
-+	 */
-+	if (BFQQ_SEEKY(bfqq) || BFQQ_SEEKY(new_bfqq))
-+		return false;
-+
-+	/*
-+	 * Interleaved I/O is known to be done by (some) applications
-+	 * only for reads, so it does not make sense to merge async
-+	 * queues.
-+	 */
-+	if (!bfq_bfqq_sync(bfqq) || !bfq_bfqq_sync(new_bfqq))
-+		return false;
-+
-+	return true;
-+}
-+
-+/*
-+ * Attempt to schedule a merge of bfqq with the currently in-service queue
-+ * or with a close queue among the scheduled queues.
-+ * Return NULL if no merge was scheduled, a pointer to the shared bfq_queue
-+ * structure otherwise.
-+ *
-+ * The OOM queue is not allowed to participate to cooperation: in fact, since
-+ * the requests temporarily redirected to the OOM queue could be redirected
-+ * again to dedicated queues at any time, the state needed to correctly
-+ * handle merging with the OOM queue would be quite complex and expensive
-+ * to maintain. Besides, in such a critical condition as an out of memory,
-+ * the benefits of queue merging may be little relevant, or even negligible.
-+ */
-+static struct bfq_queue *
-+bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+		     void *io_struct, bool request)
-+{
-+	struct bfq_queue *in_service_bfqq, *new_bfqq;
-+
-+	if (bfqq->new_bfqq)
-+		return bfqq->new_bfqq;
-+	if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq))
-+		return NULL;
-+	/* If device has only one backlogged bfq_queue, don't search. */
-+	if (bfqd->busy_queues == 1)
-+		return NULL;
-+
-+	in_service_bfqq = bfqd->in_service_queue;
-+
-+	if (!in_service_bfqq || in_service_bfqq == bfqq ||
-+	    !bfqd->in_service_bic ||
-+	    unlikely(in_service_bfqq == &bfqd->oom_bfqq))
-+		goto check_scheduled;
-+
-+	if (bfq_rq_close_to_sector(io_struct, request, bfqd->last_position) &&
-+	    bfqq->entity.parent == in_service_bfqq->entity.parent &&
-+	    bfq_may_be_close_cooperator(bfqq, in_service_bfqq)) {
-+		new_bfqq = bfq_setup_merge(bfqq, in_service_bfqq);
-+		if (new_bfqq)
-+			return new_bfqq;
-+	}
-+	/*
-+	 * Check whether there is a cooperator among currently scheduled
-+	 * queues. The only thing we need is that the bio/request is not
-+	 * NULL, as we need it to establish whether a cooperator exists.
-+	 */
-+check_scheduled:
-+	new_bfqq = bfq_find_close_cooperator(bfqd, bfqq,
-+			bfq_io_struct_pos(io_struct, request));
-+
-+	BUG_ON(new_bfqq && bfqq->entity.parent != new_bfqq->entity.parent);
-+
-+	if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq) &&
-+	    bfq_may_be_close_cooperator(bfqq, new_bfqq))
-+		return bfq_setup_merge(bfqq, new_bfqq);
-+
-+	return NULL;
-+}
-+
-+static void bfq_bfqq_save_state(struct bfq_queue *bfqq)
-+{
-+	/*
-+	 * If !bfqq->bic, the queue is already shared or its requests
-+	 * have already been redirected to a shared queue; both idle window
-+	 * and weight raising state have already been saved. Do nothing.
-+	 */
-+	if (!bfqq->bic)
-+		return;
-+	if (bfqq->bic->wr_time_left)
-+		/*
-+		 * This is the queue of a just-started process, and would
-+		 * deserve weight raising: we set wr_time_left to the full
-+		 * weight-raising duration to trigger weight-raising when
-+		 * and if the queue is split and the first request of the
-+		 * queue is enqueued.
-+		 */
-+		bfqq->bic->wr_time_left = bfq_wr_duration(bfqq->bfqd);
-+	else if (bfqq->wr_coeff > 1) {
-+		unsigned long wr_duration =
-+			jiffies - bfqq->last_wr_start_finish;
-+		/*
-+		 * It may happen that a queue's weight raising period lasts
-+		 * longer than its wr_cur_max_time, as weight raising is
-+		 * handled only when a request is enqueued or dispatched (it
-+		 * does not use any timer). If the weight raising period is
-+		 * about to end, don't save it.
-+		 */
-+		if (bfqq->wr_cur_max_time <= wr_duration)
-+			bfqq->bic->wr_time_left = 0;
-+		else
-+			bfqq->bic->wr_time_left =
-+				bfqq->wr_cur_max_time - wr_duration;
-+		/*
-+		 * The bfq_queue is becoming shared or the requests of the
-+		 * process owning the queue are being redirected to a shared
-+		 * queue. Stop the weight raising period of the queue, as in
-+		 * both cases it should not be owned by an interactive or
-+		 * soft real-time application.
-+		 */
-+		bfq_bfqq_end_wr(bfqq);
-+	} else
-+		bfqq->bic->wr_time_left = 0;
-+	bfqq->bic->saved_idle_window = bfq_bfqq_idle_window(bfqq);
-+	bfqq->bic->saved_IO_bound = bfq_bfqq_IO_bound(bfqq);
-+	bfqq->bic->saved_in_large_burst = bfq_bfqq_in_large_burst(bfqq);
-+	bfqq->bic->was_in_burst_list = !hlist_unhashed(&bfqq->burst_list_node);
-+	bfqq->bic->cooperations++;
-+	bfqq->bic->failed_cooperations = 0;
-+}
-+
-+static void bfq_get_bic_reference(struct bfq_queue *bfqq)
-+{
-+	/*
-+	 * If bfqq->bic has a non-NULL value, the bic to which it belongs
-+	 * is about to begin using a shared bfq_queue.
-+	 */
-+	if (bfqq->bic)
-+		atomic_long_inc(&bfqq->bic->icq.ioc->refcount);
-+}
-+
-+static void
-+bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
-+		struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
-+{
-+	bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu",
-+		     (unsigned long) new_bfqq->pid);
-+	/* Save weight raising and idle window of the merged queues */
-+	bfq_bfqq_save_state(bfqq);
-+	bfq_bfqq_save_state(new_bfqq);
-+	if (bfq_bfqq_IO_bound(bfqq))
-+		bfq_mark_bfqq_IO_bound(new_bfqq);
-+	bfq_clear_bfqq_IO_bound(bfqq);
-+	/*
-+	 * Grab a reference to the bic, to prevent it from being destroyed
-+	 * before being possibly touched by a bfq_split_bfqq().
-+	 */
-+	bfq_get_bic_reference(bfqq);
-+	bfq_get_bic_reference(new_bfqq);
-+	/*
-+	 * Merge queues (that is, let bic redirect its requests to new_bfqq)
-+	 */
-+	bic_set_bfqq(bic, new_bfqq, 1);
-+	bfq_mark_bfqq_coop(new_bfqq);
-+	/*
-+	 * new_bfqq now belongs to at least two bics (it is a shared queue):
-+	 * set new_bfqq->bic to NULL. bfqq either:
-+	 * - does not belong to any bic any more, and hence bfqq->bic must
-+	 *   be set to NULL, or
-+	 * - is a queue whose owning bics have already been redirected to a
-+	 *   different queue, hence the queue is destined to not belong to
-+	 *   any bic soon and bfqq->bic is already NULL (therefore the next
-+	 *   assignment causes no harm).
-+	 */
-+	new_bfqq->bic = NULL;
-+	bfqq->bic = NULL;
-+	bfq_put_queue(bfqq);
-+}
-+
-+static void bfq_bfqq_increase_failed_cooperations(struct bfq_queue *bfqq)
-+{
-+	struct bfq_io_cq *bic = bfqq->bic;
-+	struct bfq_data *bfqd = bfqq->bfqd;
-+
-+	if (bic && bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh) {
-+		bic->failed_cooperations++;
-+		if (bic->failed_cooperations >= bfqd->bfq_failed_cooperations)
-+			bic->cooperations = 0;
-+	}
-+}
-+
- static int bfq_allow_merge(struct request_queue *q, struct request *rq,
- 			   struct bio *bio)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
- 	struct bfq_io_cq *bic;
-+	struct bfq_queue *bfqq, *new_bfqq;
- 
- 	/*
- 	 * Disallow merge of a sync bio into an async request.
-@@ -1149,7 +1621,26 @@ static int bfq_allow_merge(struct request_queue *q, struct request *rq,
- 	if (!bic)
- 		return 0;
- 
--	return bic_to_bfqq(bic, bfq_bio_sync(bio)) == RQ_BFQQ(rq);
-+	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
-+	/*
-+	 * We take advantage of this function to perform an early merge
-+	 * of the queues of possible cooperating processes.
-+	 */
-+	if (bfqq) {
-+		new_bfqq = bfq_setup_cooperator(bfqd, bfqq, bio, false);
-+		if (new_bfqq) {
-+			bfq_merge_bfqqs(bfqd, bic, bfqq, new_bfqq);
-+			/*
-+			 * If we get here, the bio will be queued in the
-+			 * shared queue, i.e., new_bfqq, so use new_bfqq
-+			 * to decide whether bio and rq can be merged.
-+			 */
-+			bfqq = new_bfqq;
-+		} else
-+			bfq_bfqq_increase_failed_cooperations(bfqq);
-+	}
-+
-+	return bfqq == RQ_BFQQ(rq);
- }
- 
- static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
-@@ -1350,6 +1841,15 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 
- 	__bfq_bfqd_reset_in_service(bfqd);
- 
-+	/*
-+	 * If this bfqq is shared between multiple processes, check
-+	 * to make sure that those processes are still issuing I/Os
-+	 * within the mean seek distance. If not, it may be time to
-+	 * break the queues apart again.
-+	 */
-+	if (bfq_bfqq_coop(bfqq) && BFQQ_SEEKY(bfqq))
-+		bfq_mark_bfqq_split_coop(bfqq);
-+
- 	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
- 		/*
- 		 * Overloading budget_timeout field to store the time
-@@ -1358,8 +1858,13 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		 */
- 		bfqq->budget_timeout = jiffies;
- 		bfq_del_bfqq_busy(bfqd, bfqq, 1);
--	} else
-+	} else {
- 		bfq_activate_bfqq(bfqd, bfqq);
-+		/*
-+		 * Resort priority tree of potential close cooperators.
-+		 */
-+		bfq_pos_tree_add_move(bfqd, bfqq);
-+	}
- }
- 
- /**
-@@ -2246,10 +2751,12 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		/*
- 		 * If the queue was activated in a burst, or
- 		 * too much time has elapsed from the beginning
--		 * of this weight-raising period, then end weight
--		 * raising.
-+		 * of this weight-raising period, or the queue has
-+		 * exceeded the acceptable number of cooperations,
-+		 * then end weight raising.
- 		 */
- 		if (bfq_bfqq_in_large_burst(bfqq) ||
-+		    bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh ||
- 		    time_is_before_jiffies(bfqq->last_wr_start_finish +
- 					   bfqq->wr_cur_max_time)) {
- 			bfqq->last_wr_start_finish = jiffies;
-@@ -2478,6 +2985,25 @@ static void bfq_put_queue(struct bfq_queue *bfqq)
- #endif
- }
- 
-+static void bfq_put_cooperator(struct bfq_queue *bfqq)
-+{
-+	struct bfq_queue *__bfqq, *next;
-+
-+	/*
-+	 * If this queue was scheduled to merge with another queue, be
-+	 * sure to drop the reference taken on that queue (and others in
-+	 * the merge chain). See bfq_setup_merge and bfq_merge_bfqqs.
-+	 */
-+	__bfqq = bfqq->new_bfqq;
-+	while (__bfqq) {
-+		if (__bfqq == bfqq)
-+			break;
-+		next = __bfqq->new_bfqq;
-+		bfq_put_queue(__bfqq);
-+		__bfqq = next;
-+	}
-+}
-+
- static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
- 	if (bfqq == bfqd->in_service_queue) {
-@@ -2488,6 +3014,8 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq,
- 		     atomic_read(&bfqq->ref));
- 
-+	bfq_put_cooperator(bfqq);
-+
- 	bfq_put_queue(bfqq);
- }
- 
-@@ -2496,6 +3024,25 @@ static void bfq_init_icq(struct io_cq *icq)
- 	struct bfq_io_cq *bic = icq_to_bic(icq);
- 
- 	bic->ttime.last_end_request = jiffies;
-+	/*
-+	 * A newly created bic indicates that the process has just
-+	 * started doing I/O, and is probably mapping into memory its
-+	 * executable and libraries: it definitely needs weight raising.
-+	 * There is however the possibility that the process performs,
-+	 * for a while, I/O close to some other process. EQM intercepts
-+	 * this behavior and may merge the queue corresponding to the
-+	 * process  with some other queue, BEFORE the weight of the queue
-+	 * is raised. Merged queues are not weight-raised (they are assumed
-+	 * to belong to processes that benefit only from high throughput).
-+	 * If the merge is basically the consequence of an accident, then
-+	 * the queue will be split soon and will get back its old weight.
-+	 * It is then important to write down somewhere that this queue
-+	 * does need weight raising, even if it did not make it to get its
-+	 * weight raised before being merged. To this purpose, we overload
-+	 * the field raising_time_left and assign 1 to it, to mark the queue
-+	 * as needing weight raising.
-+	 */
-+	bic->wr_time_left = 1;
- }
- 
- static void bfq_exit_icq(struct io_cq *icq)
-@@ -2509,6 +3056,13 @@ static void bfq_exit_icq(struct io_cq *icq)
- 	}
- 
- 	if (bic->bfqq[BLK_RW_SYNC]) {
-+		/*
-+		 * If the bic is using a shared queue, put the reference
-+		 * taken on the io_context when the bic started using a
-+		 * shared bfq_queue.
-+		 */
-+		if (bfq_bfqq_coop(bic->bfqq[BLK_RW_SYNC]))
-+			put_io_context(icq->ioc);
- 		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]);
- 		bic->bfqq[BLK_RW_SYNC] = NULL;
- 	}
-@@ -2814,6 +3368,10 @@ static void bfq_update_idle_window(struct bfq_data *bfqd,
- 	if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq))
- 		return;
- 
-+	/* Idle window just restored, statistics are meaningless. */
-+	if (bfq_bfqq_just_split(bfqq))
-+		return;
-+
- 	enable_idle = bfq_bfqq_idle_window(bfqq);
- 
- 	if (atomic_read(&bic->icq.ioc->active_ref) == 0 ||
-@@ -2861,6 +3419,7 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 ||
- 	    !BFQQ_SEEKY(bfqq))
- 		bfq_update_idle_window(bfqd, bfqq, bic);
-+	bfq_clear_bfqq_just_split(bfqq);
- 
- 	bfq_log_bfqq(bfqd, bfqq,
- 		     "rq_enqueued: idle_window=%d (seeky %d, mean %llu)",
-@@ -2925,12 +3484,47 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- static void bfq_insert_request(struct request_queue *q, struct request *rq)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
--	struct bfq_queue *bfqq = RQ_BFQQ(rq);
-+	struct bfq_queue *bfqq = RQ_BFQQ(rq), *new_bfqq;
- 
- 	assert_spin_locked(bfqd->queue->queue_lock);
- 
-+	/*
-+	 * An unplug may trigger a requeue of a request from the device
-+	 * driver: make sure we are in process context while trying to
-+	 * merge two bfq_queues.
-+	 */
-+	if (!in_interrupt()) {
-+		new_bfqq = bfq_setup_cooperator(bfqd, bfqq, rq, true);
-+		if (new_bfqq) {
-+			if (bic_to_bfqq(RQ_BIC(rq), 1) != bfqq)
-+				new_bfqq = bic_to_bfqq(RQ_BIC(rq), 1);
-+			/*
-+			 * Release the request's reference to the old bfqq
-+			 * and make sure one is taken to the shared queue.
-+			 */
-+			new_bfqq->allocated[rq_data_dir(rq)]++;
-+			bfqq->allocated[rq_data_dir(rq)]--;
-+			atomic_inc(&new_bfqq->ref);
-+			bfq_put_queue(bfqq);
-+			if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq)
-+				bfq_merge_bfqqs(bfqd, RQ_BIC(rq),
-+						bfqq, new_bfqq);
-+			rq->elv.priv[1] = new_bfqq;
-+			bfqq = new_bfqq;
-+		} else
-+			bfq_bfqq_increase_failed_cooperations(bfqq);
-+	}
-+
- 	bfq_add_request(rq);
- 
-+	/*
-+	 * Here a newly-created bfq_queue has already started a weight-raising
-+	 * period: clear raising_time_left to prevent bfq_bfqq_save_state()
-+	 * from assigning it a full weight-raising period. See the detailed
-+	 * comments about this field in bfq_init_icq().
-+	 */
-+	if (bfqq->bic)
-+		bfqq->bic->wr_time_left = 0;
- 	rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)];
- 	list_add_tail(&rq->queuelist, &bfqq->fifo);
- 
-@@ -3099,6 +3693,32 @@ static void bfq_put_request(struct request *rq)
- }
- 
- /*
-+ * Returns NULL if a new bfqq should be allocated, or the old bfqq if this
-+ * was the last process referring to said bfqq.
-+ */
-+static struct bfq_queue *
-+bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
-+{
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "splitting queue");
-+
-+	put_io_context(bic->icq.ioc);
-+
-+	if (bfqq_process_refs(bfqq) == 1) {
-+		bfqq->pid = current->pid;
-+		bfq_clear_bfqq_coop(bfqq);
-+		bfq_clear_bfqq_split_coop(bfqq);
-+		return bfqq;
-+	}
-+
-+	bic_set_bfqq(bic, NULL, 1);
-+
-+	bfq_put_cooperator(bfqq);
-+
-+	bfq_put_queue(bfqq);
-+	return NULL;
-+}
-+
-+/*
-  * Allocate bfq data structures associated with this request.
-  */
- static int bfq_set_request(struct request_queue *q, struct request *rq,
-@@ -3110,6 +3730,7 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	const int is_sync = rq_is_sync(rq);
- 	struct bfq_queue *bfqq;
- 	unsigned long flags;
-+	bool split = false;
- 
- 	might_sleep_if(gfpflags_allow_blocking(gfp_mask));
- 
-@@ -3122,15 +3743,30 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 
- 	bfq_bic_update_cgroup(bic, bio);
- 
-+new_queue:
- 	bfqq = bic_to_bfqq(bic, is_sync);
- 	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
- 		bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, gfp_mask);
- 		bic_set_bfqq(bic, bfqq, is_sync);
--		if (is_sync) {
--			if (bfqd->large_burst)
-+		if (split && is_sync) {
-+			if ((bic->was_in_burst_list && bfqd->large_burst) ||
-+			    bic->saved_in_large_burst)
- 				bfq_mark_bfqq_in_large_burst(bfqq);
--			else
-+			else {
- 				bfq_clear_bfqq_in_large_burst(bfqq);
-+				if (bic->was_in_burst_list)
-+					hlist_add_head(&bfqq->burst_list_node,
-+						       &bfqd->burst_list);
-+			}
-+		}
-+	} else {
-+		/* If the queue was seeky for too long, break it apart. */
-+		if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) {
-+			bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq");
-+			bfqq = bfq_split_bfqq(bic, bfqq);
-+			split = true;
-+			if (!bfqq)
-+				goto new_queue;
- 		}
- 	}
- 
-@@ -3142,6 +3778,26 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	rq->elv.priv[0] = bic;
- 	rq->elv.priv[1] = bfqq;
- 
-+	/*
-+	 * If a bfq_queue has only one process reference, it is owned
-+	 * by only one bfq_io_cq: we can set the bic field of the
-+	 * bfq_queue to the address of that structure. Also, if the
-+	 * queue has just been split, mark a flag so that the
-+	 * information is available to the other scheduler hooks.
-+	 */
-+	if (likely(bfqq != &bfqd->oom_bfqq) && bfqq_process_refs(bfqq) == 1) {
-+		bfqq->bic = bic;
-+		if (split) {
-+			bfq_mark_bfqq_just_split(bfqq);
-+			/*
-+			 * If the queue has just been split from a shared
-+			 * queue, restore the idle window and the possible
-+			 * weight raising period.
-+			 */
-+			bfq_bfqq_resume_state(bfqq, bic);
-+		}
-+	}
-+
- 	spin_unlock_irqrestore(q->queue_lock, flags);
- 
- 	return 0;
-@@ -3295,6 +3951,7 @@ static void bfq_init_root_group(struct bfq_group *root_group,
- 	root_group->my_entity = NULL;
- 	root_group->bfqd = bfqd;
- #endif
-+	root_group->rq_pos_tree = RB_ROOT;
- 	for (i = 0; i < BFQ_IOPRIO_CLASSES; i++)
- 		root_group->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT;
- }
-@@ -3375,6 +4032,8 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
- 	bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async;
- 	bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync;
- 
-+	bfqd->bfq_coop_thresh = 2;
-+	bfqd->bfq_failed_cooperations = 7000;
- 	bfqd->bfq_requests_within_timer = 120;
- 
- 	bfqd->bfq_large_burst_thresh = 11;
-diff --git a/block/bfq.h b/block/bfq.h
-index 2bf54ae..fcce855 100644
---- a/block/bfq.h
-+++ b/block/bfq.h
-@@ -183,6 +183,8 @@ struct bfq_group;
-  *                    ioprio_class value.
-  * @new_bfqq: shared bfq_queue if queue is cooperating with
-  *           one or more other queues.
-+ * @pos_node: request-position tree member (see bfq_group's @rq_pos_tree).
-+ * @pos_root: request-position tree root (see bfq_group's @rq_pos_tree).
-  * @sort_list: sorted list of pending requests.
-  * @next_rq: if fifo isn't expired, next request to serve.
-  * @queued: nr of requests queued in @sort_list.
-@@ -304,6 +306,26 @@ struct bfq_ttime {
-  * @ttime: associated @bfq_ttime struct
-  * @ioprio: per (request_queue, blkcg) ioprio.
-  * @blkcg_id: id of the blkcg the related io_cq belongs to.
-+ * @wr_time_left: snapshot of the time left before weight raising ends
-+ *                for the sync queue associated to this process; this
-+ *		  snapshot is taken to remember this value while the weight
-+ *		  raising is suspended because the queue is merged with a
-+ *		  shared queue, and is used to set @raising_cur_max_time
-+ *		  when the queue is split from the shared queue and its
-+ *		  weight is raised again
-+ * @saved_idle_window: same purpose as the previous field for the idle
-+ *                     window
-+ * @saved_IO_bound: same purpose as the previous two fields for the I/O
-+ *                  bound classification of a queue
-+ * @saved_in_large_burst: same purpose as the previous fields for the
-+ *                        value of the field keeping the queue's belonging
-+ *                        to a large burst
-+ * @was_in_burst_list: true if the queue belonged to a burst list
-+ *                     before its merge with another cooperating queue
-+ * @cooperations: counter of consecutive successful queue merges underwent
-+ *                by any of the process' @bfq_queues
-+ * @failed_cooperations: counter of consecutive failed queue merges of any
-+ *                       of the process' @bfq_queues
-  */
- struct bfq_io_cq {
- 	struct io_cq icq; /* must be the first member */
-@@ -314,6 +336,16 @@ struct bfq_io_cq {
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	uint64_t blkcg_id; /* the current blkcg ID */
- #endif
-+
-+	unsigned int wr_time_left;
-+	bool saved_idle_window;
-+	bool saved_IO_bound;
-+
-+	bool saved_in_large_burst;
-+	bool was_in_burst_list;
-+
-+	unsigned int cooperations;
-+	unsigned int failed_cooperations;
- };
- 
- enum bfq_device_speed {
-@@ -557,6 +589,9 @@ enum bfqq_state_flags {
- 					 * may need softrt-next-start
- 					 * update
- 					 */
-+	BFQ_BFQQ_FLAG_coop,		/* bfqq is shared */
-+	BFQ_BFQQ_FLAG_split_coop,	/* shared bfqq will be split */
-+	BFQ_BFQQ_FLAG_just_split,	/* queue has just been split */
- };
- 
- #define BFQ_BFQQ_FNS(name)						\
-@@ -583,6 +618,9 @@ BFQ_BFQQ_FNS(budget_new);
- BFQ_BFQQ_FNS(IO_bound);
- BFQ_BFQQ_FNS(in_large_burst);
- BFQ_BFQQ_FNS(constantly_seeky);
-+BFQ_BFQQ_FNS(coop);
-+BFQ_BFQQ_FNS(split_coop);
-+BFQ_BFQQ_FNS(just_split);
- BFQ_BFQQ_FNS(softrt_update);
- #undef BFQ_BFQQ_FNS
- 
-@@ -675,6 +713,9 @@ struct bfq_group_data {
-  *                   are groups with more than one active @bfq_entity
-  *                   (see the comments to the function
-  *                   bfq_bfqq_must_not_expire()).
-+ * @rq_pos_tree: rbtree sorted by next_request position, used when
-+ *               determining if two or more queues have interleaving
-+ *               requests (see bfq_find_close_cooperator()).
-  *
-  * Each (device, cgroup) pair has its own bfq_group, i.e., for each cgroup
-  * there is a set of bfq_groups, each one collecting the lower-level
-@@ -701,6 +742,8 @@ struct bfq_group {
- 
- 	int active_entities;
- 
-+	struct rb_root rq_pos_tree;
-+
- 	struct bfqg_stats stats;
- 	struct bfqg_stats dead_stats;	/* stats pushed from dead children */
- };
-@@ -711,6 +754,8 @@ struct bfq_group {
- 
- 	struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR];
- 	struct bfq_queue *async_idle_bfqq;
-+
-+	struct rb_root rq_pos_tree;
- };
- #endif
- 
-@@ -787,6 +832,27 @@ static void bfq_put_bfqd_unlock(struct bfq_data *bfqd, unsigned long *flags)
- 	spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
- }
- 
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+
-+static struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *group_entity = bfqq->entity.parent;
-+
-+	if (!group_entity)
-+		group_entity = &bfqq->bfqd->root_group->entity;
-+
-+	return container_of(group_entity, struct bfq_group, entity);
-+}
-+
-+#else
-+
-+static struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq)
-+{
-+	return bfqq->bfqd->root_group;
-+}
-+
-+#endif
-+
- static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio);
- static void bfq_put_queue(struct bfq_queue *bfqq);
- static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
--- 
-2.7.4 (Apple Git-66)
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch
deleted file mode 100644
index 6c920d63b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch
+++ /dev/null
@@ -1,7393 +0,0 @@
-# Calculate format=diff os_linux_system==desktop
-From ec8981e245dfe24bc6a80207e832ca9be18fd39d Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@linaro.org>
-Date: Tue, 17 May 2016 08:28:04 +0200
-Subject: [PATCH 4/4] Turn BFQ-v7r11 into BFQ-v8r4 for 4.8.0
-
-Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
----
- block/Kconfig.iosched |    2 +-
- block/bfq-cgroup.c    |  495 ++++----
- block/bfq-iosched.c   | 3230 +++++++++++++++++++++++++++++++------------------
- block/bfq-sched.c     |  480 ++++++--
- block/bfq.h           |  747 ++++++------
- 5 files changed, 3073 insertions(+), 1881 deletions(-)
-
-diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
-index f78cd1a..6d92579 100644
---- a/block/Kconfig.iosched
-+++ b/block/Kconfig.iosched
-@@ -53,7 +53,7 @@ config IOSCHED_BFQ
- 
- config BFQ_GROUP_IOSCHED
- 	bool "BFQ hierarchical scheduling support"
--	depends on CGROUPS && IOSCHED_BFQ=y
-+	depends on IOSCHED_BFQ && BLK_CGROUP
- 	default n
- 	---help---
- 	  Enable hierarchical scheduling in BFQ, using the blkio controller.
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-index 0367996..b50ae8e 100644
---- a/block/bfq-cgroup.c
-+++ b/block/bfq-cgroup.c
-@@ -7,7 +7,9 @@
-  * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-  *		      Paolo Valente <paolo.valente@unimore.it>
-  *
-- * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ * Copyright (C) 2015 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2016 Paolo Valente <paolo.valente@linaro.org>
-  *
-  * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-  * file.
-@@ -163,8 +165,6 @@ static struct bfq_group *blkg_to_bfqg(struct blkcg_gq *blkg)
- {
- 	struct blkg_policy_data *pd = blkg_to_pd(blkg, &blkcg_policy_bfq);
- 
--	BUG_ON(!pd);
--
- 	return pd_to_bfqg(pd);
- }
- 
-@@ -208,59 +208,49 @@ static void bfqg_put(struct bfq_group *bfqg)
- 
- static void bfqg_stats_update_io_add(struct bfq_group *bfqg,
- 				     struct bfq_queue *bfqq,
--				     int rw)
-+				     int op, int op_flags)
- {
--	blkg_rwstat_add(&bfqg->stats.queued, rw, 1);
-+	blkg_rwstat_add(&bfqg->stats.queued, op, op_flags, 1);
- 	bfqg_stats_end_empty_time(&bfqg->stats);
- 	if (!(bfqq == ((struct bfq_data *)bfqg->bfqd)->in_service_queue))
- 		bfqg_stats_set_start_group_wait_time(bfqg, bfqq_group(bfqq));
- }
- 
--static void bfqg_stats_update_io_remove(struct bfq_group *bfqg, int rw)
--{
--	blkg_rwstat_add(&bfqg->stats.queued, rw, -1);
--}
--
--static void bfqg_stats_update_io_merged(struct bfq_group *bfqg, int rw)
-+static void bfqg_stats_update_io_remove(struct bfq_group *bfqg, int op,
-+					int op_flags)
- {
--	blkg_rwstat_add(&bfqg->stats.merged, rw, 1);
-+	blkg_rwstat_add(&bfqg->stats.queued, op, op_flags, -1);
- }
- 
--static void bfqg_stats_update_dispatch(struct bfq_group *bfqg,
--					      uint64_t bytes, int rw)
-+static void bfqg_stats_update_io_merged(struct bfq_group *bfqg,  int op,
-+					int op_flags)
- {
--	blkg_stat_add(&bfqg->stats.sectors, bytes >> 9);
--	blkg_rwstat_add(&bfqg->stats.serviced, rw, 1);
--	blkg_rwstat_add(&bfqg->stats.service_bytes, rw, bytes);
-+	blkg_rwstat_add(&bfqg->stats.merged, op, op_flags, 1);
- }
- 
- static void bfqg_stats_update_completion(struct bfq_group *bfqg,
--			uint64_t start_time, uint64_t io_start_time, int rw)
-+			uint64_t start_time, uint64_t io_start_time, int op,
-+			int op_flags)
- {
- 	struct bfqg_stats *stats = &bfqg->stats;
- 	unsigned long long now = sched_clock();
- 
- 	if (time_after64(now, io_start_time))
--		blkg_rwstat_add(&stats->service_time, rw, now - io_start_time);
-+		blkg_rwstat_add(&stats->service_time, op, op_flags,
-+				now - io_start_time);
- 	if (time_after64(io_start_time, start_time))
--		blkg_rwstat_add(&stats->wait_time, rw,
-+		blkg_rwstat_add(&stats->wait_time, op, op_flags,
- 				io_start_time - start_time);
- }
- 
- /* @stats = 0 */
- static void bfqg_stats_reset(struct bfqg_stats *stats)
- {
--	if (!stats)
--		return;
--
- 	/* queued stats shouldn't be cleared */
--	blkg_rwstat_reset(&stats->service_bytes);
--	blkg_rwstat_reset(&stats->serviced);
- 	blkg_rwstat_reset(&stats->merged);
- 	blkg_rwstat_reset(&stats->service_time);
- 	blkg_rwstat_reset(&stats->wait_time);
- 	blkg_stat_reset(&stats->time);
--	blkg_stat_reset(&stats->unaccounted_time);
- 	blkg_stat_reset(&stats->avg_queue_size_sum);
- 	blkg_stat_reset(&stats->avg_queue_size_samples);
- 	blkg_stat_reset(&stats->dequeue);
-@@ -270,19 +260,16 @@ static void bfqg_stats_reset(struct bfqg_stats *stats)
- }
- 
- /* @to += @from */
--static void bfqg_stats_merge(struct bfqg_stats *to, struct bfqg_stats *from)
-+static void bfqg_stats_add_aux(struct bfqg_stats *to, struct bfqg_stats *from)
- {
- 	if (!to || !from)
- 		return;
- 
- 	/* queued stats shouldn't be cleared */
--	blkg_rwstat_add_aux(&to->service_bytes, &from->service_bytes);
--	blkg_rwstat_add_aux(&to->serviced, &from->serviced);
- 	blkg_rwstat_add_aux(&to->merged, &from->merged);
- 	blkg_rwstat_add_aux(&to->service_time, &from->service_time);
- 	blkg_rwstat_add_aux(&to->wait_time, &from->wait_time);
- 	blkg_stat_add_aux(&from->time, &from->time);
--	blkg_stat_add_aux(&to->unaccounted_time, &from->unaccounted_time);
- 	blkg_stat_add_aux(&to->avg_queue_size_sum, &from->avg_queue_size_sum);
- 	blkg_stat_add_aux(&to->avg_queue_size_samples,
- 			  &from->avg_queue_size_samples);
-@@ -311,10 +298,8 @@ static void bfqg_stats_xfer_dead(struct bfq_group *bfqg)
- 	if (unlikely(!parent))
- 		return;
- 
--	bfqg_stats_merge(&parent->dead_stats, &bfqg->stats);
--	bfqg_stats_merge(&parent->dead_stats, &bfqg->dead_stats);
-+	bfqg_stats_add_aux(&parent->stats, &bfqg->stats);
- 	bfqg_stats_reset(&bfqg->stats);
--	bfqg_stats_reset(&bfqg->dead_stats);
- }
- 
- static void bfq_init_entity(struct bfq_entity *entity,
-@@ -335,15 +320,11 @@ static void bfq_init_entity(struct bfq_entity *entity,
- 
- static void bfqg_stats_exit(struct bfqg_stats *stats)
- {
--	blkg_rwstat_exit(&stats->service_bytes);
--	blkg_rwstat_exit(&stats->serviced);
- 	blkg_rwstat_exit(&stats->merged);
- 	blkg_rwstat_exit(&stats->service_time);
- 	blkg_rwstat_exit(&stats->wait_time);
- 	blkg_rwstat_exit(&stats->queued);
--	blkg_stat_exit(&stats->sectors);
- 	blkg_stat_exit(&stats->time);
--	blkg_stat_exit(&stats->unaccounted_time);
- 	blkg_stat_exit(&stats->avg_queue_size_sum);
- 	blkg_stat_exit(&stats->avg_queue_size_samples);
- 	blkg_stat_exit(&stats->dequeue);
-@@ -354,15 +335,11 @@ static void bfqg_stats_exit(struct bfqg_stats *stats)
- 
- static int bfqg_stats_init(struct bfqg_stats *stats, gfp_t gfp)
- {
--	if (blkg_rwstat_init(&stats->service_bytes, gfp) ||
--	    blkg_rwstat_init(&stats->serviced, gfp) ||
--	    blkg_rwstat_init(&stats->merged, gfp) ||
-+	if (blkg_rwstat_init(&stats->merged, gfp) ||
- 	    blkg_rwstat_init(&stats->service_time, gfp) ||
- 	    blkg_rwstat_init(&stats->wait_time, gfp) ||
- 	    blkg_rwstat_init(&stats->queued, gfp) ||
--	    blkg_stat_init(&stats->sectors, gfp) ||
- 	    blkg_stat_init(&stats->time, gfp) ||
--	    blkg_stat_init(&stats->unaccounted_time, gfp) ||
- 	    blkg_stat_init(&stats->avg_queue_size_sum, gfp) ||
- 	    blkg_stat_init(&stats->avg_queue_size_samples, gfp) ||
- 	    blkg_stat_init(&stats->dequeue, gfp) ||
-@@ -386,11 +363,27 @@ static struct bfq_group_data *blkcg_to_bfqgd(struct blkcg *blkcg)
- 	return cpd_to_bfqgd(blkcg_to_cpd(blkcg, &blkcg_policy_bfq));
- }
- 
-+static struct blkcg_policy_data *bfq_cpd_alloc(gfp_t gfp)
-+{
-+	struct bfq_group_data *bgd;
-+
-+	bgd = kzalloc(sizeof(*bgd), GFP_KERNEL);
-+	if (!bgd)
-+		return NULL;
-+	return &bgd->pd;
-+}
-+
- static void bfq_cpd_init(struct blkcg_policy_data *cpd)
- {
- 	struct bfq_group_data *d = cpd_to_bfqgd(cpd);
- 
--	d->weight = BFQ_DEFAULT_GRP_WEIGHT;
-+	d->weight = cgroup_subsys_on_dfl(io_cgrp_subsys) ?
-+		CGROUP_WEIGHT_DFL : BFQ_WEIGHT_LEGACY_DFL;
-+}
-+
-+static void bfq_cpd_free(struct blkcg_policy_data *cpd)
-+{
-+	kfree(cpd_to_bfqgd(cpd));
- }
- 
- static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node)
-@@ -401,8 +394,7 @@ static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node)
- 	if (!bfqg)
- 		return NULL;
- 
--	if (bfqg_stats_init(&bfqg->stats, gfp) ||
--	    bfqg_stats_init(&bfqg->dead_stats, gfp)) {
-+	if (bfqg_stats_init(&bfqg->stats, gfp)) {
- 		kfree(bfqg);
- 		return NULL;
- 	}
-@@ -410,27 +402,20 @@ static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, int node)
- 	return &bfqg->pd;
- }
- 
--static void bfq_group_set_parent(struct bfq_group *bfqg,
--					struct bfq_group *parent)
-+static void bfq_pd_init(struct blkg_policy_data *pd)
- {
-+	struct blkcg_gq *blkg;
-+	struct bfq_group *bfqg;
-+	struct bfq_data *bfqd;
- 	struct bfq_entity *entity;
-+	struct bfq_group_data *d;
- 
--	BUG_ON(!parent);
--	BUG_ON(!bfqg);
--	BUG_ON(bfqg == parent);
--
-+	blkg = pd_to_blkg(pd);
-+	BUG_ON(!blkg);
-+	bfqg = blkg_to_bfqg(blkg);
-+	bfqd = blkg->q->elevator->elevator_data;
- 	entity = &bfqg->entity;
--	entity->parent = parent->my_entity;
--	entity->sched_data = &parent->sched_data;
--}
--
--static void bfq_pd_init(struct blkg_policy_data *pd)
--{
--	struct blkcg_gq *blkg = pd_to_blkg(pd);
--	struct bfq_group *bfqg = blkg_to_bfqg(blkg);
--	struct bfq_data *bfqd = blkg->q->elevator->elevator_data;
--	struct bfq_entity *entity = &bfqg->entity;
--	struct bfq_group_data *d = blkcg_to_bfqgd(blkg->blkcg);
-+	d = blkcg_to_bfqgd(blkg->blkcg);
- 
- 	entity->orig_weight = entity->weight = entity->new_weight = d->weight;
- 	entity->my_sched_data = &bfqg->sched_data;
-@@ -448,70 +433,53 @@ static void bfq_pd_free(struct blkg_policy_data *pd)
- 	struct bfq_group *bfqg = pd_to_bfqg(pd);
- 
- 	bfqg_stats_exit(&bfqg->stats);
--	bfqg_stats_exit(&bfqg->dead_stats);
--
- 	return kfree(bfqg);
- }
- 
--/* offset delta from bfqg->stats to bfqg->dead_stats */
--static const int dead_stats_off_delta = offsetof(struct bfq_group, dead_stats) -
--					offsetof(struct bfq_group, stats);
--
--/* to be used by recursive prfill, sums live and dead stats recursively */
--static u64 bfqg_stat_pd_recursive_sum(struct blkg_policy_data *pd, int off)
-+static void bfq_pd_reset_stats(struct blkg_policy_data *pd)
- {
--	u64 sum = 0;
-+	struct bfq_group *bfqg = pd_to_bfqg(pd);
- 
--	sum += blkg_stat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off);
--	sum += blkg_stat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq,
--				       off + dead_stats_off_delta);
--	return sum;
-+	bfqg_stats_reset(&bfqg->stats);
- }
- 
--/* to be used by recursive prfill, sums live and dead rwstats recursively */
--static struct blkg_rwstat
--bfqg_rwstat_pd_recursive_sum(struct blkg_policy_data *pd, int off)
-+static void bfq_group_set_parent(struct bfq_group *bfqg,
-+					struct bfq_group *parent)
- {
--	struct blkg_rwstat a, b;
-+	struct bfq_entity *entity;
- 
--	a = blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off);
--	b = blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq,
--				      off + dead_stats_off_delta);
--	blkg_rwstat_add_aux(&a, &b);
--	return a;
-+	BUG_ON(!parent);
-+	BUG_ON(!bfqg);
-+	BUG_ON(bfqg == parent);
-+
-+	entity = &bfqg->entity;
-+	entity->parent = parent->my_entity;
-+	entity->sched_data = &parent->sched_data;
- }
- 
--static void bfq_pd_reset_stats(struct blkg_policy_data *pd)
-+static struct bfq_group *bfq_lookup_bfqg(struct bfq_data *bfqd,
-+					 struct blkcg *blkcg)
- {
--	struct bfq_group *bfqg = pd_to_bfqg(pd);
-+	struct blkcg_gq *blkg;
- 
--	bfqg_stats_reset(&bfqg->stats);
--	bfqg_stats_reset(&bfqg->dead_stats);
-+	blkg = blkg_lookup(blkcg, bfqd->queue);
-+	if (likely(blkg))
-+		return blkg_to_bfqg(blkg);
-+	return NULL;
- }
- 
--static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
--					      struct blkcg *blkcg)
-+static struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,
-+					    struct blkcg *blkcg)
- {
--	struct request_queue *q = bfqd->queue;
--	struct bfq_group *bfqg = NULL, *parent;
--	struct bfq_entity *entity = NULL;
-+	struct bfq_group *bfqg, *parent;
-+	struct bfq_entity *entity;
- 
- 	assert_spin_locked(bfqd->queue->queue_lock);
- 
--	/* avoid lookup for the common case where there's no blkcg */
--	if (blkcg == &blkcg_root) {
--		bfqg = bfqd->root_group;
--	} else {
--		struct blkcg_gq *blkg;
--
--		blkg = blkg_lookup_create(blkcg, q);
--		if (!IS_ERR(blkg))
--			bfqg = blkg_to_bfqg(blkg);
--		else /* fallback to root_group */
--			bfqg = bfqd->root_group;
--	}
-+	bfqg = bfq_lookup_bfqg(bfqd, blkcg);
- 
--	BUG_ON(!bfqg);
-+	if (unlikely(!bfqg))
-+		return NULL;
- 
- 	/*
- 	 * Update chain of bfq_groups as we might be handling a leaf group
-@@ -537,11 +505,15 @@ static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
- static void bfq_pos_tree_add_move(struct bfq_data *bfqd,
- 				  struct bfq_queue *bfqq);
- 
-+static void bfq_bfqq_expire(struct bfq_data *bfqd,
-+			    struct bfq_queue *bfqq,
-+			    bool compensate,
-+			    enum bfqq_expiration reason);
-+
- /**
-  * bfq_bfqq_move - migrate @bfqq to @bfqg.
-  * @bfqd: queue descriptor.
-  * @bfqq: the queue to move.
-- * @entity: @bfqq's entity.
-  * @bfqg: the group to move to.
-  *
-  * Move @bfqq to @bfqg, deactivating it from its old group and reactivating
-@@ -552,26 +524,40 @@ static void bfq_pos_tree_add_move(struct bfq_data *bfqd,
-  * rcu_read_lock()).
-  */
- static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
--			  struct bfq_entity *entity, struct bfq_group *bfqg)
-+			  struct bfq_group *bfqg)
- {
--	int busy, resume;
--
--	busy = bfq_bfqq_busy(bfqq);
--	resume = !RB_EMPTY_ROOT(&bfqq->sort_list);
-+	struct bfq_entity *entity = &bfqq->entity;
- 
--	BUG_ON(resume && !entity->on_st);
--	BUG_ON(busy && !resume && entity->on_st &&
-+	BUG_ON(!bfq_bfqq_busy(bfqq) && !RB_EMPTY_ROOT(&bfqq->sort_list));
-+	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list) && !entity->on_st);
-+	BUG_ON(bfq_bfqq_busy(bfqq) && RB_EMPTY_ROOT(&bfqq->sort_list)
-+	       && entity->on_st &&
- 	       bfqq != bfqd->in_service_queue);
-+	BUG_ON(!bfq_bfqq_busy(bfqq) && bfqq == bfqd->in_service_queue);
- 
--	if (busy) {
--		BUG_ON(atomic_read(&bfqq->ref) < 2);
-+	/* If bfqq is empty, then bfq_bfqq_expire also invokes
-+	 * bfq_del_bfqq_busy, thereby removing bfqq and its entity
-+	 * from data structures related to current group. Otherwise we
-+	 * need to remove bfqq explicitly with bfq_deactivate_bfqq, as
-+	 * we do below.
-+	 */
-+	if (bfqq == bfqd->in_service_queue)
-+		bfq_bfqq_expire(bfqd, bfqd->in_service_queue,
-+				false, BFQ_BFQQ_PREEMPTED);
-+
-+	BUG_ON(entity->on_st && !bfq_bfqq_busy(bfqq)
-+	    && &bfq_entity_service_tree(entity)->idle !=
-+	       entity->tree);
-+
-+	BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list) && bfq_bfqq_busy(bfqq));
- 
--		if (!resume)
--			bfq_del_bfqq_busy(bfqd, bfqq, 0);
--		else
--			bfq_deactivate_bfqq(bfqd, bfqq, 0);
--	} else if (entity->on_st)
-+	if (bfq_bfqq_busy(bfqq))
-+		bfq_deactivate_bfqq(bfqd, bfqq, 0);
-+	else if (entity->on_st) {
-+		BUG_ON(&bfq_entity_service_tree(entity)->idle !=
-+		       entity->tree);
- 		bfq_put_idle_entity(bfq_entity_service_tree(entity), entity);
-+	}
- 	bfqg_put(bfqq_group(bfqq));
- 
- 	/*
-@@ -583,14 +569,17 @@ static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	entity->sched_data = &bfqg->sched_data;
- 	bfqg_get(bfqg);
- 
--	if (busy) {
-+	BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list) && bfq_bfqq_busy(bfqq));
-+	if (bfq_bfqq_busy(bfqq)) {
- 		bfq_pos_tree_add_move(bfqd, bfqq);
--		if (resume)
--			bfq_activate_bfqq(bfqd, bfqq);
-+		bfq_activate_bfqq(bfqd, bfqq);
- 	}
- 
- 	if (!bfqd->in_service_queue && !bfqd->rq_in_driver)
- 		bfq_schedule_dispatch(bfqd);
-+	BUG_ON(entity->on_st && !bfq_bfqq_busy(bfqq)
-+	       && &bfq_entity_service_tree(entity)->idle !=
-+	       entity->tree);
- }
- 
- /**
-@@ -617,7 +606,11 @@ static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
- 
- 	lockdep_assert_held(bfqd->queue->queue_lock);
- 
--	bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+	bfqg = bfq_find_set_group(bfqd, blkcg);
-+
-+	if (unlikely(!bfqg))
-+		bfqg = bfqd->root_group;
-+
- 	if (async_bfqq) {
- 		entity = &async_bfqq->entity;
- 
-@@ -625,7 +618,8 @@ static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
- 			bic_set_bfqq(bic, NULL, 0);
- 			bfq_log_bfqq(bfqd, async_bfqq,
- 				     "bic_change_group: %p %d",
--				     async_bfqq, atomic_read(&async_bfqq->ref));
-+				     async_bfqq,
-+				     async_bfqq->ref);
- 			bfq_put_queue(async_bfqq);
- 		}
- 	}
-@@ -633,7 +627,7 @@ static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
- 	if (sync_bfqq) {
- 		entity = &sync_bfqq->entity;
- 		if (entity->sched_data != &bfqg->sched_data)
--			bfq_bfqq_move(bfqd, sync_bfqq, entity, bfqg);
-+			bfq_bfqq_move(bfqd, sync_bfqq, bfqg);
- 	}
- 
- 	return bfqg;
-@@ -642,25 +636,23 @@ static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
- static void bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio)
- {
- 	struct bfq_data *bfqd = bic_to_bfqd(bic);
--	struct blkcg *blkcg;
- 	struct bfq_group *bfqg = NULL;
--	uint64_t id;
-+	uint64_t serial_nr;
- 
- 	rcu_read_lock();
--	blkcg = bio_blkcg(bio);
--	id = blkcg->css.serial_nr;
--	rcu_read_unlock();
-+	serial_nr = bio_blkcg(bio)->css.serial_nr;
- 
- 	/*
- 	 * Check whether blkcg has changed.  The condition may trigger
- 	 * spuriously on a newly created cic but there's no harm.
- 	 */
--	if (unlikely(!bfqd) || likely(bic->blkcg_id == id))
--		return;
-+	if (unlikely(!bfqd) || likely(bic->blkcg_serial_nr == serial_nr))
-+		goto out;
- 
--	bfqg = __bfq_bic_change_cgroup(bfqd, bic, blkcg);
--	BUG_ON(!bfqg);
--	bic->blkcg_id = id;
-+	bfqg = __bfq_bic_change_cgroup(bfqd, bic, bio_blkcg(bio));
-+	bic->blkcg_serial_nr = serial_nr;
-+out:
-+	rcu_read_unlock();
- }
- 
- /**
-@@ -686,7 +678,7 @@ static void bfq_reparent_leaf_entity(struct bfq_data *bfqd,
- 	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
- 
- 	BUG_ON(!bfqq);
--	bfq_bfqq_move(bfqd, bfqq, entity, bfqd->root_group);
-+	bfq_bfqq_move(bfqd, bfqq, bfqd->root_group);
- }
- 
- /**
-@@ -717,11 +709,12 @@ static void bfq_reparent_active_entities(struct bfq_data *bfqd,
- }
- 
- /**
-- * bfq_destroy_group - destroy @bfqg.
-- * @bfqg: the group being destroyed.
-+ * bfq_pd_offline - deactivate the entity associated with @pd,
-+ *		    and reparent its children entities.
-+ * @pd: descriptor of the policy going offline.
-  *
-- * Destroy @bfqg, making sure that it is not referenced from its parent.
-- * blkio already grabs the queue_lock for us, so no need to use RCU-based magic
-+ * blkio already grabs the queue_lock for us, so no need to use
-+ * RCU-based magic
-  */
- static void bfq_pd_offline(struct blkg_policy_data *pd)
- {
-@@ -780,6 +773,12 @@ static void bfq_pd_offline(struct blkg_policy_data *pd)
- 	bfq_put_async_queues(bfqd, bfqg);
- 	BUG_ON(entity->tree);
- 
-+	/*
-+	 * @blkg is going offline and will be ignored by
-+	 * blkg_[rw]stat_recursive_sum().  Transfer stats to the parent so
-+	 * that they don't get lost.  If IOs complete after this point, the
-+	 * stats for them will be lost.  Oh well...
-+	 */
- 	bfqg_stats_xfer_dead(bfqg);
- }
- 
-@@ -789,46 +788,35 @@ static void bfq_end_wr_async(struct bfq_data *bfqd)
- 
- 	list_for_each_entry(blkg, &bfqd->queue->blkg_list, q_node) {
- 		struct bfq_group *bfqg = blkg_to_bfqg(blkg);
-+		BUG_ON(!bfqg);
- 
- 		bfq_end_wr_async_queues(bfqd, bfqg);
- 	}
- 	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
- }
- 
--static u64 bfqio_cgroup_weight_read(struct cgroup_subsys_state *css,
--				       struct cftype *cftype)
--{
--	struct blkcg *blkcg = css_to_blkcg(css);
--	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
--	int ret = -EINVAL;
--
--	spin_lock_irq(&blkcg->lock);
--	ret = bfqgd->weight;
--	spin_unlock_irq(&blkcg->lock);
--
--	return ret;
--}
--
--static int bfqio_cgroup_weight_read_dfl(struct seq_file *sf, void *v)
-+static int bfq_io_show_weight(struct seq_file *sf, void *v)
- {
- 	struct blkcg *blkcg = css_to_blkcg(seq_css(sf));
- 	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
-+	unsigned int val = 0;
- 
--	spin_lock_irq(&blkcg->lock);
--	seq_printf(sf, "%u\n", bfqgd->weight);
--	spin_unlock_irq(&blkcg->lock);
-+	if (bfqgd)
-+		val = bfqgd->weight;
-+
-+	seq_printf(sf, "%u\n", val);
- 
- 	return 0;
- }
- 
--static int bfqio_cgroup_weight_write(struct cgroup_subsys_state *css,
--					struct cftype *cftype,
--					u64 val)
-+static int bfq_io_set_weight_legacy(struct cgroup_subsys_state *css,
-+				    struct cftype *cftype,
-+				    u64 val)
- {
- 	struct blkcg *blkcg = css_to_blkcg(css);
- 	struct bfq_group_data *bfqgd = blkcg_to_bfqgd(blkcg);
- 	struct blkcg_gq *blkg;
--	int ret = -EINVAL;
-+	int ret = -ERANGE;
- 
- 	if (val < BFQ_MIN_WEIGHT || val > BFQ_MAX_WEIGHT)
- 		return ret;
-@@ -873,13 +861,18 @@ static int bfqio_cgroup_weight_write(struct cgroup_subsys_state *css,
- 	return ret;
- }
- 
--static ssize_t bfqio_cgroup_weight_write_dfl(struct kernfs_open_file *of,
--					     char *buf, size_t nbytes,
--					     loff_t off)
-+static ssize_t bfq_io_set_weight(struct kernfs_open_file *of,
-+				 char *buf, size_t nbytes,
-+				 loff_t off)
- {
-+	u64 weight;
- 	/* First unsigned long found in the file is used */
--	return bfqio_cgroup_weight_write(of_css(of), NULL,
--					 simple_strtoull(strim(buf), NULL, 0));
-+	int ret = kstrtoull(strim(buf), 0, &weight);
-+
-+	if (ret)
-+		return ret;
-+
-+	return bfq_io_set_weight_legacy(of_css(of), NULL, weight);
- }
- 
- static int bfqg_print_stat(struct seq_file *sf, void *v)
-@@ -899,16 +892,17 @@ static int bfqg_print_rwstat(struct seq_file *sf, void *v)
- static u64 bfqg_prfill_stat_recursive(struct seq_file *sf,
- 				      struct blkg_policy_data *pd, int off)
- {
--	u64 sum = bfqg_stat_pd_recursive_sum(pd, off);
--
-+	u64 sum = blkg_stat_recursive_sum(pd_to_blkg(pd),
-+					  &blkcg_policy_bfq, off);
- 	return __blkg_prfill_u64(sf, pd, sum);
- }
- 
- static u64 bfqg_prfill_rwstat_recursive(struct seq_file *sf,
- 					struct blkg_policy_data *pd, int off)
- {
--	struct blkg_rwstat sum = bfqg_rwstat_pd_recursive_sum(pd, off);
--
-+	struct blkg_rwstat sum = blkg_rwstat_recursive_sum(pd_to_blkg(pd),
-+							   &blkcg_policy_bfq,
-+							   off);
- 	return __blkg_prfill_rwstat(sf, pd, &sum);
- }
- 
-@@ -928,6 +922,41 @@ static int bfqg_print_rwstat_recursive(struct seq_file *sf, void *v)
- 	return 0;
- }
- 
-+static u64 bfqg_prfill_sectors(struct seq_file *sf, struct blkg_policy_data *pd,
-+			       int off)
-+{
-+	u64 sum = blkg_rwstat_total(&pd->blkg->stat_bytes);
-+
-+	return __blkg_prfill_u64(sf, pd, sum >> 9);
-+}
-+
-+static int bfqg_print_stat_sectors(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_sectors, &blkcg_policy_bfq, 0, false);
-+	return 0;
-+}
-+
-+static u64 bfqg_prfill_sectors_recursive(struct seq_file *sf,
-+					 struct blkg_policy_data *pd, int off)
-+{
-+	struct blkg_rwstat tmp = blkg_rwstat_recursive_sum(pd->blkg, NULL,
-+					offsetof(struct blkcg_gq, stat_bytes));
-+	u64 sum = atomic64_read(&tmp.aux_cnt[BLKG_RWSTAT_READ]) +
-+		atomic64_read(&tmp.aux_cnt[BLKG_RWSTAT_WRITE]);
-+
-+	return __blkg_prfill_u64(sf, pd, sum >> 9);
-+}
-+
-+static int bfqg_print_stat_sectors_recursive(struct seq_file *sf, void *v)
-+{
-+	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
-+			  bfqg_prfill_sectors_recursive, &blkcg_policy_bfq, 0,
-+			  false);
-+	return 0;
-+}
-+
-+
- static u64 bfqg_prfill_avg_queue_size(struct seq_file *sf,
- 				      struct blkg_policy_data *pd, int off)
- {
-@@ -964,38 +993,15 @@ bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
- 	return blkg_to_bfqg(bfqd->queue->root_blkg);
- }
- 
--static struct blkcg_policy_data *bfq_cpd_alloc(gfp_t gfp)
--{
--	struct bfq_group_data *bgd;
--
--	bgd = kzalloc(sizeof(*bgd), GFP_KERNEL);
--	if (!bgd)
--		return NULL;
--	return &bgd->pd;
--}
--
--static void bfq_cpd_free(struct blkcg_policy_data *cpd)
--{
--	kfree(cpd_to_bfqgd(cpd));
--}
--
--static struct cftype bfqio_files_dfl[] = {
-+static struct cftype bfq_blkcg_legacy_files[] = {
- 	{
--		.name = "weight",
-+		.name = "bfq.weight",
- 		.flags = CFTYPE_NOT_ON_ROOT,
--		.seq_show = bfqio_cgroup_weight_read_dfl,
--		.write = bfqio_cgroup_weight_write_dfl,
-+		.seq_show = bfq_io_show_weight,
-+		.write_u64 = bfq_io_set_weight_legacy,
- 	},
--	{} /* terminate */
--};
- 
--static struct cftype bfqio_files[] = {
--	{
--		.name = "bfq.weight",
--		.read_u64 = bfqio_cgroup_weight_read,
--		.write_u64 = bfqio_cgroup_weight_write,
--	},
--	/* statistics, cover only the tasks in the bfqg */
-+	/* statistics, covers only the tasks in the bfqg */
- 	{
- 		.name = "bfq.time",
- 		.private = offsetof(struct bfq_group, stats.time),
-@@ -1003,18 +1009,17 @@ static struct cftype bfqio_files[] = {
- 	},
- 	{
- 		.name = "bfq.sectors",
--		.private = offsetof(struct bfq_group, stats.sectors),
--		.seq_show = bfqg_print_stat,
-+		.seq_show = bfqg_print_stat_sectors,
- 	},
- 	{
- 		.name = "bfq.io_service_bytes",
--		.private = offsetof(struct bfq_group, stats.service_bytes),
--		.seq_show = bfqg_print_rwstat,
-+		.private = (unsigned long)&blkcg_policy_bfq,
-+		.seq_show = blkg_print_stat_bytes,
- 	},
- 	{
- 		.name = "bfq.io_serviced",
--		.private = offsetof(struct bfq_group, stats.serviced),
--		.seq_show = bfqg_print_rwstat,
-+		.private = (unsigned long)&blkcg_policy_bfq,
-+		.seq_show = blkg_print_stat_ios,
- 	},
- 	{
- 		.name = "bfq.io_service_time",
-@@ -1045,18 +1050,17 @@ static struct cftype bfqio_files[] = {
- 	},
- 	{
- 		.name = "bfq.sectors_recursive",
--		.private = offsetof(struct bfq_group, stats.sectors),
--		.seq_show = bfqg_print_stat_recursive,
-+		.seq_show = bfqg_print_stat_sectors_recursive,
- 	},
- 	{
- 		.name = "bfq.io_service_bytes_recursive",
--		.private = offsetof(struct bfq_group, stats.service_bytes),
--		.seq_show = bfqg_print_rwstat_recursive,
-+		.private = (unsigned long)&blkcg_policy_bfq,
-+		.seq_show = blkg_print_stat_bytes_recursive,
- 	},
- 	{
- 		.name = "bfq.io_serviced_recursive",
--		.private = offsetof(struct bfq_group, stats.serviced),
--		.seq_show = bfqg_print_rwstat_recursive,
-+		.private = (unsigned long)&blkcg_policy_bfq,
-+		.seq_show = blkg_print_stat_ios_recursive,
- 	},
- 	{
- 		.name = "bfq.io_service_time_recursive",
-@@ -1102,31 +1106,39 @@ static struct cftype bfqio_files[] = {
- 		.private = offsetof(struct bfq_group, stats.dequeue),
- 		.seq_show = bfqg_print_stat,
- 	},
--	{
--		.name = "bfq.unaccounted_time",
--		.private = offsetof(struct bfq_group, stats.unaccounted_time),
--		.seq_show = bfqg_print_stat,
--	},
- 	{ }	/* terminate */
- };
- 
--static struct blkcg_policy blkcg_policy_bfq = {
--	.dfl_cftypes            = bfqio_files_dfl,
--	.legacy_cftypes		= bfqio_files,
--
--	.pd_alloc_fn		= bfq_pd_alloc,
--	.pd_init_fn		= bfq_pd_init,
--	.pd_offline_fn		= bfq_pd_offline,
--	.pd_free_fn		= bfq_pd_free,
--	.pd_reset_stats_fn	= bfq_pd_reset_stats,
--
--	.cpd_alloc_fn		= bfq_cpd_alloc,
--	.cpd_init_fn		= bfq_cpd_init,
--	.cpd_bind_fn		= bfq_cpd_init,
--	.cpd_free_fn		= bfq_cpd_free,
-+static struct cftype bfq_blkg_files[] = {
-+	{
-+		.name = "bfq.weight",
-+		.flags = CFTYPE_NOT_ON_ROOT,
-+		.seq_show = bfq_io_show_weight,
-+		.write = bfq_io_set_weight,
-+	},
-+	{} /* terminate */
- };
- 
--#else
-+#else /* CONFIG_BFQ_GROUP_IOSCHED */
-+
-+static inline void bfqg_stats_update_io_add(struct bfq_group *bfqg,
-+			struct bfq_queue *bfqq, int op, int op_flags) { }
-+static inline void
-+bfqg_stats_update_io_remove(struct bfq_group *bfqg, int op, int op_flags) { }
-+static inline void
-+bfqg_stats_update_io_merged(struct bfq_group *bfqg, int op, int op_flags) { }
-+static inline void bfqg_stats_update_completion(struct bfq_group *bfqg,
-+			uint64_t start_time, uint64_t io_start_time, int op,
-+			int op_flags) { }
-+static inline void
-+bfqg_stats_set_start_group_wait_time(struct bfq_group *bfqg,
-+				     struct bfq_group *curr_bfqg) { }
-+static inline void bfqg_stats_end_empty_time(struct bfqg_stats *stats) { }
-+static inline void bfqg_stats_update_dequeue(struct bfq_group *bfqg) { }
-+static inline void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg) { }
-+static inline void bfqg_stats_update_idle_time(struct bfq_group *bfqg) { }
-+static inline void bfqg_stats_set_start_idle_time(struct bfq_group *bfqg) { }
-+static inline void bfqg_stats_update_avg_queue_size(struct bfq_group *bfqg) { }
- 
- static void bfq_init_entity(struct bfq_entity *entity,
- 			    struct bfq_group *bfqg)
-@@ -1150,27 +1162,20 @@ bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio)
- 	return bfqd->root_group;
- }
- 
--static void bfq_bfqq_move(struct bfq_data *bfqd,
--			  struct bfq_queue *bfqq,
--			  struct bfq_entity *entity,
--			  struct bfq_group *bfqg)
--{
--}
--
- static void bfq_end_wr_async(struct bfq_data *bfqd)
- {
- 	bfq_end_wr_async_queues(bfqd, bfqd->root_group);
- }
- 
--static void bfq_disconnect_groups(struct bfq_data *bfqd)
-+static struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,
-+					    struct blkcg *blkcg)
- {
--	bfq_put_async_queues(bfqd, bfqd->root_group);
-+	return bfqd->root_group;
- }
- 
--static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd,
--					      struct blkcg *blkcg)
-+static struct bfq_group *bfqq_group(struct bfq_queue *bfqq)
- {
--	return bfqd->root_group;
-+	return bfqq->bfqd->root_group;
- }
- 
- static struct bfq_group *
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index cf3e9b1..eef6ff4 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -7,25 +7,28 @@
-  * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-  *		      Paolo Valente <paolo.valente@unimore.it>
-  *
-- * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ * Copyright (C) 2015 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2016 Paolo Valente <paolo.valente@linaro.org>
-  *
-  * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ
-  * file.
-  *
-- * BFQ is a proportional-share storage-I/O scheduling algorithm based on
-- * the slice-by-slice service scheme of CFQ. But BFQ assigns budgets,
-- * measured in number of sectors, to processes instead of time slices. The
-- * device is not granted to the in-service process for a given time slice,
-- * but until it has exhausted its assigned budget. This change from the time
-- * to the service domain allows BFQ to distribute the device throughput
-- * among processes as desired, without any distortion due to ZBR, workload
-- * fluctuations or other factors. BFQ uses an ad hoc internal scheduler,
-- * called B-WF2Q+, to schedule processes according to their budgets. More
-- * precisely, BFQ schedules queues associated to processes. Thanks to the
-- * accurate policy of B-WF2Q+, BFQ can afford to assign high budgets to
-- * I/O-bound processes issuing sequential requests (to boost the
-- * throughput), and yet guarantee a low latency to interactive and soft
-- * real-time applications.
-+ * BFQ is a proportional-share storage-I/O scheduling algorithm based
-+ * on the slice-by-slice service scheme of CFQ. But BFQ assigns
-+ * budgets, measured in number of sectors, to processes instead of
-+ * time slices. The device is not granted to the in-service process
-+ * for a given time slice, but until it has exhausted its assigned
-+ * budget. This change from the time to the service domain enables BFQ
-+ * to distribute the device throughput among processes as desired,
-+ * without any distortion due to throughput fluctuations, or to device
-+ * internal queueing. BFQ uses an ad hoc internal scheduler, called
-+ * B-WF2Q+, to schedule processes according to their budgets. More
-+ * precisely, BFQ schedules queues associated with processes. Thanks to
-+ * the accurate policy of B-WF2Q+, BFQ can afford to assign high
-+ * budgets to I/O-bound processes issuing sequential requests (to
-+ * boost the throughput), and yet guarantee a low latency to
-+ * interactive and soft real-time applications.
-  *
-  * BFQ is described in [1], where also a reference to the initial, more
-  * theoretical paper on BFQ can be found. The interested reader can find
-@@ -70,8 +73,8 @@
- #include "bfq.h"
- #include "blk.h"
- 
--/* Expiration time of sync (0) and async (1) requests, in jiffies. */
--static const int bfq_fifo_expire[2] = { HZ / 4, HZ / 8 };
-+/* Expiration time of sync (0) and async (1) requests, in ns. */
-+static const u64 bfq_fifo_expire[2] = { NSEC_PER_SEC / 4, NSEC_PER_SEC / 8 };
- 
- /* Maximum backwards seek, in KiB. */
- static const int bfq_back_max = 16 * 1024;
-@@ -79,15 +82,14 @@ static const int bfq_back_max = 16 * 1024;
- /* Penalty of a backwards seek, in number of sectors. */
- static const int bfq_back_penalty = 2;
- 
--/* Idling period duration, in jiffies. */
--static int bfq_slice_idle = HZ / 125;
-+/* Idling period duration, in ns. */
-+static u32 bfq_slice_idle = NSEC_PER_SEC / 125;
- 
- /* Minimum number of assigned budgets for which stats are safe to compute. */
- static const int bfq_stats_min_budgets = 194;
- 
- /* Default maximum budget values, in sectors and number of requests. */
- static const int bfq_default_max_budget = 16 * 1024;
--static const int bfq_max_budget_async_rq = 4;
- 
- /*
-  * Async to sync throughput distribution is controlled as follows:
-@@ -97,23 +99,27 @@ static const int bfq_max_budget_async_rq = 4;
- static const int bfq_async_charge_factor = 10;
- 
- /* Default timeout values, in jiffies, approximating CFQ defaults. */
--static const int bfq_timeout_sync = HZ / 8;
--static int bfq_timeout_async = HZ / 25;
-+static const int bfq_timeout = HZ / 8;
- 
- struct kmem_cache *bfq_pool;
- 
--/* Below this threshold (in ms), we consider thinktime immediate. */
--#define BFQ_MIN_TT		2
-+/* Below this threshold (in ns), we consider thinktime immediate. */
-+#define BFQ_MIN_TT		(2 * NSEC_PER_MSEC)
- 
- /* hw_tag detection: parallel requests threshold and min samples needed. */
- #define BFQ_HW_QUEUE_THRESHOLD	4
- #define BFQ_HW_QUEUE_SAMPLES	32
- 
--#define BFQQ_SEEK_THR	 (sector_t)(8 * 1024)
--#define BFQQ_SEEKY(bfqq) ((bfqq)->seek_mean > BFQQ_SEEK_THR)
-+#define BFQQ_SEEK_THR		(sector_t)(8 * 100)
-+#define BFQQ_CLOSE_THR		(sector_t)(8 * 1024)
-+#define BFQQ_SEEKY(bfqq)	(hweight32(bfqq->seek_history) > 32/8)
- 
--/* Min samples used for peak rate estimation (for autotuning). */
--#define BFQ_PEAK_RATE_SAMPLES	32
-+/* Min number of samples required to perform peak-rate update */
-+#define BFQ_RATE_MIN_SAMPLES	32
-+/* Min observation time interval required to perform a peak-rate update (ns) */
-+#define BFQ_RATE_MIN_INTERVAL	300*NSEC_PER_MSEC
-+/* Target observation time interval for a peak-rate update (ns) */
-+#define BFQ_RATE_REF_INTERVAL	NSEC_PER_SEC
- 
- /* Shift used for peak rate fixed precision calculations. */
- #define BFQ_RATE_SHIFT		16
-@@ -141,16 +147,24 @@ struct kmem_cache *bfq_pool;
-  * The device's speed class is dynamically (re)detected in
-  * bfq_update_peak_rate() every time the estimated peak rate is updated.
-  *
-- * In the following definitions, R_slow[0]/R_fast[0] and T_slow[0]/T_fast[0]
-- * are the reference values for a slow/fast rotational device, whereas
-- * R_slow[1]/R_fast[1] and T_slow[1]/T_fast[1] are the reference values for
-- * a slow/fast non-rotational device. Finally, device_speed_thresh are the
-- * thresholds used to switch between speed classes.
-+ * In the following definitions, R_slow[0]/R_fast[0] and
-+ * T_slow[0]/T_fast[0] are the reference values for a slow/fast
-+ * rotational device, whereas R_slow[1]/R_fast[1] and
-+ * T_slow[1]/T_fast[1] are the reference values for a slow/fast
-+ * non-rotational device. Finally, device_speed_thresh are the
-+ * thresholds used to switch between speed classes. The reference
-+ * rates are not the actual peak rates of the devices used as a
-+ * reference, but slightly lower values. The reason for using these
-+ * slightly lower values is that the peak-rate estimator tends to
-+ * yield slightly lower values than the actual peak rate (it can yield
-+ * the actual peak rate only if there is only one process doing I/O,
-+ * and the process does sequential I/O).
-+ *
-  * Both the reference peak rates and the thresholds are measured in
-  * sectors/usec, left-shifted by BFQ_RATE_SHIFT.
-  */
--static int R_slow[2] = {1536, 10752};
--static int R_fast[2] = {17415, 34791};
-+static int R_slow[2] = {1000, 10700};
-+static int R_fast[2] = {14000, 33000};
- /*
-  * To improve readability, a conversion function is used to initialize the
-  * following arrays, which entails that they can be initialized only in a
-@@ -183,10 +197,7 @@ static void bfq_schedule_dispatch(struct bfq_data *bfqd);
-  */
- static int bfq_bio_sync(struct bio *bio)
- {
--	if (bio_data_dir(bio) == READ || (bio->bi_rw & REQ_SYNC))
--		return 1;
--
--	return 0;
-+	return bio_data_dir(bio) == READ || (bio->bi_opf & REQ_SYNC);
- }
- 
- /*
-@@ -409,11 +420,7 @@ static bool bfq_differentiated_weights(struct bfq_data *bfqd)
-  */
- static bool bfq_symmetric_scenario(struct bfq_data *bfqd)
- {
--	return
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
--		!bfqd->active_numerous_groups &&
--#endif
--		!bfq_differentiated_weights(bfqd);
-+	return !bfq_differentiated_weights(bfqd);
- }
- 
- /*
-@@ -533,9 +540,19 @@ static struct request *bfq_find_next_rq(struct bfq_data *bfqd,
- static unsigned long bfq_serv_to_charge(struct request *rq,
- 					struct bfq_queue *bfqq)
- {
--	return blk_rq_sectors(rq) *
--		(1 + ((!bfq_bfqq_sync(bfqq)) * (bfqq->wr_coeff == 1) *
--		bfq_async_charge_factor));
-+	if (bfq_bfqq_sync(bfqq) || bfqq->wr_coeff > 1)
-+		return blk_rq_sectors(rq);
-+
-+	/*
-+	 * If there are no weight-raised queues, then amplify service
-+	 * by just the async charge factor; otherwise amplify service
-+	 * by twice the async charge factor, to further reduce latency
-+	 * for weight-raised queues.
-+	 */
-+	if (bfqq->bfqd->wr_busy_queues == 0)
-+		return blk_rq_sectors(rq) * bfq_async_charge_factor;
-+
-+	return blk_rq_sectors(rq) * 2 * bfq_async_charge_factor;
- }
- 
- /**
-@@ -590,12 +607,23 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd)
- 	dur = bfqd->RT_prod;
- 	do_div(dur, bfqd->peak_rate);
- 
--	return dur;
--}
-+	/*
-+	 * Limit duration between 3 and 13 seconds. Tests show that
-+	 * higher values than 13 seconds often yield the opposite of
-+	 * the desired result, i.e., worsen responsiveness by letting
-+	 * non-interactive and non-soft-real-time applications
-+	 * preserve weight raising for a too long time interval.
-+	 *
-+	 * On the other end, lower values than 3 seconds make it
-+	 * difficult for most interactive tasks to complete their jobs
-+	 * before weight-raising finishes.
-+	 */
-+	if (dur > msecs_to_jiffies(13000))
-+		dur = msecs_to_jiffies(13000);
-+	else if (dur < msecs_to_jiffies(3000))
-+		dur = msecs_to_jiffies(3000);
- 
--static unsigned int bfq_bfqq_cooperations(struct bfq_queue *bfqq)
--{
--	return bfqq->bic ? bfqq->bic->cooperations : 0;
-+	return dur;
- }
- 
- static void
-@@ -605,31 +633,28 @@ bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
- 		bfq_mark_bfqq_idle_window(bfqq);
- 	else
- 		bfq_clear_bfqq_idle_window(bfqq);
-+
- 	if (bic->saved_IO_bound)
- 		bfq_mark_bfqq_IO_bound(bfqq);
- 	else
- 		bfq_clear_bfqq_IO_bound(bfqq);
--	/* Assuming that the flag in_large_burst is already correctly set */
--	if (bic->wr_time_left && bfqq->bfqd->low_latency &&
--	    !bfq_bfqq_in_large_burst(bfqq) &&
--	    bic->cooperations < bfqq->bfqd->bfq_coop_thresh) {
--		/*
--		 * Start a weight raising period with the duration given by
--		 * the raising_time_left snapshot.
--		 */
--		if (bfq_bfqq_busy(bfqq))
--			bfqq->bfqd->wr_busy_queues++;
--		bfqq->wr_coeff = bfqq->bfqd->bfq_wr_coeff;
--		bfqq->wr_cur_max_time = bic->wr_time_left;
--		bfqq->last_wr_start_finish = jiffies;
--		bfqq->entity.prio_changed = 1;
-+
-+	bfqq->wr_coeff = bic->saved_wr_coeff;
-+	bfqq->wr_start_at_switch_to_srt = bic->saved_wr_start_at_switch_to_srt;
-+	BUG_ON(time_is_after_jiffies(bfqq->wr_start_at_switch_to_srt));
-+	bfqq->last_wr_start_finish = bic->saved_last_wr_start_finish;
-+	BUG_ON(time_is_after_jiffies(bfqq->last_wr_start_finish));
-+
-+	if (bfqq->wr_coeff > 1 && (bfq_bfqq_in_large_burst(bfqq) ||
-+	    time_is_before_jiffies(bfqq->last_wr_start_finish +
-+				   bfqq->wr_cur_max_time))) {
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+		    "resume state: switching off wr");
-+
-+		bfqq->wr_coeff = 1;
- 	}
--	/*
--	 * Clear wr_time_left to prevent bfq_bfqq_save_state() from
--	 * getting confused about the queue's need of a weight-raising
--	 * period.
--	 */
--	bic->wr_time_left = 0;
-+	/* make sure weight will be updated, however we got here */
-+	bfqq->entity.prio_changed = 1;
- }
- 
- static int bfqq_process_refs(struct bfq_queue *bfqq)
-@@ -639,7 +664,7 @@ static int bfqq_process_refs(struct bfq_queue *bfqq)
- 	lockdep_assert_held(bfqq->bfqd->queue->queue_lock);
- 
- 	io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE];
--	process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st;
-+	process_refs = bfqq->ref - io_refs - bfqq->entity.on_st;
- 	BUG_ON(process_refs < 0);
- 	return process_refs;
- }
-@@ -654,6 +679,7 @@ static void bfq_reset_burst_list(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		hlist_del_init(&item->burst_list_node);
- 	hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
- 	bfqd->burst_size = 1;
-+	bfqd->burst_parent_entity = bfqq->entity.parent;
- }
- 
- /* Add bfqq to the list of queues in current burst (see bfq_handle_burst) */
-@@ -662,6 +688,10 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 	/* Increment burst size to take into account also bfqq */
- 	bfqd->burst_size++;
- 
-+	bfq_log_bfqq(bfqd, bfqq, "add_to_burst %d", bfqd->burst_size);
-+
-+	BUG_ON(bfqd->burst_size > bfqd->bfq_large_burst_thresh);
-+
- 	if (bfqd->burst_size == bfqd->bfq_large_burst_thresh) {
- 		struct bfq_queue *pos, *bfqq_item;
- 		struct hlist_node *n;
-@@ -671,15 +701,19 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		 * other to consider this burst as large.
- 		 */
- 		bfqd->large_burst = true;
-+		bfq_log_bfqq(bfqd, bfqq, "add_to_burst: large burst started");
- 
- 		/*
- 		 * We can now mark all queues in the burst list as
- 		 * belonging to a large burst.
- 		 */
- 		hlist_for_each_entry(bfqq_item, &bfqd->burst_list,
--				     burst_list_node)
-+				     burst_list_node) {
- 			bfq_mark_bfqq_in_large_burst(bfqq_item);
-+			bfq_log_bfqq(bfqd, bfqq_item, "marked in large burst");
-+		}
- 		bfq_mark_bfqq_in_large_burst(bfqq);
-+		bfq_log_bfqq(bfqd, bfqq, "marked in large burst");
- 
- 		/*
- 		 * From now on, and until the current burst finishes, any
-@@ -691,67 +725,79 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		hlist_for_each_entry_safe(pos, n, &bfqd->burst_list,
- 					  burst_list_node)
- 			hlist_del_init(&pos->burst_list_node);
--	} else /* burst not yet large: add bfqq to the burst list */
-+	} else /*
-+		* Burst not yet large: add bfqq to the burst list. Do
-+		* not increment the ref counter for bfqq, because bfqq
-+		* is removed from the burst list before freeing bfqq
-+		* in put_queue.
-+		*/
- 		hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list);
- }
- 
- /*
-- * If many queues happen to become active shortly after each other, then,
-- * to help the processes associated to these queues get their job done as
-- * soon as possible, it is usually better to not grant either weight-raising
-- * or device idling to these queues. In this comment we describe, firstly,
-- * the reasons why this fact holds, and, secondly, the next function, which
-- * implements the main steps needed to properly mark these queues so that
-- * they can then be treated in a different way.
-+ * If many queues belonging to the same group happen to be created
-+ * shortly after each other, then the processes associated with these
-+ * queues have typically a common goal. In particular, bursts of queue
-+ * creations are usually caused by services or applications that spawn
-+ * many parallel threads/processes. Examples are systemd during boot,
-+ * or git grep. To help these processes get their job done as soon as
-+ * possible, it is usually better to not grant either weight-raising
-+ * or device idling to their queues.
-  *
-- * As for the terminology, we say that a queue becomes active, i.e.,
-- * switches from idle to backlogged, either when it is created (as a
-- * consequence of the arrival of an I/O request), or, if already existing,
-- * when a new request for the queue arrives while the queue is idle.
-- * Bursts of activations, i.e., activations of different queues occurring
-- * shortly after each other, are typically caused by services or applications
-- * that spawn or reactivate many parallel threads/processes. Examples are
-- * systemd during boot or git grep.
-+ * In this comment we describe, firstly, the reasons why this fact
-+ * holds, and, secondly, the next function, which implements the main
-+ * steps needed to properly mark these queues so that they can then be
-+ * treated in a different way.
-  *
-- * These services or applications benefit mostly from a high throughput:
-- * the quicker the requests of the activated queues are cumulatively served,
-- * the sooner the target job of these queues gets completed. As a consequence,
-- * weight-raising any of these queues, which also implies idling the device
-- * for it, is almost always counterproductive: in most cases it just lowers
-- * throughput.
-+ * The above services or applications benefit mostly from a high
-+ * throughput: the quicker the requests of the activated queues are
-+ * cumulatively served, the sooner the target job of these queues gets
-+ * completed. As a consequence, weight-raising any of these queues,
-+ * which also implies idling the device for it, is almost always
-+ * counterproductive. In most cases it just lowers throughput.
-  *
-- * On the other hand, a burst of activations may be also caused by the start
-- * of an application that does not consist in a lot of parallel I/O-bound
-- * threads. In fact, with a complex application, the burst may be just a
-- * consequence of the fact that several processes need to be executed to
-- * start-up the application. To start an application as quickly as possible,
-- * the best thing to do is to privilege the I/O related to the application
-- * with respect to all other I/O. Therefore, the best strategy to start as
-- * quickly as possible an application that causes a burst of activations is
-- * to weight-raise all the queues activated during the burst. This is the
-+ * On the other hand, a burst of queue creations may be caused also by
-+ * the start of an application that does not consist of a lot of
-+ * parallel I/O-bound threads. In fact, with a complex application,
-+ * several short processes may need to be executed to start-up the
-+ * application. In this respect, to start an application as quickly as
-+ * possible, the best thing to do is in any case to privilege the I/O
-+ * related to the application with respect to all other
-+ * I/O. Therefore, the best strategy to start as quickly as possible
-+ * an application that causes a burst of queue creations is to
-+ * weight-raise all the queues created during the burst. This is the
-  * exact opposite of the best strategy for the other type of bursts.
-  *
-- * In the end, to take the best action for each of the two cases, the two
-- * types of bursts need to be distinguished. Fortunately, this seems
-- * relatively easy to do, by looking at the sizes of the bursts. In
-- * particular, we found a threshold such that bursts with a larger size
-- * than that threshold are apparently caused only by services or commands
-- * such as systemd or git grep. For brevity, hereafter we call just 'large'
-- * these bursts. BFQ *does not* weight-raise queues whose activations occur
-- * in a large burst. In addition, for each of these queues BFQ performs or
-- * does not perform idling depending on which choice boosts the throughput
-- * most. The exact choice depends on the device and request pattern at
-+ * In the end, to take the best action for each of the two cases, the
-+ * two types of bursts need to be distinguished. Fortunately, this
-+ * seems relatively easy, by looking at the sizes of the bursts. In
-+ * particular, we found a threshold such that only bursts with a
-+ * larger size than that threshold are apparently caused by
-+ * services or commands such as systemd or git grep. For brevity,
-+ * hereafter we call just 'large' these bursts. BFQ *does not*
-+ * weight-raise queues whose creation occurs in a large burst. In
-+ * addition, for each of these queues BFQ performs or does not perform
-+ * idling depending on which choice boosts the throughput more. The
-+ * exact choice depends on the device and request pattern at
-  * hand.
-  *
-- * Turning back to the next function, it implements all the steps needed
-- * to detect the occurrence of a large burst and to properly mark all the
-- * queues belonging to it (so that they can then be treated in a different
-- * way). This goal is achieved by maintaining a special "burst list" that
-- * holds, temporarily, the queues that belong to the burst in progress. The
-- * list is then used to mark these queues as belonging to a large burst if
-- * the burst does become large. The main steps are the following.
-+ * Unfortunately, false positives may occur while an interactive task
-+ * is starting (e.g., an application is being started). The
-+ * consequence is that the queues associated with the task do not
-+ * enjoy weight raising as expected. Fortunately these false positives
-+ * are very rare. They typically occur if some service happens to
-+ * start doing I/O exactly when the interactive task starts.
-  *
-- * . when the very first queue is activated, the queue is inserted into the
-+ * Turning back to the next function, it implements all the steps
-+ * needed to detect the occurrence of a large burst and to properly
-+ * mark all the queues belonging to it (so that they can then be
-+ * treated in a different way). This goal is achieved by maintaining a
-+ * "burst list" that holds, temporarily, the queues that belong to the
-+ * burst in progress. The list is then used to mark these queues as
-+ * belonging to a large burst if the burst does become large. The main
-+ * steps are the following.
-+ *
-+ * . when the very first queue is created, the queue is inserted into the
-  *   list (as it could be the first queue in a possible burst)
-  *
-  * . if the current burst has not yet become large, and a queue Q that does
-@@ -772,13 +818,13 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-  *
-  *     . the device enters a large-burst mode
-  *
-- * . if a queue Q that does not belong to the burst is activated while
-+ * . if a queue Q that does not belong to the burst is created while
-  *   the device is in large-burst mode and shortly after the last time
-  *   at which a queue either entered the burst list or was marked as
-  *   belonging to the current large burst, then Q is immediately marked
-  *   as belonging to a large burst.
-  *
-- * . if a queue Q that does not belong to the burst is activated a while
-+ * . if a queue Q that does not belong to the burst is created a while
-  *   later, i.e., not shortly after, than the last time at which a queue
-  *   either entered the burst list or was marked as belonging to the
-  *   current large burst, then the current burst is deemed as finished and:
-@@ -791,52 +837,44 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
-  *          in a possible new burst (then the burst list contains just Q
-  *          after this step).
-  */
--static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq,
--			     bool idle_for_long_time)
-+static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
- 	/*
--	 * If bfqq happened to be activated in a burst, but has been idle
--	 * for at least as long as an interactive queue, then we assume
--	 * that, in the overall I/O initiated in the burst, the I/O
--	 * associated to bfqq is finished. So bfqq does not need to be
--	 * treated as a queue belonging to a burst anymore. Accordingly,
--	 * we reset bfqq's in_large_burst flag if set, and remove bfqq
--	 * from the burst list if it's there. We do not decrement instead
--	 * burst_size, because the fact that bfqq does not need to belong
--	 * to the burst list any more does not invalidate the fact that
--	 * bfqq may have been activated during the current burst.
--	 */
--	if (idle_for_long_time) {
--		hlist_del_init(&bfqq->burst_list_node);
--		bfq_clear_bfqq_in_large_burst(bfqq);
--	}
--
--	/*
- 	 * If bfqq is already in the burst list or is part of a large
--	 * burst, then there is nothing else to do.
-+	 * burst, or finally has just been split, then there is
-+	 * nothing else to do.
- 	 */
- 	if (!hlist_unhashed(&bfqq->burst_list_node) ||
--	    bfq_bfqq_in_large_burst(bfqq))
-+	    bfq_bfqq_in_large_burst(bfqq) ||
-+	    time_is_after_eq_jiffies(bfqq->split_time +
-+				     msecs_to_jiffies(10)))
- 		return;
- 
- 	/*
--	 * If bfqq's activation happens late enough, then the current
--	 * burst is finished, and related data structures must be reset.
-+	 * If bfqq's creation happens late enough, or bfqq belongs to
-+	 * a different group than the burst group, then the current
-+	 * burst is finished, and related data structures must be
-+	 * reset.
- 	 *
--	 * In this respect, consider the special case where bfqq is the very
--	 * first queue being activated. In this case, last_ins_in_burst is
--	 * not yet significant when we get here. But it is easy to verify
--	 * that, whether or not the following condition is true, bfqq will
--	 * end up being inserted into the burst list. In particular the
--	 * list will happen to contain only bfqq. And this is exactly what
--	 * has to happen, as bfqq may be the first queue in a possible
-+	 * In this respect, consider the special case where bfqq is
-+	 * the very first queue created after BFQ is selected for this
-+	 * device. In this case, last_ins_in_burst and
-+	 * burst_parent_entity are not yet significant when we get
-+	 * here. But it is easy to verify that, whether or not the
-+	 * following condition is true, bfqq will end up being
-+	 * inserted into the burst list. In particular the list will
-+	 * happen to contain only bfqq. And this is exactly what has
-+	 * to happen, as bfqq may be the first queue of the first
- 	 * burst.
- 	 */
- 	if (time_is_before_jiffies(bfqd->last_ins_in_burst +
--	    bfqd->bfq_burst_interval)) {
-+	    bfqd->bfq_burst_interval) ||
-+	    bfqq->entity.parent != bfqd->burst_parent_entity) {
- 		bfqd->large_burst = false;
- 		bfq_reset_burst_list(bfqd, bfqq);
--		return;
-+		bfq_log_bfqq(bfqd, bfqq,
-+			"handle_burst: late activation or different group");
-+		goto end;
- 	}
- 
- 	/*
-@@ -845,8 +883,9 @@ static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	 * bfqq as belonging to this large burst immediately.
- 	 */
- 	if (bfqd->large_burst) {
-+		bfq_log_bfqq(bfqd, bfqq, "handle_burst: marked in burst");
- 		bfq_mark_bfqq_in_large_burst(bfqq);
--		return;
-+		goto end;
- 	}
- 
- 	/*
-@@ -855,25 +894,491 @@ static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	 * queue. Then we add bfqq to the burst.
- 	 */
- 	bfq_add_to_burst(bfqd, bfqq);
-+end:
-+	/*
-+	 * At this point, bfqq either has been added to the current
-+	 * burst or has caused the current burst to terminate and a
-+	 * possible new burst to start. In particular, in the second
-+	 * case, bfqq has become the first queue in the possible new
-+	 * burst.  In both cases last_ins_in_burst needs to be moved
-+	 * forward.
-+	 */
-+	bfqd->last_ins_in_burst = jiffies;
-+
-+}
-+
-+static int bfq_bfqq_budget_left(struct bfq_queue *bfqq)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	return entity->budget - entity->service;
-+}
-+
-+/*
-+ * If enough samples have been computed, return the current max budget
-+ * stored in bfqd, which is dynamically updated according to the
-+ * estimated disk peak rate; otherwise return the default max budget
-+ */
-+static int bfq_max_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
-+		return bfq_default_max_budget;
-+	else
-+		return bfqd->bfq_max_budget;
-+}
-+
-+/*
-+ * Return min budget, which is a fraction of the current or default
-+ * max budget (trying with 1/32)
-+ */
-+static int bfq_min_budget(struct bfq_data *bfqd)
-+{
-+	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
-+		return bfq_default_max_budget / 32;
-+	else
-+		return bfqd->bfq_max_budget / 32;
-+}
-+
-+static void bfq_bfqq_expire(struct bfq_data *bfqd,
-+			    struct bfq_queue *bfqq,
-+			    bool compensate,
-+			    enum bfqq_expiration reason);
-+
-+/*
-+ * The next function, invoked after the input queue bfqq switches from
-+ * idle to busy, updates the budget of bfqq. The function also tells
-+ * whether the in-service queue should be expired, by returning
-+ * true. The purpose of expiring the in-service queue is to give bfqq
-+ * the chance to possibly preempt the in-service queue, and the reason
-+ * for preempting the in-service queue is to achieve one of the two
-+ * goals below.
-+ *
-+ * 1. Guarantee to bfqq its reserved bandwidth even if bfqq has
-+ * expired because it has remained idle. In particular, bfqq may have
-+ * expired for one of the following two reasons:
-+ *
-+ * - BFQ_BFQQ_NO_MORE_REQUEST bfqq did not enjoy any device idling and
-+ *   did not make it to issue a new request before its last request
-+ *   was served;
-+ *
-+ * - BFQ_BFQQ_TOO_IDLE bfqq did enjoy device idling, but did not issue
-+ *   a new request before the expiration of the idling-time.
-+ *
-+ * Even if bfqq has expired for one of the above reasons, the process
-+ * associated with the queue may be however issuing requests greedily,
-+ * and thus be sensitive to the bandwidth it receives (bfqq may have
-+ * remained idle for other reasons: CPU high load, bfqq not enjoying
-+ * idling, I/O throttling somewhere in the path from the process to
-+ * the I/O scheduler, ...). But if, after every expiration for one of
-+ * the above two reasons, bfqq has to wait for the service of at least
-+ * one full budget of another queue before being served again, then
-+ * bfqq is likely to get a much lower bandwidth or resource time than
-+ * its reserved ones. To address this issue, two countermeasures need
-+ * to be taken.
-+ *
-+ * First, the budget and the timestamps of bfqq need to be updated in
-+ * a special way on bfqq reactivation: they need to be updated as if
-+ * bfqq did not remain idle and did not expire. In fact, if they are
-+ * computed as if bfqq expired and remained idle until reactivation,
-+ * then the process associated with bfqq is treated as if, instead of
-+ * being greedy, it stopped issuing requests when bfqq remained idle,
-+ * and restarts issuing requests only on this reactivation. In other
-+ * words, the scheduler does not help the process recover the "service
-+ * hole" between bfqq expiration and reactivation. As a consequence,
-+ * the process receives a lower bandwidth than its reserved one. In
-+ * contrast, to recover this hole, the budget must be updated as if
-+ * bfqq was not expired at all before this reactivation, i.e., it must
-+ * be set to the value of the remaining budget when bfqq was
-+ * expired. Along the same line, timestamps need to be assigned the
-+ * value they had the last time bfqq was selected for service, i.e.,
-+ * before last expiration. Thus timestamps need to be back-shifted
-+ * with respect to their normal computation (see [1] for more details
-+ * on this tricky aspect).
-+ *
-+ * Secondly, to allow the process to recover the hole, the in-service
-+ * queue must be expired too, to give bfqq the chance to preempt it
-+ * immediately. In fact, if bfqq has to wait for a full budget of the
-+ * in-service queue to be completed, then it may become impossible to
-+ * let the process recover the hole, even if the back-shifted
-+ * timestamps of bfqq are lower than those of the in-service queue. If
-+ * this happens for most or all of the holes, then the process may not
-+ * receive its reserved bandwidth. In this respect, it is worth noting
-+ * that, being the service of outstanding requests unpreemptible, a
-+ * little fraction of the holes may however be unrecoverable, thereby
-+ * causing a little loss of bandwidth.
-+ *
-+ * The last important point is detecting whether bfqq does need this
-+ * bandwidth recovery. In this respect, the next function deems the
-+ * process associated with bfqq greedy, and thus allows it to recover
-+ * the hole, if: 1) the process is waiting for the arrival of a new
-+ * request (which implies that bfqq expired for one of the above two
-+ * reasons), and 2) such a request has arrived soon. The first
-+ * condition is controlled through the flag non_blocking_wait_rq,
-+ * while the second through the flag arrived_in_time. If both
-+ * conditions hold, then the function computes the budget in the
-+ * above-described special way, and signals that the in-service queue
-+ * should be expired. Timestamp back-shifting is done later in
-+ * __bfq_activate_entity.
-+ *
-+ * 2. Reduce latency. Even if timestamps are not backshifted to let
-+ * the process associated with bfqq recover a service hole, bfqq may
-+ * however happen to have, after being (re)activated, a lower finish
-+ * timestamp than the in-service queue.  That is, the next budget of
-+ * bfqq may have to be completed before the one of the in-service
-+ * queue. If this is the case, then preempting the in-service queue
-+ * allows this goal to be achieved, apart from the unpreemptible,
-+ * outstanding requests mentioned above.
-+ *
-+ * Unfortunately, regardless of which of the above two goals one wants
-+ * to achieve, service trees need first to be updated to know whether
-+ * the in-service queue must be preempted. To have service trees
-+ * correctly updated, the in-service queue must be expired and
-+ * rescheduled, and bfqq must be scheduled too. This is one of the
-+ * most costly operations (in future versions, the scheduling
-+ * mechanism may be re-designed in such a way to make it possible to
-+ * know whether preemption is needed without needing to update service
-+ * trees). In addition, queue preemptions almost always cause random
-+ * I/O, and thus loss of throughput. Because of these facts, the next
-+ * function adopts the following simple scheme to avoid both costly
-+ * operations and too frequent preemptions: it requests the expiration
-+ * of the in-service queue (unconditionally) only for queues that need
-+ * to recover a hole, or that either are weight-raised or deserve to
-+ * be weight-raised.
-+ */
-+static bool bfq_bfqq_update_budg_for_activation(struct bfq_data *bfqd,
-+						struct bfq_queue *bfqq,
-+						bool arrived_in_time,
-+						bool wr_or_deserves_wr)
-+{
-+	struct bfq_entity *entity = &bfqq->entity;
-+
-+	if (bfq_bfqq_non_blocking_wait_rq(bfqq) && arrived_in_time) {
-+		/*
-+		 * We do not clear the flag non_blocking_wait_rq here, as
-+		 * the latter is used in bfq_activate_bfqq to signal
-+		 * that timestamps need to be back-shifted (and is
-+		 * cleared right after).
-+		 */
-+
-+		/*
-+		 * In next assignment we rely on that either
-+		 * entity->service or entity->budget are not updated
-+		 * on expiration if bfqq is empty (see
-+		 * __bfq_bfqq_recalc_budget). Thus both quantities
-+		 * remain unchanged after such an expiration, and the
-+		 * following statement therefore assigns to
-+		 * entity->budget the remaining budget on such an
-+		 * expiration. For clarity, entity->service is not
-+		 * updated on expiration in any case, and, in normal
-+		 * operation, is reset only when bfqq is selected for
-+		 * service (see bfq_get_next_queue).
-+		 */
-+		BUG_ON(bfqq->max_budget < 0);
-+		entity->budget = min_t(unsigned long,
-+				       bfq_bfqq_budget_left(bfqq),
-+				       bfqq->max_budget);
-+
-+		BUG_ON(entity->budget < 0);
-+		return true;
-+	}
-+
-+	BUG_ON(bfqq->max_budget < 0);
-+	entity->budget = max_t(unsigned long, bfqq->max_budget,
-+			       bfq_serv_to_charge(bfqq->next_rq, bfqq));
-+	BUG_ON(entity->budget < 0);
-+
-+	bfq_clear_bfqq_non_blocking_wait_rq(bfqq);
-+	return wr_or_deserves_wr;
-+}
-+
-+static void bfq_update_bfqq_wr_on_rq_arrival(struct bfq_data *bfqd,
-+					     struct bfq_queue *bfqq,
-+					     unsigned int old_wr_coeff,
-+					     bool wr_or_deserves_wr,
-+					     bool interactive,
-+					     bool in_burst,
-+					     bool soft_rt)
-+{
-+	if (old_wr_coeff == 1 && wr_or_deserves_wr) {
-+		/* start a weight-raising period */
-+		if (interactive) {
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+		} else {
-+			bfqq->wr_start_at_switch_to_srt = jiffies;
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff *
-+				BFQ_SOFTRT_WEIGHT_FACTOR;
-+			bfqq->wr_cur_max_time =
-+				bfqd->bfq_wr_rt_max_time;
-+		}
-+		/*
-+		 * If needed, further reduce budget to make sure it is
-+		 * close to bfqq's backlog, so as to reduce the
-+		 * scheduling-error component due to a too large
-+		 * budget. Do not care about throughput consequences,
-+		 * but only about latency. Finally, do not assign a
-+		 * too small budget either, to avoid increasing
-+		 * latency by causing too frequent expirations.
-+		 */
-+		bfqq->entity.budget = min_t(unsigned long,
-+					    bfqq->entity.budget,
-+					    2 * bfq_min_budget(bfqd));
-+
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "wrais starting at %lu, rais_max_time %u",
-+			     jiffies,
-+			     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	} else if (old_wr_coeff > 1) {
-+		if (interactive) { /* update wr coeff and duration */
-+			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+			bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+		} else if (in_burst) {
-+			bfqq->wr_coeff = 1;
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "wrais ending at %lu, rais_max_time %u",
-+				     jiffies,
-+				     jiffies_to_msecs(bfqq->
-+						      wr_cur_max_time));
-+		} else if (soft_rt) {
-+			/*
-+			 * The application is now or still meeting the
-+			 * requirements for being deemed soft rt.  We
-+			 * can then correctly and safely (re)charge
-+			 * the weight-raising duration for the
-+			 * application with the weight-raising
-+			 * duration for soft rt applications.
-+			 *
-+			 * In particular, doing this recharge now, i.e.,
-+			 * before the weight-raising period for the
-+			 * application finishes, reduces the probability
-+			 * of the following negative scenario:
-+			 * 1) the weight of a soft rt application is
-+			 *    raised at startup (as for any newly
-+			 *    created application),
-+			 * 2) since the application is not interactive,
-+			 *    at a certain time weight-raising is
-+			 *    stopped for the application,
-+			 * 3) at that time the application happens to
-+			 *    still have pending requests, and hence
-+			 *    is destined to not have a chance to be
-+			 *    deemed soft rt before these requests are
-+			 *    completed (see the comments to the
-+			 *    function bfq_bfqq_softrt_next_start()
-+			 *    for details on soft rt detection),
-+			 * 4) these pending requests experience a high
-+			 *    latency because the application is not
-+			 *    weight-raised while they are pending.
-+			 */
-+			if (bfqq->wr_cur_max_time !=
-+				bfqd->bfq_wr_rt_max_time) {
-+				bfqq->wr_start_at_switch_to_srt =
-+					bfqq->last_wr_start_finish;
-+                BUG_ON(time_is_after_jiffies(bfqq->last_wr_start_finish));
-+
-+				bfqq->wr_cur_max_time =
-+					bfqd->bfq_wr_rt_max_time;
-+				bfqq->wr_coeff = bfqd->bfq_wr_coeff *
-+					BFQ_SOFTRT_WEIGHT_FACTOR;
-+				bfq_log_bfqq(bfqd, bfqq,
-+					     "switching to soft_rt wr");
-+			} else
-+				bfq_log_bfqq(bfqd, bfqq,
-+					"moving forward soft_rt wr duration");
-+			bfqq->last_wr_start_finish = jiffies;
-+		}
-+	}
-+}
-+
-+static bool bfq_bfqq_idle_for_long_time(struct bfq_data *bfqd,
-+					struct bfq_queue *bfqq)
-+{
-+	return bfqq->dispatched == 0 &&
-+		time_is_before_jiffies(
-+			bfqq->budget_timeout +
-+			bfqd->bfq_wr_min_idle_time);
-+}
-+
-+static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd,
-+					     struct bfq_queue *bfqq,
-+					     int old_wr_coeff,
-+					     struct request *rq,
-+					     bool *interactive)
-+{
-+	bool soft_rt, in_burst,	wr_or_deserves_wr,
-+		bfqq_wants_to_preempt,
-+		idle_for_long_time = bfq_bfqq_idle_for_long_time(bfqd, bfqq),
-+		/*
-+		 * See the comments on
-+		 * bfq_bfqq_update_budg_for_activation for
-+		 * details on the usage of the next variable.
-+		 */
-+		arrived_in_time =  ktime_get_ns() <=
-+			RQ_BIC(rq)->ttime.last_end_request +
-+			bfqd->bfq_slice_idle * 3;
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		     "bfq_add_request non-busy: "
-+		     "jiffies %lu, in_time %d, idle_long %d busyw %d "
-+		     "wr_coeff %u",
-+		     jiffies, arrived_in_time,
-+		     idle_for_long_time,
-+		     bfq_bfqq_non_blocking_wait_rq(bfqq),
-+		     old_wr_coeff);
-+
-+	BUG_ON(bfqq->entity.budget < bfqq->entity.service);
-+
-+	BUG_ON(bfqq == bfqd->in_service_queue);
-+	bfqg_stats_update_io_add(bfqq_group(RQ_BFQQ(rq)), bfqq,
-+				 req_op(rq), rq->cmd_flags);
-+
-+	/*
-+	 * bfqq deserves to be weight-raised if:
-+	 * - it is sync,
-+	 * - it does not belong to a large burst,
-+	 * - it has been idle for enough time or is soft real-time,
-+	 * - is linked to a bfq_io_cq (it is not shared in any sense)
-+	 */
-+	in_burst = bfq_bfqq_in_large_burst(bfqq);
-+	soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
-+		!in_burst &&
-+		time_is_before_jiffies(bfqq->soft_rt_next_start);
-+	*interactive =
-+		!in_burst &&
-+		idle_for_long_time;
-+	wr_or_deserves_wr = bfqd->low_latency &&
-+		(bfqq->wr_coeff > 1 ||
-+		 (bfq_bfqq_sync(bfqq) &&
-+		  bfqq->bic && (*interactive || soft_rt)));
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		     "bfq_add_request: "
-+		     "in_burst %d, "
-+		     "soft_rt %d (next %lu), inter %d, bic %p",
-+		     bfq_bfqq_in_large_burst(bfqq), soft_rt,
-+		     bfqq->soft_rt_next_start,
-+		     *interactive,
-+		     bfqq->bic);
-+
-+	/*
-+	 * Using the last flag, update budget and check whether bfqq
-+	 * may want to preempt the in-service queue.
-+	 */
-+	bfqq_wants_to_preempt =
-+		bfq_bfqq_update_budg_for_activation(bfqd, bfqq,
-+						    arrived_in_time,
-+						    wr_or_deserves_wr);
-+
-+	/*
-+	 * If bfqq happened to be activated in a burst, but has been
-+	 * idle for much more than an interactive queue, then we
-+	 * assume that, in the overall I/O initiated in the burst, the
-+	 * I/O associated with bfqq is finished. So bfqq does not need
-+	 * to be treated as a queue belonging to a burst
-+	 * anymore. Accordingly, we reset bfqq's in_large_burst flag
-+	 * if set, and remove bfqq from the burst list if it's
-+	 * there. We do not decrement burst_size, because the fact
-+	 * that bfqq does not need to belong to the burst list any
-+	 * more does not invalidate the fact that bfqq was created in
-+	 * a burst.
-+	 */
-+	if (likely(!bfq_bfqq_just_created(bfqq)) &&
-+	    idle_for_long_time &&
-+	    time_is_before_jiffies(
-+		    bfqq->budget_timeout +
-+		    msecs_to_jiffies(10000))) {
-+		hlist_del_init(&bfqq->burst_list_node);
-+		bfq_clear_bfqq_in_large_burst(bfqq);
-+	}
-+
-+	bfq_clear_bfqq_just_created(bfqq);
-+
-+	if (!bfq_bfqq_IO_bound(bfqq)) {
-+		if (arrived_in_time) {
-+			bfqq->requests_within_timer++;
-+			if (bfqq->requests_within_timer >=
-+			    bfqd->bfq_requests_within_timer)
-+				bfq_mark_bfqq_IO_bound(bfqq);
-+		} else
-+			bfqq->requests_within_timer = 0;
-+		bfq_log_bfqq(bfqd, bfqq, "requests in time %d",
-+			     bfqq->requests_within_timer);
-+	}
-+
-+	if (bfqd->low_latency) {
-+		if (unlikely(time_is_after_jiffies(bfqq->split_time)))
-+			/* wraparound */
-+			bfqq->split_time =
-+				jiffies - bfqd->bfq_wr_min_idle_time - 1;
-+
-+		if (time_is_before_jiffies(bfqq->split_time +
-+					   bfqd->bfq_wr_min_idle_time)) {
-+			bfq_update_bfqq_wr_on_rq_arrival(bfqd, bfqq,
-+							 old_wr_coeff,
-+							 wr_or_deserves_wr,
-+							 *interactive,
-+							 in_burst,
-+							 soft_rt);
-+
-+			if (old_wr_coeff != bfqq->wr_coeff)
-+				bfqq->entity.prio_changed = 1;
-+		}
-+	}
-+
-+	bfqq->last_idle_bklogged = jiffies;
-+	bfqq->service_from_backlogged = 0;
-+	bfq_clear_bfqq_softrt_update(bfqq);
-+
-+	bfq_add_bfqq_busy(bfqd, bfqq);
-+
-+	/*
-+	 * Expire in-service queue only if preemption may be needed
-+	 * for guarantees. In this respect, the function
-+	 * next_queue_may_preempt just checks a simple, necessary
-+	 * condition, and not a sufficient condition based on
-+	 * timestamps. In fact, for the latter condition to be
-+	 * evaluated, timestamps would need first to be updated, and
-+	 * this operation is quite costly (see the comments on the
-+	 * function bfq_bfqq_update_budg_for_activation).
-+	 */
-+	if (bfqd->in_service_queue && bfqq_wants_to_preempt &&
-+	    bfqd->in_service_queue->wr_coeff < bfqq->wr_coeff &&
-+	    next_queue_may_preempt(bfqd)) {
-+		struct bfq_queue *in_serv =
-+			bfqd->in_service_queue;
-+		BUG_ON(in_serv == bfqq);
-+
-+		bfq_bfqq_expire(bfqd, bfqd->in_service_queue,
-+				false, BFQ_BFQQ_PREEMPTED);
-+		BUG_ON(in_serv->entity.budget < 0);
-+	}
- }
- 
- static void bfq_add_request(struct request *rq)
- {
- 	struct bfq_queue *bfqq = RQ_BFQQ(rq);
--	struct bfq_entity *entity = &bfqq->entity;
- 	struct bfq_data *bfqd = bfqq->bfqd;
- 	struct request *next_rq, *prev;
--	unsigned long old_wr_coeff = bfqq->wr_coeff;
-+	unsigned int old_wr_coeff = bfqq->wr_coeff;
- 	bool interactive = false;
- 
--	bfq_log_bfqq(bfqd, bfqq, "add_request %d", rq_is_sync(rq));
-+	bfq_log_bfqq(bfqd, bfqq, "add_request: size %u %s",
-+		     blk_rq_sectors(rq), rq_is_sync(rq) ? "S" : "A");
-+
-+	if (bfqq->wr_coeff > 1) /* queue is being weight-raised */
-+		bfq_log_bfqq(bfqd, bfqq,
-+			"raising period dur %u/%u msec, old coeff %u, w %d(%d)",
-+			jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish),
-+			jiffies_to_msecs(bfqq->wr_cur_max_time),
-+			bfqq->wr_coeff,
-+			bfqq->entity.weight, bfqq->entity.orig_weight);
-+
- 	bfqq->queued[rq_is_sync(rq)]++;
- 	bfqd->queued++;
- 
- 	elv_rb_add(&bfqq->sort_list, rq);
- 
- 	/*
--	 * Check if this request is a better next-serve candidate.
-+	 * Check if this request is a better next-to-serve candidate.
- 	 */
- 	prev = bfqq->next_rq;
- 	next_rq = bfq_choose_req(bfqd, bfqq->next_rq, rq, bfqd->last_position);
-@@ -886,160 +1391,10 @@ static void bfq_add_request(struct request *rq)
- 	if (prev != bfqq->next_rq)
- 		bfq_pos_tree_add_move(bfqd, bfqq);
- 
--	if (!bfq_bfqq_busy(bfqq)) {
--		bool soft_rt, coop_or_in_burst,
--		     idle_for_long_time = time_is_before_jiffies(
--						bfqq->budget_timeout +
--						bfqd->bfq_wr_min_idle_time);
--
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
--		bfqg_stats_update_io_add(bfqq_group(RQ_BFQQ(rq)), bfqq,
--					 rq->cmd_flags);
--#endif
--		if (bfq_bfqq_sync(bfqq)) {
--			bool already_in_burst =
--			   !hlist_unhashed(&bfqq->burst_list_node) ||
--			   bfq_bfqq_in_large_burst(bfqq);
--			bfq_handle_burst(bfqd, bfqq, idle_for_long_time);
--			/*
--			 * If bfqq was not already in the current burst,
--			 * then, at this point, bfqq either has been
--			 * added to the current burst or has caused the
--			 * current burst to terminate. In particular, in
--			 * the second case, bfqq has become the first
--			 * queue in a possible new burst.
--			 * In both cases last_ins_in_burst needs to be
--			 * moved forward.
--			 */
--			if (!already_in_burst)
--				bfqd->last_ins_in_burst = jiffies;
--		}
--
--		coop_or_in_burst = bfq_bfqq_in_large_burst(bfqq) ||
--			bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh;
--		soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 &&
--			!coop_or_in_burst &&
--			time_is_before_jiffies(bfqq->soft_rt_next_start);
--		interactive = !coop_or_in_burst && idle_for_long_time;
--		entity->budget = max_t(unsigned long, bfqq->max_budget,
--				       bfq_serv_to_charge(next_rq, bfqq));
--
--		if (!bfq_bfqq_IO_bound(bfqq)) {
--			if (time_before(jiffies,
--					RQ_BIC(rq)->ttime.last_end_request +
--					bfqd->bfq_slice_idle)) {
--				bfqq->requests_within_timer++;
--				if (bfqq->requests_within_timer >=
--				    bfqd->bfq_requests_within_timer)
--					bfq_mark_bfqq_IO_bound(bfqq);
--			} else
--				bfqq->requests_within_timer = 0;
--		}
--
--		if (!bfqd->low_latency)
--			goto add_bfqq_busy;
--
--		if (bfq_bfqq_just_split(bfqq))
--			goto set_prio_changed;
--
--		/*
--		 * If the queue:
--		 * - is not being boosted,
--		 * - has been idle for enough time,
--		 * - is not a sync queue or is linked to a bfq_io_cq (it is
--		 *   shared "for its nature" or it is not shared and its
--		 *   requests have not been redirected to a shared queue)
--		 * start a weight-raising period.
--		 */
--		if (old_wr_coeff == 1 && (interactive || soft_rt) &&
--		    (!bfq_bfqq_sync(bfqq) || bfqq->bic)) {
--			bfqq->wr_coeff = bfqd->bfq_wr_coeff;
--			if (interactive)
--				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
--			else
--				bfqq->wr_cur_max_time =
--					bfqd->bfq_wr_rt_max_time;
--			bfq_log_bfqq(bfqd, bfqq,
--				     "wrais starting at %lu, rais_max_time %u",
--				     jiffies,
--				     jiffies_to_msecs(bfqq->wr_cur_max_time));
--		} else if (old_wr_coeff > 1) {
--			if (interactive)
--				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
--			else if (coop_or_in_burst ||
--				 (bfqq->wr_cur_max_time ==
--				  bfqd->bfq_wr_rt_max_time &&
--				  !soft_rt)) {
--				bfqq->wr_coeff = 1;
--				bfq_log_bfqq(bfqd, bfqq,
--					"wrais ending at %lu, rais_max_time %u",
--					jiffies,
--					jiffies_to_msecs(bfqq->
--						wr_cur_max_time));
--			} else if (time_before(
--					bfqq->last_wr_start_finish +
--					bfqq->wr_cur_max_time,
--					jiffies +
--					bfqd->bfq_wr_rt_max_time) &&
--				   soft_rt) {
--				/*
--				 *
--				 * The remaining weight-raising time is lower
--				 * than bfqd->bfq_wr_rt_max_time, which means
--				 * that the application is enjoying weight
--				 * raising either because deemed soft-rt in
--				 * the near past, or because deemed interactive
--				 * a long ago.
--				 * In both cases, resetting now the current
--				 * remaining weight-raising time for the
--				 * application to the weight-raising duration
--				 * for soft rt applications would not cause any
--				 * latency increase for the application (as the
--				 * new duration would be higher than the
--				 * remaining time).
--				 *
--				 * In addition, the application is now meeting
--				 * the requirements for being deemed soft rt.
--				 * In the end we can correctly and safely
--				 * (re)charge the weight-raising duration for
--				 * the application with the weight-raising
--				 * duration for soft rt applications.
--				 *
--				 * In particular, doing this recharge now, i.e.,
--				 * before the weight-raising period for the
--				 * application finishes, reduces the probability
--				 * of the following negative scenario:
--				 * 1) the weight of a soft rt application is
--				 *    raised at startup (as for any newly
--				 *    created application),
--				 * 2) since the application is not interactive,
--				 *    at a certain time weight-raising is
--				 *    stopped for the application,
--				 * 3) at that time the application happens to
--				 *    still have pending requests, and hence
--				 *    is destined to not have a chance to be
--				 *    deemed soft rt before these requests are
--				 *    completed (see the comments to the
--				 *    function bfq_bfqq_softrt_next_start()
--				 *    for details on soft rt detection),
--				 * 4) these pending requests experience a high
--				 *    latency because the application is not
--				 *    weight-raised while they are pending.
--				 */
--				bfqq->last_wr_start_finish = jiffies;
--				bfqq->wr_cur_max_time =
--					bfqd->bfq_wr_rt_max_time;
--			}
--		}
--set_prio_changed:
--		if (old_wr_coeff != bfqq->wr_coeff)
--			entity->prio_changed = 1;
--add_bfqq_busy:
--		bfqq->last_idle_bklogged = jiffies;
--		bfqq->service_from_backlogged = 0;
--		bfq_clear_bfqq_softrt_update(bfqq);
--		bfq_add_bfqq_busy(bfqd, bfqq);
--	} else {
-+	if (!bfq_bfqq_busy(bfqq)) /* switching to busy ... */
-+		bfq_bfqq_handle_idle_busy_switch(bfqd, bfqq, old_wr_coeff,
-+						 rq, &interactive);
-+	else {
- 		if (bfqd->low_latency && old_wr_coeff == 1 && !rq_is_sync(rq) &&
- 		    time_is_before_jiffies(
- 				bfqq->last_wr_start_finish +
-@@ -1048,16 +1403,43 @@ add_bfqq_busy:
- 			bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
- 
- 			bfqd->wr_busy_queues++;
--			entity->prio_changed = 1;
-+			bfqq->entity.prio_changed = 1;
- 			bfq_log_bfqq(bfqd, bfqq,
--			    "non-idle wrais starting at %lu, rais_max_time %u",
--			    jiffies,
--			    jiffies_to_msecs(bfqq->wr_cur_max_time));
-+				     "non-idle wrais starting, "
-+				     "wr_max_time %u wr_busy %d",
-+				     jiffies_to_msecs(bfqq->wr_cur_max_time),
-+				     bfqd->wr_busy_queues);
- 		}
- 		if (prev != bfqq->next_rq)
- 			bfq_updated_next_req(bfqd, bfqq);
- 	}
- 
-+	/*
-+	 * Assign jiffies to last_wr_start_finish in the following
-+	 * cases:
-+	 *
-+	 * . if bfqq is not going to be weight-raised, because, for
-+	 *   non weight-raised queues, last_wr_start_finish stores the
-+	 *   arrival time of the last request; as of now, this piece
-+	 *   of information is used only for deciding whether to
-+	 *   weight-raise async queues
-+	 *
-+	 * . if bfqq is not weight-raised, because, if bfqq is now
-+	 *   switching to weight-raised, then last_wr_start_finish
-+	 *   stores the time when weight-raising starts
-+	 *
-+	 * . if bfqq is interactive, because, regardless of whether
-+	 *   bfqq is currently weight-raised, the weight-raising
-+	 *   period must start or restart (this case is considered
-+	 *   separately because it is not detected by the above
-+	 *   conditions, if bfqq is already weight-raised)
-+	 *
-+	 * last_wr_start_finish has to be updated also if bfqq is soft
-+	 * real-time, because the weight-raising period is constantly
-+	 * restarted on idle-to-busy transitions for these queues, but
-+	 * this is already done in bfq_bfqq_handle_idle_busy_switch if
-+	 * needed.
-+	 */
- 	if (bfqd->low_latency &&
- 		(old_wr_coeff == 1 || bfqq->wr_coeff == 1 || interactive))
- 		bfqq->last_wr_start_finish = jiffies;
-@@ -1081,14 +1463,24 @@ static struct request *bfq_find_rq_fmerge(struct bfq_data *bfqd,
- 	return NULL;
- }
- 
-+static sector_t get_sdist(sector_t last_pos, struct request *rq)
-+{
-+	sector_t sdist = 0;
-+
-+	if (last_pos) {
-+		if (last_pos < blk_rq_pos(rq))
-+			sdist = blk_rq_pos(rq) - last_pos;
-+		else
-+			sdist = last_pos - blk_rq_pos(rq);
-+	}
-+
-+	return sdist;
-+}
-+
- static void bfq_activate_request(struct request_queue *q, struct request *rq)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
--
- 	bfqd->rq_in_driver++;
--	bfqd->last_position = blk_rq_pos(rq) + blk_rq_sectors(rq);
--	bfq_log(bfqd, "activate_request: new bfqd->last_position %llu",
--		(unsigned long long) bfqd->last_position);
- }
- 
- static void bfq_deactivate_request(struct request_queue *q, struct request *rq)
-@@ -1105,6 +1497,9 @@ static void bfq_remove_request(struct request *rq)
- 	struct bfq_data *bfqd = bfqq->bfqd;
- 	const int sync = rq_is_sync(rq);
- 
-+	BUG_ON(bfqq->entity.service > bfqq->entity.budget &&
-+	       bfqq == bfqd->in_service_queue);
-+
- 	if (bfqq->next_rq == rq) {
- 		bfqq->next_rq = bfq_find_next_rq(bfqd, bfqq, rq);
- 		bfq_updated_next_req(bfqd, bfqq);
-@@ -1118,8 +1513,25 @@ static void bfq_remove_request(struct request *rq)
- 	elv_rb_del(&bfqq->sort_list, rq);
- 
- 	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
--		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue)
-+		BUG_ON(bfqq->entity.budget < 0);
-+
-+		if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue) {
- 			bfq_del_bfqq_busy(bfqd, bfqq, 1);
-+
-+			/* bfqq emptied. In normal operation, when
-+			 * bfqq is empty, bfqq->entity.service and
-+			 * bfqq->entity.budget must contain,
-+			 * respectively, the service received and the
-+			 * budget used last time bfqq emptied. These
-+			 * facts do not hold in this case, as at least
-+			 * this last removal occurred while bfqq is
-+			 * not in service. To avoid inconsistencies,
-+			 * reset both bfqq->entity.service and
-+			 * bfqq->entity.budget.
-+			 */
-+			bfqq->entity.budget = bfqq->entity.service = 0;
-+		}
-+
- 		/*
- 		 * Remove queue from request-position tree as it is empty.
- 		 */
-@@ -1133,9 +1545,8 @@ static void bfq_remove_request(struct request *rq)
- 		BUG_ON(bfqq->meta_pending == 0);
- 		bfqq->meta_pending--;
- 	}
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
--	bfqg_stats_update_io_remove(bfqq_group(bfqq), rq->cmd_flags);
--#endif
-+	bfqg_stats_update_io_remove(bfqq_group(bfqq), req_op(rq),
-+				    rq->cmd_flags);
- }
- 
- static int bfq_merge(struct request_queue *q, struct request **req,
-@@ -1145,7 +1556,7 @@ static int bfq_merge(struct request_queue *q, struct request **req,
- 	struct request *__rq;
- 
- 	__rq = bfq_find_rq_fmerge(bfqd, bio);
--	if (__rq && elv_rq_merge_ok(__rq, bio)) {
-+	if (__rq && elv_bio_merge_ok(__rq, bio)) {
- 		*req = __rq;
- 		return ELEVATOR_FRONT_MERGE;
- 	}
-@@ -1190,7 +1601,8 @@ static void bfq_merged_request(struct request_queue *q, struct request *req,
- static void bfq_bio_merged(struct request_queue *q, struct request *req,
- 			   struct bio *bio)
- {
--	bfqg_stats_update_io_merged(bfqq_group(RQ_BFQQ(req)), bio->bi_rw);
-+	bfqg_stats_update_io_merged(bfqq_group(RQ_BFQQ(req)), bio_op(bio),
-+				    bio->bi_opf);
- }
- #endif
- 
-@@ -1210,7 +1622,7 @@ static void bfq_merged_requests(struct request_queue *q, struct request *rq,
- 	 */
- 	if (bfqq == next_bfqq &&
- 	    !list_empty(&rq->queuelist) && !list_empty(&next->queuelist) &&
--	    time_before(next->fifo_time, rq->fifo_time)) {
-+	    next->fifo_time < rq->fifo_time) {
- 		list_del_init(&rq->queuelist);
- 		list_replace_init(&next->queuelist, &rq->queuelist);
- 		rq->fifo_time = next->fifo_time;
-@@ -1220,21 +1632,31 @@ static void bfq_merged_requests(struct request_queue *q, struct request *rq,
- 		bfqq->next_rq = rq;
- 
- 	bfq_remove_request(next);
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
--	bfqg_stats_update_io_merged(bfqq_group(bfqq), next->cmd_flags);
--#endif
-+	bfqg_stats_update_io_merged(bfqq_group(bfqq), req_op(next),
-+				    next->cmd_flags);
- }
- 
- /* Must be called with bfqq != NULL */
- static void bfq_bfqq_end_wr(struct bfq_queue *bfqq)
- {
- 	BUG_ON(!bfqq);
-+
- 	if (bfq_bfqq_busy(bfqq))
- 		bfqq->bfqd->wr_busy_queues--;
- 	bfqq->wr_coeff = 1;
- 	bfqq->wr_cur_max_time = 0;
--	/* Trigger a weight change on the next activation of the queue */
-+	bfqq->last_wr_start_finish = jiffies;
-+	/*
-+	 * Trigger a weight change on the next invocation of
-+	 * __bfq_entity_update_weight_prio.
-+	 */
- 	bfqq->entity.prio_changed = 1;
-+	bfq_log_bfqq(bfqq->bfqd, bfqq,
-+		     "end_wr: wrais ending at %lu, rais_max_time %u",
-+		     bfqq->last_wr_start_finish,
-+		     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "end_wr: wr_busy %d",
-+		     bfqq->bfqd->wr_busy_queues);
- }
- 
- static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
-@@ -1277,7 +1699,7 @@ static int bfq_rq_close_to_sector(void *io_struct, bool request,
- 				  sector_t sector)
- {
- 	return abs(bfq_io_struct_pos(io_struct, request) - sector) <=
--	       BFQQ_SEEK_THR;
-+	       BFQQ_CLOSE_THR;
- }
- 
- static struct bfq_queue *bfqq_find_close(struct bfq_data *bfqd,
-@@ -1399,7 +1821,7 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
- 	 * throughput.
- 	 */
- 	bfqq->new_bfqq = new_bfqq;
--	atomic_add(process_refs, &new_bfqq->ref);
-+	new_bfqq->ref += process_refs;
- 	return new_bfqq;
- }
- 
-@@ -1430,9 +1852,23 @@ static bool bfq_may_be_close_cooperator(struct bfq_queue *bfqq,
- }
- 
- /*
-- * Attempt to schedule a merge of bfqq with the currently in-service queue
-- * or with a close queue among the scheduled queues.
-- * Return NULL if no merge was scheduled, a pointer to the shared bfq_queue
-+ * If this function returns true, then bfqq cannot be merged. The idea
-+ * is that true cooperation happens very early after processes start
-+ * to do I/O. Usually, late cooperations are just accidental false
-+ * positives. In case bfqq is weight-raised, such false positives
-+ * would evidently degrade latency guarantees for bfqq.
-+ */
-+bool wr_from_too_long(struct bfq_queue *bfqq)
-+{
-+	return bfqq->wr_coeff > 1 &&
-+		time_is_before_jiffies(bfqq->last_wr_start_finish +
-+				       msecs_to_jiffies(100));
-+}
-+
-+/*
-+ * Attempt to schedule a merge of bfqq with the currently in-service
-+ * queue or with a close queue among the scheduled queues.  Return
-+ * NULL if no merge was scheduled, a pointer to the shared bfq_queue
-  * structure otherwise.
-  *
-  * The OOM queue is not allowed to participate to cooperation: in fact, since
-@@ -1441,6 +1877,18 @@ static bool bfq_may_be_close_cooperator(struct bfq_queue *bfqq,
-  * handle merging with the OOM queue would be quite complex and expensive
-  * to maintain. Besides, in such a critical condition as an out of memory,
-  * the benefits of queue merging may be little relevant, or even negligible.
-+ *
-+ * Weight-raised queues can be merged only if their weight-raising
-+ * period has just started. In fact cooperating processes are usually
-+ * started together. Thus, with this filter we avoid false positives
-+ * that would jeopardize low-latency guarantees.
-+ *
-+ * WARNING: queue merging may impair fairness among non-weight raised
-+ * queues, for at least two reasons: 1) the original weight of a
-+ * merged queue may change during the merged state, 2) even being the
-+ * weight the same, a merged queue may be bloated with many more
-+ * requests than the ones produced by its originally-associated
-+ * process.
-  */
- static struct bfq_queue *
- bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-@@ -1450,16 +1898,32 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 
- 	if (bfqq->new_bfqq)
- 		return bfqq->new_bfqq;
--	if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq))
-+
-+	if (io_struct && wr_from_too_long(bfqq) &&
-+	    likely(bfqq != &bfqd->oom_bfqq))
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "would have looked for coop, but bfq%d wr",
-+			bfqq->pid);
-+
-+	if (!io_struct ||
-+	    wr_from_too_long(bfqq) ||
-+	    unlikely(bfqq == &bfqd->oom_bfqq))
- 		return NULL;
--	/* If device has only one backlogged bfq_queue, don't search. */
-+
-+	/* If there is only one backlogged queue, don't search. */
- 	if (bfqd->busy_queues == 1)
- 		return NULL;
- 
- 	in_service_bfqq = bfqd->in_service_queue;
- 
-+	if (in_service_bfqq && in_service_bfqq != bfqq &&
-+	    bfqd->in_service_bic && wr_from_too_long(in_service_bfqq)
-+	    && likely(in_service_bfqq == &bfqd->oom_bfqq))
-+		bfq_log_bfqq(bfqd, bfqq,
-+		"would have tried merge with in-service-queue, but wr");
-+
- 	if (!in_service_bfqq || in_service_bfqq == bfqq ||
--	    !bfqd->in_service_bic ||
-+	    !bfqd->in_service_bic || wr_from_too_long(in_service_bfqq) ||
- 	    unlikely(in_service_bfqq == &bfqd->oom_bfqq))
- 		goto check_scheduled;
- 
-@@ -1481,7 +1945,15 @@ check_scheduled:
- 
- 	BUG_ON(new_bfqq && bfqq->entity.parent != new_bfqq->entity.parent);
- 
--	if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq) &&
-+	if (new_bfqq && wr_from_too_long(new_bfqq) &&
-+	    likely(new_bfqq != &bfqd->oom_bfqq) &&
-+	    bfq_may_be_close_cooperator(bfqq, new_bfqq))
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "would have merged with bfq%d, but wr",
-+			     new_bfqq->pid);
-+
-+	if (new_bfqq && !wr_from_too_long(new_bfqq) &&
-+	    likely(new_bfqq != &bfqd->oom_bfqq) &&
- 	    bfq_may_be_close_cooperator(bfqq, new_bfqq))
- 		return bfq_setup_merge(bfqq, new_bfqq);
- 
-@@ -1490,53 +1962,24 @@ check_scheduled:
- 
- static void bfq_bfqq_save_state(struct bfq_queue *bfqq)
- {
-+	struct bfq_io_cq *bic = bfqq->bic;
-+
- 	/*
- 	 * If !bfqq->bic, the queue is already shared or its requests
- 	 * have already been redirected to a shared queue; both idle window
- 	 * and weight raising state have already been saved. Do nothing.
- 	 */
--	if (!bfqq->bic)
-+	if (!bic)
- 		return;
--	if (bfqq->bic->wr_time_left)
--		/*
--		 * This is the queue of a just-started process, and would
--		 * deserve weight raising: we set wr_time_left to the full
--		 * weight-raising duration to trigger weight-raising when
--		 * and if the queue is split and the first request of the
--		 * queue is enqueued.
--		 */
--		bfqq->bic->wr_time_left = bfq_wr_duration(bfqq->bfqd);
--	else if (bfqq->wr_coeff > 1) {
--		unsigned long wr_duration =
--			jiffies - bfqq->last_wr_start_finish;
--		/*
--		 * It may happen that a queue's weight raising period lasts
--		 * longer than its wr_cur_max_time, as weight raising is
--		 * handled only when a request is enqueued or dispatched (it
--		 * does not use any timer). If the weight raising period is
--		 * about to end, don't save it.
--		 */
--		if (bfqq->wr_cur_max_time <= wr_duration)
--			bfqq->bic->wr_time_left = 0;
--		else
--			bfqq->bic->wr_time_left =
--				bfqq->wr_cur_max_time - wr_duration;
--		/*
--		 * The bfq_queue is becoming shared or the requests of the
--		 * process owning the queue are being redirected to a shared
--		 * queue. Stop the weight raising period of the queue, as in
--		 * both cases it should not be owned by an interactive or
--		 * soft real-time application.
--		 */
--		bfq_bfqq_end_wr(bfqq);
--	} else
--		bfqq->bic->wr_time_left = 0;
--	bfqq->bic->saved_idle_window = bfq_bfqq_idle_window(bfqq);
--	bfqq->bic->saved_IO_bound = bfq_bfqq_IO_bound(bfqq);
--	bfqq->bic->saved_in_large_burst = bfq_bfqq_in_large_burst(bfqq);
--	bfqq->bic->was_in_burst_list = !hlist_unhashed(&bfqq->burst_list_node);
--	bfqq->bic->cooperations++;
--	bfqq->bic->failed_cooperations = 0;
-+
-+	bic->saved_idle_window = bfq_bfqq_idle_window(bfqq);
-+	bic->saved_IO_bound = bfq_bfqq_IO_bound(bfqq);
-+	bic->saved_in_large_burst = bfq_bfqq_in_large_burst(bfqq);
-+	bic->was_in_burst_list = !hlist_unhashed(&bfqq->burst_list_node);
-+	bic->saved_wr_coeff = bfqq->wr_coeff;
-+	bic->saved_wr_start_at_switch_to_srt = bfqq->wr_start_at_switch_to_srt;
-+	bic->saved_last_wr_start_finish = bfqq->last_wr_start_finish;
-+	BUG_ON(time_is_after_jiffies(bfqq->last_wr_start_finish));
- }
- 
- static void bfq_get_bic_reference(struct bfq_queue *bfqq)
-@@ -1561,6 +2004,40 @@ bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
- 	if (bfq_bfqq_IO_bound(bfqq))
- 		bfq_mark_bfqq_IO_bound(new_bfqq);
- 	bfq_clear_bfqq_IO_bound(bfqq);
-+
-+	/*
-+	 * If bfqq is weight-raised, then let new_bfqq inherit
-+	 * weight-raising. To reduce false positives, neglect the case
-+	 * where bfqq has just been created, but has not yet made it
-+	 * to be weight-raised (which may happen because EQM may merge
-+	 * bfqq even before bfq_add_request is executed for the first
-+	 * time for bfqq). Handling this case would however be very
-+	 * easy, thanks to the flag just_created.
-+	 */
-+	if (new_bfqq->wr_coeff == 1 && bfqq->wr_coeff > 1) {
-+		new_bfqq->wr_coeff = bfqq->wr_coeff;
-+		new_bfqq->wr_cur_max_time = bfqq->wr_cur_max_time;
-+		new_bfqq->last_wr_start_finish = bfqq->last_wr_start_finish;
-+		new_bfqq->wr_start_at_switch_to_srt = bfqq->wr_start_at_switch_to_srt;
-+		if (bfq_bfqq_busy(new_bfqq))
-+			bfqd->wr_busy_queues++;
-+		new_bfqq->entity.prio_changed = 1;
-+		bfq_log_bfqq(bfqd, new_bfqq,
-+			     "wr start after merge with %d, rais_max_time %u",
-+			     bfqq->pid,
-+			     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+	}
-+
-+	if (bfqq->wr_coeff > 1) { /* bfqq has given its wr to new_bfqq */
-+		bfqq->wr_coeff = 1;
-+		bfqq->entity.prio_changed = 1;
-+		if (bfq_bfqq_busy(bfqq))
-+			bfqd->wr_busy_queues--;
-+	}
-+
-+	bfq_log_bfqq(bfqd, new_bfqq, "merge_bfqqs: wr_busy %d",
-+		     bfqd->wr_busy_queues);
-+
- 	/*
- 	 * Grab a reference to the bic, to prevent it from being destroyed
- 	 * before being possibly touched by a bfq_split_bfqq().
-@@ -1587,20 +2064,8 @@ bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic,
- 	bfq_put_queue(bfqq);
- }
- 
--static void bfq_bfqq_increase_failed_cooperations(struct bfq_queue *bfqq)
--{
--	struct bfq_io_cq *bic = bfqq->bic;
--	struct bfq_data *bfqd = bfqq->bfqd;
--
--	if (bic && bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh) {
--		bic->failed_cooperations++;
--		if (bic->failed_cooperations >= bfqd->bfq_failed_cooperations)
--			bic->cooperations = 0;
--	}
--}
--
--static int bfq_allow_merge(struct request_queue *q, struct request *rq,
--			   struct bio *bio)
-+static int bfq_allow_bio_merge(struct request_queue *q, struct request *rq,
-+			       struct bio *bio)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
- 	struct bfq_io_cq *bic;
-@@ -1610,7 +2075,7 @@ static int bfq_allow_merge(struct request_queue *q, struct request *rq,
- 	 * Disallow merge of a sync bio into an async request.
- 	 */
- 	if (bfq_bio_sync(bio) && !rq_is_sync(rq))
--		return 0;
-+		return false;
- 
- 	/*
- 	 * Lookup the bfqq that this bio will be queued with. Allow
-@@ -1619,7 +2084,7 @@ static int bfq_allow_merge(struct request_queue *q, struct request *rq,
- 	 */
- 	bic = bfq_bic_lookup(bfqd, current->io_context);
- 	if (!bic)
--		return 0;
-+		return false;
- 
- 	bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio));
- 	/*
-@@ -1636,30 +2101,107 @@ static int bfq_allow_merge(struct request_queue *q, struct request *rq,
- 			 * to decide whether bio and rq can be merged.
- 			 */
- 			bfqq = new_bfqq;
--		} else
--			bfq_bfqq_increase_failed_cooperations(bfqq);
-+		}
- 	}
- 
- 	return bfqq == RQ_BFQQ(rq);
- }
- 
-+static int bfq_allow_rq_merge(struct request_queue *q, struct request *rq,
-+			      struct request *next)
-+{
-+	return RQ_BFQQ(rq) == RQ_BFQQ(next);
-+}
-+
-+/*
-+ * Set the maximum time for the in-service queue to consume its
-+ * budget. This prevents seeky processes from lowering the throughput.
-+ * In practice, a time-slice service scheme is used with seeky
-+ * processes.
-+ */
-+static void bfq_set_budget_timeout(struct bfq_data *bfqd,
-+				   struct bfq_queue *bfqq)
-+{
-+	unsigned int timeout_coeff;
-+
-+	if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time)
-+		timeout_coeff = 1;
-+	else
-+		timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight;
-+
-+	bfqd->last_budget_start = ktime_get();
-+
-+	bfqq->budget_timeout = jiffies +
-+		bfqd->bfq_timeout * timeout_coeff;
-+
-+	bfq_log_bfqq(bfqd, bfqq, "set budget_timeout %u",
-+		jiffies_to_msecs(bfqd->bfq_timeout * timeout_coeff));
-+}
-+
- static void __bfq_set_in_service_queue(struct bfq_data *bfqd,
- 				       struct bfq_queue *bfqq)
- {
- 	if (bfqq) {
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
- 		bfqg_stats_update_avg_queue_size(bfqq_group(bfqq));
--#endif
- 		bfq_mark_bfqq_must_alloc(bfqq);
--		bfq_mark_bfqq_budget_new(bfqq);
- 		bfq_clear_bfqq_fifo_expire(bfqq);
- 
- 		bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8;
- 
-+		BUG_ON(bfqq == bfqd->in_service_queue);
-+		BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list));
-+
-+		if (time_is_before_jiffies(bfqq->last_wr_start_finish) &&
-+		    bfqq->wr_coeff > 1 &&
-+		    bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time &&
-+		    time_is_before_jiffies(bfqq->budget_timeout)) {
-+			/*
-+			 * For soft real-time queues, move the start
-+			 * of the weight-raising period forward by the
-+			 * time the queue has not received any
-+			 * service. Otherwise, a relatively long
-+			 * service delay is likely to cause the
-+			 * weight-raising period of the queue to end,
-+			 * because of the short duration of the
-+			 * weight-raising period of a soft real-time
-+			 * queue.  It is worth noting that this move
-+			 * is not so dangerous for the other queues,
-+			 * because soft real-time queues are not
-+			 * greedy.
-+			 *
-+			 * To not add a further variable, we use the
-+			 * overloaded field budget_timeout to
-+			 * determine for how long the queue has not
-+			 * received service, i.e., how much time has
-+			 * elapsed since the queue expired. However,
-+			 * this is a little imprecise, because
-+			 * budget_timeout is set to jiffies if bfqq
-+			 * not only expires, but also remains with no
-+			 * request.
-+			 */
-+			bfqq->last_wr_start_finish += jiffies -
-+				max_t(unsigned long, bfqq->last_wr_start_finish,
-+				      bfqq->budget_timeout);
-+			if (time_is_after_jiffies(bfqq->last_wr_start_finish)) {
-+			       pr_crit(
-+			       "BFQ WARNING:last %lu budget %lu jiffies %lu",
-+			       bfqq->last_wr_start_finish,
-+			       bfqq->budget_timeout,
-+			       jiffies);
-+			       pr_crit("diff %lu", jiffies -
-+				       max_t(unsigned long,
-+					     bfqq->last_wr_start_finish,
-+					     bfqq->budget_timeout));
-+			       bfqq->last_wr_start_finish = jiffies;
-+			}
-+		}
-+
-+		bfq_set_budget_timeout(bfqd, bfqq);
- 		bfq_log_bfqq(bfqd, bfqq,
- 			     "set_in_service_queue, cur-budget = %d",
- 			     bfqq->entity.budget);
--	}
-+	} else
-+		bfq_log(bfqd, "set_in_service_queue: NULL");
- 
- 	bfqd->in_service_queue = bfqq;
- }
-@@ -1675,36 +2217,11 @@ static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd)
- 	return bfqq;
- }
- 
--/*
-- * If enough samples have been computed, return the current max budget
-- * stored in bfqd, which is dynamically updated according to the
-- * estimated disk peak rate; otherwise return the default max budget
-- */
--static int bfq_max_budget(struct bfq_data *bfqd)
--{
--	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
--		return bfq_default_max_budget;
--	else
--		return bfqd->bfq_max_budget;
--}
--
--/*
-- * Return min budget, which is a fraction of the current or default
-- * max budget (trying with 1/32)
-- */
--static int bfq_min_budget(struct bfq_data *bfqd)
--{
--	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
--		return bfq_default_max_budget / 32;
--	else
--		return bfqd->bfq_max_budget / 32;
--}
--
- static void bfq_arm_slice_timer(struct bfq_data *bfqd)
- {
- 	struct bfq_queue *bfqq = bfqd->in_service_queue;
- 	struct bfq_io_cq *bic;
--	unsigned long sl;
-+	u32 sl;
- 
- 	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
- 
-@@ -1728,59 +2245,343 @@ static void bfq_arm_slice_timer(struct bfq_data *bfqd)
- 	sl = bfqd->bfq_slice_idle;
- 	/*
- 	 * Unless the queue is being weight-raised or the scenario is
--	 * asymmetric, grant only minimum idle time if the queue either
--	 * has been seeky for long enough or has already proved to be
--	 * constantly seeky.
-+	 * asymmetric, grant only minimum idle time if the queue
-+	 * is seeky. A long idling is preserved for a weight-raised
-+	 * queue, or, more in general, in an asymemtric scenario,
-+	 * because a long idling is needed for guaranteeing to a queue
-+	 * its reserved share of the throughput (in particular, it is
-+	 * needed if the queue has a higher weight than some other
-+	 * queue).
- 	 */
--	if (bfq_sample_valid(bfqq->seek_samples) &&
--	    ((BFQQ_SEEKY(bfqq) && bfqq->entity.service >
--				  bfq_max_budget(bfqq->bfqd) / 8) ||
--	      bfq_bfqq_constantly_seeky(bfqq)) && bfqq->wr_coeff == 1 &&
-+	if (BFQQ_SEEKY(bfqq) && bfqq->wr_coeff == 1 &&
- 	    bfq_symmetric_scenario(bfqd))
--		sl = min(sl, msecs_to_jiffies(BFQ_MIN_TT));
--	else if (bfqq->wr_coeff > 1)
--		sl = sl * 3;
-+		sl = min_t(u32, sl, BFQ_MIN_TT);
-+
- 	bfqd->last_idling_start = ktime_get();
--	mod_timer(&bfqd->idle_slice_timer, jiffies + sl);
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	hrtimer_start(&bfqd->idle_slice_timer, ns_to_ktime(sl),
-+		      HRTIMER_MODE_REL);
- 	bfqg_stats_set_start_idle_time(bfqq_group(bfqq));
--#endif
--	bfq_log(bfqd, "arm idle: %u/%u ms",
--		jiffies_to_msecs(sl), jiffies_to_msecs(bfqd->bfq_slice_idle));
-+	bfq_log(bfqd, "arm idle: %ld/%ld ms",
-+		sl / NSEC_PER_MSEC, bfqd->bfq_slice_idle / NSEC_PER_MSEC);
- }
- 
- /*
-- * Set the maximum time for the in-service queue to consume its
-- * budget. This prevents seeky processes from lowering the disk
-- * throughput (always guaranteed with a time slice scheme as in CFQ).
-+ * In autotuning mode, max_budget is dynamically recomputed as the
-+ * amount of sectors transferred in timeout at the estimated peak
-+ * rate. This enables BFQ to utilize a full timeslice with a full
-+ * budget, even if the in-service queue is served at peak rate. And
-+ * this maximises throughput with sequential workloads.
-  */
--static void bfq_set_budget_timeout(struct bfq_data *bfqd)
-+static unsigned long bfq_calc_max_budget(struct bfq_data *bfqd)
- {
--	struct bfq_queue *bfqq = bfqd->in_service_queue;
--	unsigned int timeout_coeff;
-+	return (u64)bfqd->peak_rate * USEC_PER_MSEC *
-+		jiffies_to_msecs(bfqd->bfq_timeout)>>BFQ_RATE_SHIFT;
-+}
- 
--	if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time)
--		timeout_coeff = 1;
-+/*
-+ * Update parameters related to throughput and responsiveness, as a
-+ * function of the estimated peak rate. See comments on
-+ * bfq_calc_max_budget(), and on T_slow and T_fast arrays.
-+ */
-+void update_thr_responsiveness_params(struct bfq_data *bfqd)
-+{
-+	int dev_type = blk_queue_nonrot(bfqd->queue);
-+
-+	if (bfqd->bfq_user_max_budget == 0) {
-+		bfqd->bfq_max_budget =
-+			bfq_calc_max_budget(bfqd);
-+		BUG_ON(bfqd->bfq_max_budget < 0);
-+		bfq_log(bfqd, "new max_budget = %d",
-+			bfqd->bfq_max_budget);
-+	}
-+
-+	if (bfqd->device_speed == BFQ_BFQD_FAST &&
-+	    bfqd->peak_rate < device_speed_thresh[dev_type]) {
-+		bfqd->device_speed = BFQ_BFQD_SLOW;
-+		bfqd->RT_prod = R_slow[dev_type] *
-+			T_slow[dev_type];
-+	} else if (bfqd->device_speed == BFQ_BFQD_SLOW &&
-+		   bfqd->peak_rate > device_speed_thresh[dev_type]) {
-+		bfqd->device_speed = BFQ_BFQD_FAST;
-+		bfqd->RT_prod = R_fast[dev_type] *
-+			T_fast[dev_type];
-+	}
-+
-+	bfq_log(bfqd,
-+"dev_type %s dev_speed_class = %s (%llu sects/sec), thresh %llu setcs/sec",
-+		dev_type == 0 ? "ROT" : "NONROT",
-+		bfqd->device_speed == BFQ_BFQD_FAST ? "FAST" : "SLOW",
-+		bfqd->device_speed == BFQ_BFQD_FAST ?
-+		(USEC_PER_SEC*(u64)R_fast[dev_type])>>BFQ_RATE_SHIFT :
-+		(USEC_PER_SEC*(u64)R_slow[dev_type])>>BFQ_RATE_SHIFT,
-+		(USEC_PER_SEC*(u64)device_speed_thresh[dev_type])>>
-+		BFQ_RATE_SHIFT);
-+}
-+
-+void bfq_reset_rate_computation(struct bfq_data *bfqd, struct request *rq)
-+{
-+	if (rq != NULL) { /* new rq dispatch now, reset accordingly */
-+		bfqd->last_dispatch = bfqd->first_dispatch = ktime_get_ns() ;
-+		bfqd->peak_rate_samples = 1;
-+		bfqd->sequential_samples = 0;
-+		bfqd->tot_sectors_dispatched = bfqd->last_rq_max_size =
-+			blk_rq_sectors(rq);
-+	} else /* no new rq dispatched, just reset the number of samples */
-+		bfqd->peak_rate_samples = 0; /* full re-init on next disp. */
-+
-+	bfq_log(bfqd,
-+		"reset_rate_computation at end, sample %u/%u tot_sects %llu",
-+		bfqd->peak_rate_samples, bfqd->sequential_samples,
-+		bfqd->tot_sectors_dispatched);
-+}
-+
-+void bfq_update_rate_reset(struct bfq_data *bfqd, struct request *rq)
-+{
-+	u32 rate, weight, divisor;
-+
-+	/*
-+	 * For the convergence property to hold (see comments on
-+	 * bfq_update_peak_rate()) and for the assessment to be
-+	 * reliable, a minimum number of samples must be present, and
-+	 * a minimum amount of time must have elapsed. If not so, do
-+	 * not compute new rate. Just reset parameters, to get ready
-+	 * for a new evaluation attempt.
-+	 */
-+	if (bfqd->peak_rate_samples < BFQ_RATE_MIN_SAMPLES ||
-+	    bfqd->delta_from_first < BFQ_RATE_MIN_INTERVAL) {
-+		bfq_log(bfqd,
-+	"update_rate_reset: only resetting, delta_first %lluus samples %d",
-+			bfqd->delta_from_first>>10, bfqd->peak_rate_samples);
-+		goto reset_computation;
-+	}
-+
-+	/*
-+	 * If a new request completion has occurred after last
-+	 * dispatch, then, to approximate the rate at which requests
-+	 * have been served by the device, it is more precise to
-+	 * extend the observation interval to the last completion.
-+	 */
-+	bfqd->delta_from_first =
-+		max_t(u64, bfqd->delta_from_first,
-+		      bfqd->last_completion - bfqd->first_dispatch);
-+
-+	BUG_ON(bfqd->delta_from_first == 0);
-+	/*
-+	 * Rate computed in sects/usec, and not sects/nsec, for
-+	 * precision issues.
-+	 */
-+	rate = div64_ul(bfqd->tot_sectors_dispatched<<BFQ_RATE_SHIFT,
-+			div_u64(bfqd->delta_from_first, NSEC_PER_USEC));
-+
-+	bfq_log(bfqd,
-+"update_rate_reset: tot_sects %llu delta_first %lluus rate %llu sects/s (%d)",
-+		bfqd->tot_sectors_dispatched, bfqd->delta_from_first>>10,
-+		((USEC_PER_SEC*(u64)rate)>>BFQ_RATE_SHIFT),
-+		rate > 20<<BFQ_RATE_SHIFT);
-+
-+	/*
-+	 * Peak rate not updated if:
-+	 * - the percentage of sequential dispatches is below 3/4 of the
-+	 *   total, and rate is below the current estimated peak rate
-+	 * - rate is unreasonably high (> 20M sectors/sec)
-+	 */
-+	if ((bfqd->peak_rate_samples > (3 * bfqd->sequential_samples)>>2 &&
-+	     rate <= bfqd->peak_rate) ||
-+		rate > 20<<BFQ_RATE_SHIFT) {
-+		bfq_log(bfqd,
-+		"update_rate_reset: goto reset, samples %u/%u rate/peak %llu/%llu",
-+		bfqd->peak_rate_samples, bfqd->sequential_samples,
-+		((USEC_PER_SEC*(u64)rate)>>BFQ_RATE_SHIFT),
-+		((USEC_PER_SEC*(u64)bfqd->peak_rate)>>BFQ_RATE_SHIFT));
-+		goto reset_computation;
-+	} else {
-+		bfq_log(bfqd,
-+		"update_rate_reset: do update, samples %u/%u rate/peak %llu/%llu",
-+		bfqd->peak_rate_samples, bfqd->sequential_samples,
-+		((USEC_PER_SEC*(u64)rate)>>BFQ_RATE_SHIFT),
-+		((USEC_PER_SEC*(u64)bfqd->peak_rate)>>BFQ_RATE_SHIFT));
-+	}
-+
-+	/*
-+	 * We have to update the peak rate, at last! To this purpose,
-+	 * we use a low-pass filter. We compute the smoothing constant
-+	 * of the filter as a function of the 'weight' of the new
-+	 * measured rate.
-+	 *
-+	 * As can be seen in next formulas, we define this weight as a
-+	 * quantity proportional to how sequential the workload is,
-+	 * and to how long the observation time interval is.
-+	 *
-+	 * The weight runs from 0 to 8. The maximum value of the
-+	 * weight, 8, yields the minimum value for the smoothing
-+	 * constant. At this minimum value for the smoothing constant,
-+	 * the measured rate contributes for half of the next value of
-+	 * the estimated peak rate.
-+	 *
-+	 * So, the first step is to compute the weight as a function
-+	 * of how sequential the workload is. Note that the weight
-+	 * cannot reach 9, because bfqd->sequential_samples cannot
-+	 * become equal to bfqd->peak_rate_samples, which, in its
-+	 * turn, holds true because bfqd->sequential_samples is not
-+	 * incremented for the first sample.
-+	 */
-+	weight = (9 * bfqd->sequential_samples) / bfqd->peak_rate_samples;
-+
-+	/*
-+	 * Second step: further refine the weight as a function of the
-+	 * duration of the observation interval.
-+	 */
-+	weight = min_t(u32, 8,
-+		       div_u64(weight * bfqd->delta_from_first,
-+			       BFQ_RATE_REF_INTERVAL));
-+
-+	/*
-+	 * Divisor ranging from 10, for minimum weight, to 2, for
-+	 * maximum weight.
-+	 */
-+	divisor = 10 - weight;
-+	BUG_ON(divisor == 0);
-+
-+	/*
-+	 * Finally, update peak rate:
-+	 *
-+	 * peak_rate = peak_rate * (divisor-1) / divisor  +  rate / divisor
-+	 */
-+	bfqd->peak_rate *= divisor-1;
-+	bfqd->peak_rate /= divisor;
-+	rate /= divisor; /* smoothing constant alpha = 1/divisor */
-+
-+	bfq_log(bfqd,
-+		"update_rate_reset: divisor %d tmp_peak_rate %llu tmp_rate %u",
-+		divisor,
-+		((USEC_PER_SEC*(u64)bfqd->peak_rate)>>BFQ_RATE_SHIFT),
-+		(u32)((USEC_PER_SEC*(u64)rate)>>BFQ_RATE_SHIFT));
-+
-+	BUG_ON(bfqd->peak_rate == 0);
-+	BUG_ON(bfqd->peak_rate > 20<<BFQ_RATE_SHIFT);
-+
-+	bfqd->peak_rate += rate;
-+	update_thr_responsiveness_params(bfqd);
-+	BUG_ON(bfqd->peak_rate > 20<<BFQ_RATE_SHIFT);
-+
-+reset_computation:
-+	bfq_reset_rate_computation(bfqd, rq);
-+}
-+
-+/*
-+ * Update the read/write peak rate (the main quantity used for
-+ * auto-tuning, see update_thr_responsiveness_params()).
-+ *
-+ * It is not trivial to estimate the peak rate (correctly): because of
-+ * the presence of sw and hw queues between the scheduler and the
-+ * device components that finally serve I/O requests, it is hard to
-+ * say exactly when a given dispatched request is served inside the
-+ * device, and for how long. As a consequence, it is hard to know
-+ * precisely at what rate a given set of requests is actually served
-+ * by the device.
-+ *
-+ * On the opposite end, the dispatch time of any request is trivially
-+ * available, and, from this piece of information, the "dispatch rate"
-+ * of requests can be immediately computed. So, the idea in the next
-+ * function is to use what is known, namely request dispatch times
-+ * (plus, when useful, request completion times), to estimate what is
-+ * unknown, namely in-device request service rate.
-+ *
-+ * The main issue is that, because of the above facts, the rate at
-+ * which a certain set of requests is dispatched over a certain time
-+ * interval can vary greatly with respect to the rate at which the
-+ * same requests are then served. But, since the size of any
-+ * intermediate queue is limited, and the service scheme is lossless
-+ * (no request is silently dropped), the following obvious convergence
-+ * property holds: the number of requests dispatched MUST become
-+ * closer and closer to the number of requests completed as the
-+ * observation interval grows. This is the key property used in
-+ * the next function to estimate the peak service rate as a function
-+ * of the observed dispatch rate. The function assumes to be invoked
-+ * on every request dispatch.
-+ */
-+void bfq_update_peak_rate(struct bfq_data *bfqd, struct request *rq)
-+{
-+	u64 now_ns = ktime_get_ns();
-+
-+	if (bfqd->peak_rate_samples == 0) { /* first dispatch */
-+		bfq_log(bfqd,
-+		"update_peak_rate: goto reset, samples %d",
-+				bfqd->peak_rate_samples) ;
-+		bfq_reset_rate_computation(bfqd, rq);
-+		goto update_last_values; /* will add one sample */
-+	}
-+
-+	/*
-+	 * Device idle for very long: the observation interval lasting
-+	 * up to this dispatch cannot be a valid observation interval
-+	 * for computing a new peak rate (similarly to the late-
-+	 * completion event in bfq_completed_request()). Go to
-+	 * update_rate_and_reset to have the following three steps
-+	 * taken:
-+	 * - close the observation interval at the last (previous)
-+	 *   request dispatch or completion
-+	 * - compute rate, if possible, for that observation interval
-+	 * - start a new observation interval with this dispatch
-+	 */
-+	if (now_ns - bfqd->last_dispatch > 100*NSEC_PER_MSEC &&
-+	    bfqd->rq_in_driver == 0) {
-+		bfq_log(bfqd,
-+"update_peak_rate: jumping to updating&resetting delta_last %lluus samples %d",
-+			(now_ns - bfqd->last_dispatch)>>10,
-+			bfqd->peak_rate_samples) ;
-+		goto update_rate_and_reset;
-+	}
-+
-+	/* Update sampling information */
-+	bfqd->peak_rate_samples++;
-+
-+	if ((bfqd->rq_in_driver > 0 ||
-+		now_ns - bfqd->last_completion < BFQ_MIN_TT)
-+	     && get_sdist(bfqd->last_position, rq) < BFQQ_SEEK_THR)
-+		bfqd->sequential_samples++;
-+
-+	bfqd->tot_sectors_dispatched += blk_rq_sectors(rq);
-+
-+	/* Reset max observed rq size every 32 dispatches */
-+	if (likely(bfqd->peak_rate_samples % 32))
-+		bfqd->last_rq_max_size =
-+			max_t(u32, blk_rq_sectors(rq), bfqd->last_rq_max_size);
- 	else
--		timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight;
-+		bfqd->last_rq_max_size = blk_rq_sectors(rq);
- 
--	bfqd->last_budget_start = ktime_get();
-+	bfqd->delta_from_first = now_ns - bfqd->first_dispatch;
- 
--	bfq_clear_bfqq_budget_new(bfqq);
--	bfqq->budget_timeout = jiffies +
--		bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * timeout_coeff;
-+	bfq_log(bfqd,
-+	"update_peak_rate: added samples %u/%u tot_sects %llu delta_first %lluus",
-+		bfqd->peak_rate_samples, bfqd->sequential_samples,
-+		bfqd->tot_sectors_dispatched,
-+		bfqd->delta_from_first>>10);
- 
--	bfq_log_bfqq(bfqd, bfqq, "set budget_timeout %u",
--		jiffies_to_msecs(bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] *
--		timeout_coeff));
-+	/* Target observation interval not yet reached, go on sampling */
-+	if (bfqd->delta_from_first < BFQ_RATE_REF_INTERVAL)
-+		goto update_last_values;
-+
-+update_rate_and_reset:
-+	bfq_update_rate_reset(bfqd, rq);
-+update_last_values:
-+	bfqd->last_position = blk_rq_pos(rq) + blk_rq_sectors(rq);
-+	bfqd->last_dispatch = now_ns;
-+
-+	bfq_log(bfqd,
-+	"update_peak_rate: delta_first %lluus last_pos %llu peak_rate %llu",
-+		(now_ns - bfqd->first_dispatch)>>10,
-+		(unsigned long long) bfqd->last_position,
-+		((USEC_PER_SEC*(u64)bfqd->peak_rate)>>BFQ_RATE_SHIFT));
-+	bfq_log(bfqd,
-+	"update_peak_rate: samples at end %d", bfqd->peak_rate_samples);
- }
- 
- /*
-- * Move request from internal lists to the request queue dispatch list.
-+ * Move request from internal lists to the dispatch list of the request queue
-  */
- static void bfq_dispatch_insert(struct request_queue *q, struct request *rq)
- {
--	struct bfq_data *bfqd = q->elevator->elevator_data;
- 	struct bfq_queue *bfqq = RQ_BFQQ(rq);
- 
- 	/*
-@@ -1794,15 +2595,10 @@ static void bfq_dispatch_insert(struct request_queue *q, struct request *rq)
- 	 * incrementing bfqq->dispatched.
- 	 */
- 	bfqq->dispatched++;
-+	bfq_update_peak_rate(q->elevator->elevator_data, rq);
-+
- 	bfq_remove_request(rq);
- 	elv_dispatch_sort(q, rq);
--
--	if (bfq_bfqq_sync(bfqq))
--		bfqd->sync_flight++;
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
--	bfqg_stats_update_dispatch(bfqq_group(bfqq), blk_rq_bytes(rq),
--				   rq->cmd_flags);
--#endif
- }
- 
- /*
-@@ -1822,19 +2618,12 @@ static struct request *bfq_check_fifo(struct bfq_queue *bfqq)
- 
- 	rq = rq_entry_fifo(bfqq->fifo.next);
- 
--	if (time_before(jiffies, rq->fifo_time))
-+	if (ktime_get_ns() < rq->fifo_time)
- 		return NULL;
- 
- 	return rq;
- }
- 
--static int bfq_bfqq_budget_left(struct bfq_queue *bfqq)
--{
--	struct bfq_entity *entity = &bfqq->entity;
--
--	return entity->budget - entity->service;
--}
--
- static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
- 	BUG_ON(bfqq != bfqd->in_service_queue);
-@@ -1851,12 +2640,15 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		bfq_mark_bfqq_split_coop(bfqq);
- 
- 	if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
--		/*
--		 * Overloading budget_timeout field to store the time
--		 * at which the queue remains with no backlog; used by
--		 * the weight-raising mechanism.
--		 */
--		bfqq->budget_timeout = jiffies;
-+		if (bfqq->dispatched == 0)
-+			/*
-+			 * Overloading budget_timeout field to store
-+			 * the time at which the queue remains with no
-+			 * backlog and no outstanding request; used by
-+			 * the weight-raising mechanism.
-+			 */
-+			bfqq->budget_timeout = jiffies;
-+
- 		bfq_del_bfqq_busy(bfqd, bfqq, 1);
- 	} else {
- 		bfq_activate_bfqq(bfqd, bfqq);
-@@ -1883,10 +2675,19 @@ static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
- 	struct request *next_rq;
- 	int budget, min_budget;
- 
--	budget = bfqq->max_budget;
-+	BUG_ON(bfqq != bfqd->in_service_queue);
-+
- 	min_budget = bfq_min_budget(bfqd);
- 
--	BUG_ON(bfqq != bfqd->in_service_queue);
-+	if (bfqq->wr_coeff == 1)
-+		budget = bfqq->max_budget;
-+	else /*
-+	      * Use a constant, low budget for weight-raised queues,
-+	      * to help achieve a low latency. Keep it slightly higher
-+	      * than the minimum possible budget, to cause a little
-+	      * bit fewer expirations.
-+	      */
-+		budget = 2 * min_budget;
- 
- 	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last budg %d, budg left %d",
- 		bfqq->entity.budget, bfq_bfqq_budget_left(bfqq));
-@@ -1895,7 +2696,7 @@ static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
- 	bfq_log_bfqq(bfqd, bfqq, "recalc_budg: sync %d, seeky %d",
- 		bfq_bfqq_sync(bfqq), BFQQ_SEEKY(bfqd->in_service_queue));
- 
--	if (bfq_bfqq_sync(bfqq)) {
-+	if (bfq_bfqq_sync(bfqq) && bfqq->wr_coeff == 1) {
- 		switch (reason) {
- 		/*
- 		 * Caveat: in all the following cases we trade latency
-@@ -1937,14 +2738,10 @@ static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
- 			break;
- 		case BFQ_BFQQ_BUDGET_TIMEOUT:
- 			/*
--			 * We double the budget here because: 1) it
--			 * gives the chance to boost the throughput if
--			 * this is not a seeky process (which may have
--			 * bumped into this timeout because of, e.g.,
--			 * ZBR), 2) together with charge_full_budget
--			 * it helps give seeky processes higher
--			 * timestamps, and hence be served less
--			 * frequently.
-+			 * We double the budget here because it gives
-+			 * the chance to boost the throughput if this
-+			 * is not a seeky process (and has bumped into
-+			 * this timeout because of, e.g., ZBR).
- 			 */
- 			budget = min(budget * 2, bfqd->bfq_max_budget);
- 			break;
-@@ -1961,17 +2758,49 @@ static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
- 			budget = min(budget * 4, bfqd->bfq_max_budget);
- 			break;
- 		case BFQ_BFQQ_NO_MORE_REQUESTS:
--		       /*
--			* Leave the budget unchanged.
--			*/
-+			/*
-+			 * For queues that expire for this reason, it
-+			 * is particularly important to keep the
-+			 * budget close to the actual service they
-+			 * need. Doing so reduces the timestamp
-+			 * misalignment problem described in the
-+			 * comments in the body of
-+			 * __bfq_activate_entity. In fact, suppose
-+			 * that a queue systematically expires for
-+			 * BFQ_BFQQ_NO_MORE_REQUESTS and presents a
-+			 * new request in time to enjoy timestamp
-+			 * back-shifting. The larger the budget of the
-+			 * queue is with respect to the service the
-+			 * queue actually requests in each service
-+			 * slot, the more times the queue can be
-+			 * reactivated with the same virtual finish
-+			 * time. It follows that, even if this finish
-+			 * time is pushed to the system virtual time
-+			 * to reduce the consequent timestamp
-+			 * misalignment, the queue unjustly enjoys for
-+			 * many re-activations a lower finish time
-+			 * than all newly activated queues.
-+			 *
-+			 * The service needed by bfqq is measured
-+			 * quite precisely by bfqq->entity.service.
-+			 * Since bfqq does not enjoy device idling,
-+			 * bfqq->entity.service is equal to the number
-+			 * of sectors that the process associated with
-+			 * bfqq requested to read/write before waiting
-+			 * for request completions, or blocking for
-+			 * other reasons.
-+			 */
-+			budget = max_t(int, bfqq->entity.service, min_budget);
-+			break;
- 		default:
- 			return;
- 		}
--	} else
-+	} else if (!bfq_bfqq_sync(bfqq))
- 		/*
--		 * Async queues get always the maximum possible budget
--		 * (their ability to dispatch is limited by
--		 * @bfqd->bfq_max_budget_async_rq).
-+		 * Async queues get always the maximum possible
-+		 * budget, as for them we do not care about latency
-+		 * (in addition, their ability to dispatch is limited
-+		 * by the charging factor).
- 		 */
- 		budget = bfqd->bfq_max_budget;
- 
-@@ -1982,160 +2811,120 @@ static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd,
- 		bfqq->max_budget = min(bfqq->max_budget, bfqd->bfq_max_budget);
- 
- 	/*
--	 * Make sure that we have enough budget for the next request.
--	 * Since the finish time of the bfqq must be kept in sync with
--	 * the budget, be sure to call __bfq_bfqq_expire() after the
-+	 * If there is still backlog, then assign a new budget, making
-+	 * sure that it is large enough for the next request.  Since
-+	 * the finish time of bfqq must be kept in sync with the
-+	 * budget, be sure to call __bfq_bfqq_expire() *after* this
- 	 * update.
-+	 *
-+	 * If there is no backlog, then no need to update the budget;
-+	 * it will be updated on the arrival of a new request.
- 	 */
- 	next_rq = bfqq->next_rq;
--	if (next_rq)
-+	if (next_rq) {
-+		BUG_ON(reason == BFQ_BFQQ_TOO_IDLE ||
-+		       reason == BFQ_BFQQ_NO_MORE_REQUESTS);
- 		bfqq->entity.budget = max_t(unsigned long, bfqq->max_budget,
- 					    bfq_serv_to_charge(next_rq, bfqq));
--	else
--		bfqq->entity.budget = bfqq->max_budget;
-+		BUG_ON(!bfq_bfqq_busy(bfqq));
-+		BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list));
-+	}
- 
- 	bfq_log_bfqq(bfqd, bfqq, "head sect: %u, new budget %d",
- 			next_rq ? blk_rq_sectors(next_rq) : 0,
- 			bfqq->entity.budget);
- }
- 
--static unsigned long bfq_calc_max_budget(u64 peak_rate, u64 timeout)
--{
--	unsigned long max_budget;
--
--	/*
--	 * The max_budget calculated when autotuning is equal to the
--	 * amount of sectors transfered in timeout_sync at the
--	 * estimated peak rate.
--	 */
--	max_budget = (unsigned long)(peak_rate * 1000 *
--				     timeout >> BFQ_RATE_SHIFT);
--
--	return max_budget;
--}
--
- /*
-- * In addition to updating the peak rate, checks whether the process
-- * is "slow", and returns 1 if so. This slow flag is used, in addition
-- * to the budget timeout, to reduce the amount of service provided to
-- * seeky processes, and hence reduce their chances to lower the
-- * throughput. See the code for more details.
-+ * Return true if the process associated with bfqq is "slow". The slow
-+ * flag is used, in addition to the budget timeout, to reduce the
-+ * amount of service provided to seeky processes, and thus reduce
-+ * their chances to lower the throughput. More details in the comments
-+ * on the function bfq_bfqq_expire().
-+ *
-+ * An important observation is in order: as discussed in the comments
-+ * on the function bfq_update_peak_rate(), with devices with internal
-+ * queues, it is hard if ever possible to know when and for how long
-+ * an I/O request is processed by the device (apart from the trivial
-+ * I/O pattern where a new request is dispatched only after the
-+ * previous one has been completed). This makes it hard to evaluate
-+ * the real rate at which the I/O requests of each bfq_queue are
-+ * served.  In fact, for an I/O scheduler like BFQ, serving a
-+ * bfq_queue means just dispatching its requests during its service
-+ * slot (i.e., until the budget of the queue is exhausted, or the
-+ * queue remains idle, or, finally, a timeout fires). But, during the
-+ * service slot of a bfq_queue, around 100 ms at most, the device may
-+ * be even still processing requests of bfq_queues served in previous
-+ * service slots. On the opposite end, the requests of the in-service
-+ * bfq_queue may be completed after the service slot of the queue
-+ * finishes.
-+ *
-+ * Anyway, unless more sophisticated solutions are used
-+ * (where possible), the sum of the sizes of the requests dispatched
-+ * during the service slot of a bfq_queue is probably the only
-+ * approximation available for the service received by the bfq_queue
-+ * during its service slot. And this sum is the quantity used in this
-+ * function to evaluate the I/O speed of a process.
-  */
--static bool bfq_update_peak_rate(struct bfq_data *bfqd, struct bfq_queue *bfqq,
--				 bool compensate, enum bfqq_expiration reason)
-+static bool bfq_bfqq_is_slow(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				 bool compensate, enum bfqq_expiration reason,
-+				 unsigned long *delta_ms)
- {
--	u64 bw, usecs, expected, timeout;
--	ktime_t delta;
--	int update = 0;
-+	ktime_t delta_ktime;
-+	u32 delta_usecs;
-+	bool slow = BFQQ_SEEKY(bfqq); /* if delta too short, use seekyness */
- 
--	if (!bfq_bfqq_sync(bfqq) || bfq_bfqq_budget_new(bfqq))
-+	if (!bfq_bfqq_sync(bfqq))
- 		return false;
- 
- 	if (compensate)
--		delta = bfqd->last_idling_start;
--	else
--		delta = ktime_get();
--	delta = ktime_sub(delta, bfqd->last_budget_start);
--	usecs = ktime_to_us(delta);
--
--	/* Don't trust short/unrealistic values. */
--	if (usecs < 100 || usecs >= LONG_MAX)
--		return false;
--
--	/*
--	 * Calculate the bandwidth for the last slice.  We use a 64 bit
--	 * value to store the peak rate, in sectors per usec in fixed
--	 * point math.  We do so to have enough precision in the estimate
--	 * and to avoid overflows.
--	 */
--	bw = (u64)bfqq->entity.service << BFQ_RATE_SHIFT;
--	do_div(bw, (unsigned long)usecs);
--
--	timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
--
--	/*
--	 * Use only long (> 20ms) intervals to filter out spikes for
--	 * the peak rate estimation.
--	 */
--	if (usecs > 20000) {
--		if (bw > bfqd->peak_rate ||
--		   (!BFQQ_SEEKY(bfqq) &&
--		    reason == BFQ_BFQQ_BUDGET_TIMEOUT)) {
--			bfq_log(bfqd, "measured bw =%llu", bw);
--			/*
--			 * To smooth oscillations use a low-pass filter with
--			 * alpha=7/8, i.e.,
--			 * new_rate = (7/8) * old_rate + (1/8) * bw
--			 */
--			do_div(bw, 8);
--			if (bw == 0)
--				return 0;
--			bfqd->peak_rate *= 7;
--			do_div(bfqd->peak_rate, 8);
--			bfqd->peak_rate += bw;
--			update = 1;
--			bfq_log(bfqd, "new peak_rate=%llu", bfqd->peak_rate);
--		}
--
--		update |= bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES - 1;
--
--		if (bfqd->peak_rate_samples < BFQ_PEAK_RATE_SAMPLES)
--			bfqd->peak_rate_samples++;
--
--		if (bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES &&
--		    update) {
--			int dev_type = blk_queue_nonrot(bfqd->queue);
--
--			if (bfqd->bfq_user_max_budget == 0) {
--				bfqd->bfq_max_budget =
--					bfq_calc_max_budget(bfqd->peak_rate,
--							    timeout);
--				bfq_log(bfqd, "new max_budget=%d",
--					bfqd->bfq_max_budget);
--			}
--			if (bfqd->device_speed == BFQ_BFQD_FAST &&
--			    bfqd->peak_rate < device_speed_thresh[dev_type]) {
--				bfqd->device_speed = BFQ_BFQD_SLOW;
--				bfqd->RT_prod = R_slow[dev_type] *
--						T_slow[dev_type];
--			} else if (bfqd->device_speed == BFQ_BFQD_SLOW &&
--			    bfqd->peak_rate > device_speed_thresh[dev_type]) {
--				bfqd->device_speed = BFQ_BFQD_FAST;
--				bfqd->RT_prod = R_fast[dev_type] *
--						T_fast[dev_type];
--			}
--		}
-+		delta_ktime = bfqd->last_idling_start;
-+	else
-+		delta_ktime = ktime_get();
-+	delta_ktime = ktime_sub(delta_ktime, bfqd->last_budget_start);
-+	delta_usecs = ktime_to_us(delta_ktime);
-+
-+	/* don't trust short/unrealistic values. */
-+	if (delta_usecs < 1000 || delta_usecs >= LONG_MAX) {
-+		if (blk_queue_nonrot(bfqd->queue))
-+			 /*
-+			  * give same worst-case guarantees as idling
-+			  * for seeky
-+			  */
-+			*delta_ms = BFQ_MIN_TT / NSEC_PER_MSEC;
-+		else /* charge at least one seek */
-+			*delta_ms = bfq_slice_idle / NSEC_PER_MSEC;
-+
-+		bfq_log(bfqd, "bfq_bfqq_is_slow: unrealistic %u", delta_usecs);
-+
-+		return slow;
- 	}
- 
--	/*
--	 * If the process has been served for a too short time
--	 * interval to let its possible sequential accesses prevail on
--	 * the initial seek time needed to move the disk head on the
--	 * first sector it requested, then give the process a chance
--	 * and for the moment return false.
--	 */
--	if (bfqq->entity.budget <= bfq_max_budget(bfqd) / 8)
--		return false;
-+	*delta_ms = delta_usecs / USEC_PER_MSEC;
- 
- 	/*
--	 * A process is considered ``slow'' (i.e., seeky, so that we
--	 * cannot treat it fairly in the service domain, as it would
--	 * slow down too much the other processes) if, when a slice
--	 * ends for whatever reason, it has received service at a
--	 * rate that would not be high enough to complete the budget
--	 * before the budget timeout expiration.
-+	 * Use only long (> 20ms) intervals to filter out excessive
-+	 * spikes in service rate estimation.
- 	 */
--	expected = bw * 1000 * timeout >> BFQ_RATE_SHIFT;
-+	if (delta_usecs > 20000) {
-+		/*
-+		 * Caveat for rotational devices: processes doing I/O
-+		 * in the slower disk zones tend to be slow(er) even
-+		 * if not seeky. In this respect, the estimated peak
-+		 * rate is likely to be an average over the disk
-+		 * surface. Accordingly, to not be too harsh with
-+		 * unlucky processes, a process is deemed slow only if
-+		 * its rate has been lower than half of the estimated
-+		 * peak rate.
-+		 */
-+		slow = bfqq->entity.service < bfqd->bfq_max_budget / 2;
-+		bfq_log(bfqd, "bfq_bfqq_is_slow: relative rate %d/%d",
-+			bfqq->entity.service, bfqd->bfq_max_budget);
-+	}
- 
--	/*
--	 * Caveat: processes doing IO in the slower disk zones will
--	 * tend to be slow(er) even if not seeky. And the estimated
--	 * peak rate will actually be an average over the disk
--	 * surface. Hence, to not be too harsh with unlucky processes,
--	 * we keep a budget/3 margin of safety before declaring a
--	 * process slow.
--	 */
--	return expected > (4 * bfqq->entity.budget) / 3;
-+	bfq_log_bfqq(bfqd, bfqq, "bfq_bfqq_is_slow: slow %d", slow);
-+
-+	return slow;
- }
- 
- /*
-@@ -2193,20 +2982,35 @@ static bool bfq_update_peak_rate(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd,
- 						struct bfq_queue *bfqq)
- {
-+	bfq_log_bfqq(bfqd, bfqq,
-+"softrt_next_start: service_blkg %lu soft_rate %u sects/sec interval %u",
-+		     bfqq->service_from_backlogged,
-+		     bfqd->bfq_wr_max_softrt_rate,
-+		     jiffies_to_msecs(HZ * bfqq->service_from_backlogged /
-+				      bfqd->bfq_wr_max_softrt_rate));
-+
- 	return max(bfqq->last_idle_bklogged +
- 		   HZ * bfqq->service_from_backlogged /
- 		   bfqd->bfq_wr_max_softrt_rate,
--		   jiffies + bfqq->bfqd->bfq_slice_idle + 4);
-+		   jiffies + nsecs_to_jiffies(bfqq->bfqd->bfq_slice_idle) + 4);
-+}
-+
-+/*
-+ * Return the farthest future time instant according to jiffies
-+ * macros.
-+ */
-+static unsigned long bfq_greatest_from_now(void)
-+{
-+	return jiffies + MAX_JIFFY_OFFSET;
- }
- 
- /*
-- * Return the largest-possible time instant such that, for as long as possible,
-- * the current time will be lower than this time instant according to the macro
-- * time_is_before_jiffies().
-+ * Return the farthest past time instant according to jiffies
-+ * macros.
-  */
--static unsigned long bfq_infinity_from_now(unsigned long now)
-+static unsigned long bfq_smallest_from_now(void)
- {
--	return now + ULONG_MAX / 2;
-+	return jiffies - MAX_JIFFY_OFFSET;
- }
- 
- /**
-@@ -2216,28 +3020,24 @@ static unsigned long bfq_infinity_from_now(unsigned long now)
-  * @compensate: if true, compensate for the time spent idling.
-  * @reason: the reason causing the expiration.
-  *
-+ * If the process associated with bfqq does slow I/O (e.g., because it
-+ * issues random requests), we charge bfqq with the time it has been
-+ * in service instead of the service it has received (see
-+ * bfq_bfqq_charge_time for details on how this goal is achieved). As
-+ * a consequence, bfqq will typically get higher timestamps upon
-+ * reactivation, and hence it will be rescheduled as if it had
-+ * received more service than what it has actually received. In the
-+ * end, bfqq receives less service in proportion to how slowly its
-+ * associated process consumes its budgets (and hence how seriously it
-+ * tends to lower the throughput). In addition, this time-charging
-+ * strategy guarantees time fairness among slow processes. In
-+ * contrast, if the process associated with bfqq is not slow, we
-+ * charge bfqq exactly with the service it has received.
-  *
-- * If the process associated to the queue is slow (i.e., seeky), or in
-- * case of budget timeout, or, finally, if it is async, we
-- * artificially charge it an entire budget (independently of the
-- * actual service it received). As a consequence, the queue will get
-- * higher timestamps than the correct ones upon reactivation, and
-- * hence it will be rescheduled as if it had received more service
-- * than what it actually received. In the end, this class of processes
-- * will receive less service in proportion to how slowly they consume
-- * their budgets (and hence how seriously they tend to lower the
-- * throughput).
-- *
-- * In contrast, when a queue expires because it has been idling for
-- * too much or because it exhausted its budget, we do not touch the
-- * amount of service it has received. Hence when the queue will be
-- * reactivated and its timestamps updated, the latter will be in sync
-- * with the actual service received by the queue until expiration.
-- *
-- * Charging a full budget to the first type of queues and the exact
-- * service to the others has the effect of using the WF2Q+ policy to
-- * schedule the former on a timeslice basis, without violating the
-- * service domain guarantees of the latter.
-+ * Charging time to the first type of queues and the exact service to
-+ * the other has the effect of using the WF2Q+ policy to schedule the
-+ * former on a timeslice basis, without violating service domain
-+ * guarantees among the latter.
-  */
- static void bfq_bfqq_expire(struct bfq_data *bfqd,
- 			    struct bfq_queue *bfqq,
-@@ -2245,41 +3045,52 @@ static void bfq_bfqq_expire(struct bfq_data *bfqd,
- 			    enum bfqq_expiration reason)
- {
- 	bool slow;
-+	unsigned long delta = 0;
-+	struct bfq_entity *entity = &bfqq->entity;
- 
- 	BUG_ON(bfqq != bfqd->in_service_queue);
- 
- 	/*
--	 * Update disk peak rate for autotuning and check whether the
--	 * process is slow (see bfq_update_peak_rate).
-+	 * Check whether the process is slow (see bfq_bfqq_is_slow).
- 	 */
--	slow = bfq_update_peak_rate(bfqd, bfqq, compensate, reason);
-+	slow = bfq_bfqq_is_slow(bfqd, bfqq, compensate, reason, &delta);
- 
- 	/*
--	 * As above explained, 'punish' slow (i.e., seeky), timed-out
--	 * and async queues, to favor sequential sync workloads.
--	 *
--	 * Processes doing I/O in the slower disk zones will tend to be
--	 * slow(er) even if not seeky. Hence, since the estimated peak
--	 * rate is actually an average over the disk surface, these
--	 * processes may timeout just for bad luck. To avoid punishing
--	 * them we do not charge a full budget to a process that
--	 * succeeded in consuming at least 2/3 of its budget.
-+	 * Increase service_from_backlogged before next statement,
-+	 * because the possible next invocation of
-+	 * bfq_bfqq_charge_time would likely inflate
-+	 * entity->service. In contrast, service_from_backlogged must
-+	 * contain real service, to enable the soft real-time
-+	 * heuristic to correctly compute the bandwidth consumed by
-+	 * bfqq.
- 	 */
--	if (slow || (reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
--		     bfq_bfqq_budget_left(bfqq) >=  bfqq->entity.budget / 3))
--		bfq_bfqq_charge_full_budget(bfqq);
-+	bfqq->service_from_backlogged += entity->service;
- 
--	bfqq->service_from_backlogged += bfqq->entity.service;
-+	/*
-+	 * As above explained, charge slow (typically seeky) and
-+	 * timed-out queues with the time and not the service
-+	 * received, to favor sequential workloads.
-+	 *
-+	 * Processes doing I/O in the slower disk zones will tend to
-+	 * be slow(er) even if not seeky. Therefore, since the
-+	 * estimated peak rate is actually an average over the disk
-+	 * surface, these processes may timeout just for bad luck. To
-+	 * avoid punishing them, do not charge time to processes that
-+	 * succeeded in consuming at least 2/3 of their budget. This
-+	 * allows BFQ to preserve enough elasticity to still perform
-+	 * bandwidth, and not time, distribution with little unlucky
-+	 * or quasi-sequential processes.
-+	 */
-+	if (bfqq->wr_coeff == 1 &&
-+	    (slow ||
-+	     (reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
-+	      bfq_bfqq_budget_left(bfqq) >=  entity->budget / 3)))
-+		bfq_bfqq_charge_time(bfqd, bfqq, delta);
- 
--	if (BFQQ_SEEKY(bfqq) && reason == BFQ_BFQQ_BUDGET_TIMEOUT &&
--	    !bfq_bfqq_constantly_seeky(bfqq)) {
--		bfq_mark_bfqq_constantly_seeky(bfqq);
--		if (!blk_queue_nonrot(bfqd->queue))
--			bfqd->const_seeky_busy_in_flight_queues++;
--	}
-+	BUG_ON(bfqq->entity.budget < bfqq->entity.service);
- 
- 	if (reason == BFQ_BFQQ_TOO_IDLE &&
--	    bfqq->entity.service <= 2 * bfqq->entity.budget / 10)
-+	    entity->service <= 2 * entity->budget / 10)
- 		bfq_clear_bfqq_IO_bound(bfqq);
- 
- 	if (bfqd->low_latency && bfqq->wr_coeff == 1)
-@@ -2288,19 +3099,23 @@ static void bfq_bfqq_expire(struct bfq_data *bfqd,
- 	if (bfqd->low_latency && bfqd->bfq_wr_max_softrt_rate > 0 &&
- 	    RB_EMPTY_ROOT(&bfqq->sort_list)) {
- 		/*
--		 * If we get here, and there are no outstanding requests,
--		 * then the request pattern is isochronous (see the comments
--		 * to the function bfq_bfqq_softrt_next_start()). Hence we
--		 * can compute soft_rt_next_start. If, instead, the queue
--		 * still has outstanding requests, then we have to wait
--		 * for the completion of all the outstanding requests to
-+		 * If we get here, and there are no outstanding
-+		 * requests, then the request pattern is isochronous
-+		 * (see the comments on the function
-+		 * bfq_bfqq_softrt_next_start()). Thus we can compute
-+		 * soft_rt_next_start. If, instead, the queue still
-+		 * has outstanding requests, then we have to wait for
-+		 * the completion of all the outstanding requests to
- 		 * discover whether the request pattern is actually
- 		 * isochronous.
- 		 */
--		if (bfqq->dispatched == 0)
-+		BUG_ON(bfqd->busy_queues < 1);
-+		if (bfqq->dispatched == 0) {
- 			bfqq->soft_rt_next_start =
- 				bfq_bfqq_softrt_next_start(bfqd, bfqq);
--		else {
-+			bfq_log_bfqq(bfqd, bfqq, "new soft_rt_next %lu",
-+				     bfqq->soft_rt_next_start);
-+		} else {
- 			/*
- 			 * The application is still waiting for the
- 			 * completion of one or more requests:
-@@ -2317,7 +3132,7 @@ static void bfq_bfqq_expire(struct bfq_data *bfqd,
- 			 *    happened to be in the past.
- 			 */
- 			bfqq->soft_rt_next_start =
--				bfq_infinity_from_now(jiffies);
-+				bfq_greatest_from_now();
- 			/*
- 			 * Schedule an update of soft_rt_next_start to when
- 			 * the task may be discovered to be isochronous.
-@@ -2327,15 +3142,27 @@ static void bfq_bfqq_expire(struct bfq_data *bfqd,
- 	}
- 
- 	bfq_log_bfqq(bfqd, bfqq,
--		"expire (%d, slow %d, num_disp %d, idle_win %d)", reason,
--		slow, bfqq->dispatched, bfq_bfqq_idle_window(bfqq));
-+		"expire (%d, slow %d, num_disp %d, idle_win %d, weight %d)",
-+		     reason, slow, bfqq->dispatched,
-+		     bfq_bfqq_idle_window(bfqq), entity->weight);
- 
- 	/*
- 	 * Increase, decrease or leave budget unchanged according to
- 	 * reason.
- 	 */
-+	BUG_ON(bfqq->entity.budget < bfqq->entity.service);
- 	__bfq_bfqq_recalc_budget(bfqd, bfqq, reason);
-+	BUG_ON(bfqq->next_rq == NULL &&
-+	       bfqq->entity.budget < bfqq->entity.service);
- 	__bfq_bfqq_expire(bfqd, bfqq);
-+
-+	BUG_ON(!bfq_bfqq_busy(bfqq) && reason == BFQ_BFQQ_BUDGET_EXHAUSTED &&
-+		!bfq_class_idle(bfqq));
-+
-+	if (!bfq_bfqq_busy(bfqq) &&
-+	    reason != BFQ_BFQQ_BUDGET_TIMEOUT &&
-+	    reason != BFQ_BFQQ_BUDGET_EXHAUSTED)
-+		bfq_mark_bfqq_non_blocking_wait_rq(bfqq);
- }
- 
- /*
-@@ -2345,20 +3172,17 @@ static void bfq_bfqq_expire(struct bfq_data *bfqd,
-  */
- static bool bfq_bfqq_budget_timeout(struct bfq_queue *bfqq)
- {
--	if (bfq_bfqq_budget_new(bfqq) ||
--	    time_before(jiffies, bfqq->budget_timeout))
--		return false;
--	return true;
-+	return time_is_before_eq_jiffies(bfqq->budget_timeout);
- }
- 
- /*
-- * If we expire a queue that is waiting for the arrival of a new
-- * request, we may prevent the fictitious timestamp back-shifting that
-- * allows the guarantees of the queue to be preserved (see [1] for
-- * this tricky aspect). Hence we return true only if this condition
-- * does not hold, or if the queue is slow enough to deserve only to be
-- * kicked off for preserving a high throughput.
--*/
-+ * If we expire a queue that is actively waiting (i.e., with the
-+ * device idled) for the arrival of a new request, then we may incur
-+ * the timestamp misalignment problem described in the body of the
-+ * function __bfq_activate_entity. Hence we return true only if this
-+ * condition does not hold, or if the queue is slow enough to deserve
-+ * only to be kicked off for preserving a high throughput.
-+ */
- static bool bfq_may_expire_for_budg_timeout(struct bfq_queue *bfqq)
- {
- 	bfq_log_bfqq(bfqq->bfqd, bfqq,
-@@ -2400,10 +3224,12 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
- {
- 	struct bfq_data *bfqd = bfqq->bfqd;
- 	bool idling_boosts_thr, idling_boosts_thr_without_issues,
--		all_queues_seeky, on_hdd_and_not_all_queues_seeky,
- 		idling_needed_for_service_guarantees,
- 		asymmetric_scenario;
- 
-+	if (bfqd->strict_guarantees)
-+		return true;
-+
- 	/*
- 	 * The next variable takes into account the cases where idling
- 	 * boosts the throughput.
-@@ -2466,74 +3292,27 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
- 		bfqd->wr_busy_queues == 0;
- 
- 	/*
--	 * There are then two cases where idling must be performed not
-+	 * There is then a case where idling must be performed not
- 	 * for throughput concerns, but to preserve service
--	 * guarantees. In the description of these cases, we say, for
--	 * short, that a queue is sequential/random if the process
--	 * associated to the queue issues sequential/random requests
--	 * (in the second case the queue may be tagged as seeky or
--	 * even constantly_seeky).
--	 *
--	 * To introduce the first case, we note that, since
--	 * bfq_bfqq_idle_window(bfqq) is false if the device is
--	 * NCQ-capable and bfqq is random (see
--	 * bfq_update_idle_window()), then, from the above two
--	 * assignments it follows that
--	 * idling_boosts_thr_without_issues is false if the device is
--	 * NCQ-capable and bfqq is random. Therefore, for this case,
--	 * device idling would never be allowed if we used just
--	 * idling_boosts_thr_without_issues to decide whether to allow
--	 * it. And, beneficially, this would imply that throughput
--	 * would always be boosted also with random I/O on NCQ-capable
--	 * HDDs.
-+	 * guarantees.
- 	 *
--	 * But we must be careful on this point, to avoid an unfair
--	 * treatment for bfqq. In fact, because of the same above
--	 * assignments, idling_boosts_thr_without_issues is, on the
--	 * other hand, true if 1) the device is an HDD and bfqq is
--	 * sequential, and 2) there are no busy weight-raised
--	 * queues. As a consequence, if we used just
--	 * idling_boosts_thr_without_issues to decide whether to idle
--	 * the device, then with an HDD we might easily bump into a
--	 * scenario where queues that are sequential and I/O-bound
--	 * would enjoy idling, whereas random queues would not. The
--	 * latter might then get a low share of the device throughput,
--	 * simply because the former would get many requests served
--	 * after being set as in service, while the latter would not.
--	 *
--	 * To address this issue, we start by setting to true a
--	 * sentinel variable, on_hdd_and_not_all_queues_seeky, if the
--	 * device is rotational and not all queues with pending or
--	 * in-flight requests are constantly seeky (i.e., there are
--	 * active sequential queues, and bfqq might then be mistreated
--	 * if it does not enjoy idling because it is random).
--	 */
--	all_queues_seeky = bfq_bfqq_constantly_seeky(bfqq) &&
--			   bfqd->busy_in_flight_queues ==
--			   bfqd->const_seeky_busy_in_flight_queues;
--
--	on_hdd_and_not_all_queues_seeky =
--		!blk_queue_nonrot(bfqd->queue) && !all_queues_seeky;
--
--	/*
--	 * To introduce the second case where idling needs to be
--	 * performed to preserve service guarantees, we can note that
--	 * allowing the drive to enqueue more than one request at a
--	 * time, and hence delegating de facto final scheduling
--	 * decisions to the drive's internal scheduler, causes loss of
--	 * control on the actual request service order. In particular,
--	 * the critical situation is when requests from different
--	 * processes happens to be present, at the same time, in the
--	 * internal queue(s) of the drive. In such a situation, the
--	 * drive, by deciding the service order of the
--	 * internally-queued requests, does determine also the actual
--	 * throughput distribution among these processes. But the
--	 * drive typically has no notion or concern about per-process
--	 * throughput distribution, and makes its decisions only on a
--	 * per-request basis. Therefore, the service distribution
--	 * enforced by the drive's internal scheduler is likely to
--	 * coincide with the desired device-throughput distribution
--	 * only in a completely symmetric scenario where:
-+	 * To introduce this case, we can note that allowing the drive
-+	 * to enqueue more than one request at a time, and hence
-+	 * delegating de facto final scheduling decisions to the
-+	 * drive's internal scheduler, entails loss of control on the
-+	 * actual request service order. In particular, the critical
-+	 * situation is when requests from different processes happen
-+	 * to be present, at the same time, in the internal queue(s)
-+	 * of the drive. In such a situation, the drive, by deciding
-+	 * the service order of the internally-queued requests, does
-+	 * determine also the actual throughput distribution among
-+	 * these processes. But the drive typically has no notion or
-+	 * concern about per-process throughput distribution, and
-+	 * makes its decisions only on a per-request basis. Therefore,
-+	 * the service distribution enforced by the drive's internal
-+	 * scheduler is likely to coincide with the desired
-+	 * device-throughput distribution only in a completely
-+	 * symmetric scenario where:
- 	 * (i)  each of these processes must get the same throughput as
- 	 *      the others;
- 	 * (ii) all these processes have the same I/O pattern
-@@ -2555,26 +3334,53 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
- 	 * words, only if sub-condition (i) holds, then idling is
- 	 * allowed, and the device tends to be prevented from queueing
- 	 * many requests, possibly of several processes. The reason
--	 * for not controlling also sub-condition (ii) is that, first,
--	 * in the case of an HDD, the asymmetry in terms of types of
--	 * I/O patterns is already taken in to account in the above
--	 * sentinel variable
--	 * on_hdd_and_not_all_queues_seeky. Secondly, in the case of a
--	 * flash-based device, we prefer however to privilege
--	 * throughput (and idling lowers throughput for this type of
--	 * devices), for the following reasons:
--	 * 1) differently from HDDs, the service time of random
--	 *    requests is not orders of magnitudes lower than the service
--	 *    time of sequential requests; thus, even if processes doing
--	 *    sequential I/O get a preferential treatment with respect to
--	 *    others doing random I/O, the consequences are not as
--	 *    dramatic as with HDDs;
--	 * 2) if a process doing random I/O does need strong
--	 *    throughput guarantees, it is hopefully already being
--	 *    weight-raised, or the user is likely to have assigned it a
--	 *    higher weight than the other processes (and thus
--	 *    sub-condition (i) is likely to be false, which triggers
--	 *    idling).
-+	 * for not controlling also sub-condition (ii) is that we
-+	 * exploit preemption to preserve guarantees in case of
-+	 * symmetric scenarios, even if (ii) does not hold, as
-+	 * explained in the next two paragraphs.
-+	 *
-+	 * Even if a queue, say Q, is expired when it remains idle, Q
-+	 * can still preempt the new in-service queue if the next
-+	 * request of Q arrives soon (see the comments on
-+	 * bfq_bfqq_update_budg_for_activation). If all queues and
-+	 * groups have the same weight, this form of preemption,
-+	 * combined with the hole-recovery heuristic described in the
-+	 * comments on function bfq_bfqq_update_budg_for_activation,
-+	 * are enough to preserve a correct bandwidth distribution in
-+	 * the mid term, even without idling. In fact, even if not
-+	 * idling allows the internal queues of the device to contain
-+	 * many requests, and thus to reorder requests, we can rather
-+	 * safely assume that the internal scheduler still preserves a
-+	 * minimum of mid-term fairness. The motivation for using
-+	 * preemption instead of idling is that, by not idling,
-+	 * service guarantees are preserved without minimally
-+	 * sacrificing throughput. In other words, both a high
-+	 * throughput and its desired distribution are obtained.
-+	 *
-+	 * More precisely, this preemption-based, idleless approach
-+	 * provides fairness in terms of IOPS, and not sectors per
-+	 * second. This can be seen with a simple example. Suppose
-+	 * that there are two queues with the same weight, but that
-+	 * the first queue receives requests of 8 sectors, while the
-+	 * second queue receives requests of 1024 sectors. In
-+	 * addition, suppose that each of the two queues contains at
-+	 * most one request at a time, which implies that each queue
-+	 * always remains idle after it is served. Finally, after
-+	 * remaining idle, each queue receives very quickly a new
-+	 * request. It follows that the two queues are served
-+	 * alternatively, preempting each other if needed. This
-+	 * implies that, although both queues have the same weight,
-+	 * the queue with large requests receives a service that is
-+	 * 1024/8 times as high as the service received by the other
-+	 * queue.
-+	 *
-+	 * On the other hand, device idling is performed, and thus
-+	 * pure sector-domain guarantees are provided, for the
-+	 * following queues, which are likely to need stronger
-+	 * throughput guarantees: weight-raised queues, and queues
-+	 * with a higher weight than other queues. When such queues
-+	 * are active, sub-condition (i) is false, which triggers
-+	 * device idling.
- 	 *
- 	 * According to the above considerations, the next variable is
- 	 * true (only) if sub-condition (i) holds. To compute the
-@@ -2582,7 +3388,7 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
- 	 * the function bfq_symmetric_scenario(), but also check
- 	 * whether bfqq is being weight-raised, because
- 	 * bfq_symmetric_scenario() does not take into account also
--	 * weight-raised queues (see comments to
-+	 * weight-raised queues (see comments on
- 	 * bfq_weights_tree_add()).
- 	 *
- 	 * As a side note, it is worth considering that the above
-@@ -2604,17 +3410,16 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
- 	 * bfqq. Such a case is when bfqq became active in a burst of
- 	 * queue activations. Queues that became active during a large
- 	 * burst benefit only from throughput, as discussed in the
--	 * comments to bfq_handle_burst. Thus, if bfqq became active
-+	 * comments on bfq_handle_burst. Thus, if bfqq became active
- 	 * in a burst and not idling the device maximizes throughput,
- 	 * then the device must no be idled, because not idling the
- 	 * device provides bfqq and all other queues in the burst with
--	 * maximum benefit. Combining this and the two cases above, we
--	 * can now establish when idling is actually needed to
--	 * preserve service guarantees.
-+	 * maximum benefit. Combining this and the above case, we can
-+	 * now establish when idling is actually needed to preserve
-+	 * service guarantees.
- 	 */
- 	idling_needed_for_service_guarantees =
--		(on_hdd_and_not_all_queues_seeky || asymmetric_scenario) &&
--		!bfq_bfqq_in_large_burst(bfqq);
-+		asymmetric_scenario && !bfq_bfqq_in_large_burst(bfqq);
- 
- 	/*
- 	 * We have now all the components we need to compute the return
-@@ -2624,6 +3429,16 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
- 	 * 2) idling either boosts the throughput (without issues), or
- 	 *    is necessary to preserve service guarantees.
- 	 */
-+	bfq_log_bfqq(bfqd, bfqq, "may_idle: sync %d idling_boosts_thr %d",
-+		     bfq_bfqq_sync(bfqq), idling_boosts_thr);
-+
-+	bfq_log_bfqq(bfqd, bfqq,
-+		     "may_idle: wr_busy %d boosts %d IO-bound %d guar %d",
-+		     bfqd->wr_busy_queues,
-+		     idling_boosts_thr_without_issues,
-+		     bfq_bfqq_IO_bound(bfqq),
-+		     idling_needed_for_service_guarantees);
-+
- 	return bfq_bfqq_sync(bfqq) &&
- 		(idling_boosts_thr_without_issues ||
- 		 idling_needed_for_service_guarantees);
-@@ -2635,7 +3450,7 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq)
-  * 1) the queue must remain in service and cannot be expired, and
-  * 2) the device must be idled to wait for the possible arrival of a new
-  *    request for the queue.
-- * See the comments to the function bfq_bfqq_may_idle for the reasons
-+ * See the comments on the function bfq_bfqq_may_idle for the reasons
-  * why performing device idling is the best choice to boost the throughput
-  * and preserve service guarantees when bfq_bfqq_may_idle itself
-  * returns true.
-@@ -2665,7 +3480,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- 	bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue");
- 
- 	if (bfq_may_expire_for_budg_timeout(bfqq) &&
--	    !timer_pending(&bfqd->idle_slice_timer) &&
-+	    !hrtimer_active(&bfqd->idle_slice_timer) &&
- 	    !bfq_bfqq_must_idle(bfqq))
- 		goto expire;
- 
-@@ -2685,7 +3500,8 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- 			 * not disable disk idling even when a new request
- 			 * arrives.
- 			 */
--			if (timer_pending(&bfqd->idle_slice_timer)) {
-+			if (bfq_bfqq_wait_request(bfqq)) {
-+				BUG_ON(!hrtimer_active(&bfqd->idle_slice_timer));
- 				/*
- 				 * If we get here: 1) at least a new request
- 				 * has arrived but we have not disabled the
-@@ -2700,10 +3516,8 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- 				 * So we disable idling.
- 				 */
- 				bfq_clear_bfqq_wait_request(bfqq);
--				del_timer(&bfqd->idle_slice_timer);
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+				hrtimer_try_to_cancel(&bfqd->idle_slice_timer);
- 				bfqg_stats_update_idle_time(bfqq_group(bfqq));
--#endif
- 			}
- 			goto keep_queue;
- 		}
-@@ -2714,7 +3528,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd)
- 	 * for a new request, or has requests waiting for a completion and
- 	 * may idle after their completion, then keep it anyway.
- 	 */
--	if (timer_pending(&bfqd->idle_slice_timer) ||
-+	if (hrtimer_active(&bfqd->idle_slice_timer) ||
- 	    (bfqq->dispatched != 0 && bfq_bfqq_may_idle(bfqq))) {
- 		bfqq = NULL;
- 		goto keep_queue;
-@@ -2736,6 +3550,9 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 	struct bfq_entity *entity = &bfqq->entity;
- 
- 	if (bfqq->wr_coeff > 1) { /* queue is being weight-raised */
-+		BUG_ON(bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time &&
-+		       time_is_after_jiffies(bfqq->last_wr_start_finish));
-+
- 		bfq_log_bfqq(bfqd, bfqq,
- 			"raising period dur %u/%u msec, old coeff %u, w %d(%d)",
- 			jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish),
-@@ -2749,22 +3566,30 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 			bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change");
- 
- 		/*
--		 * If the queue was activated in a burst, or
--		 * too much time has elapsed from the beginning
--		 * of this weight-raising period, or the queue has
--		 * exceeded the acceptable number of cooperations,
--		 * then end weight raising.
-+		 * If the queue was activated in a burst, or too much
-+		 * time has elapsed from the beginning of this
-+		 * weight-raising period, then end weight raising.
- 		 */
--		if (bfq_bfqq_in_large_burst(bfqq) ||
--		    bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh ||
--		    time_is_before_jiffies(bfqq->last_wr_start_finish +
--					   bfqq->wr_cur_max_time)) {
--			bfqq->last_wr_start_finish = jiffies;
--			bfq_log_bfqq(bfqd, bfqq,
--				     "wrais ending at %lu, rais_max_time %u",
--				     bfqq->last_wr_start_finish,
--				     jiffies_to_msecs(bfqq->wr_cur_max_time));
-+		if (bfq_bfqq_in_large_burst(bfqq))
- 			bfq_bfqq_end_wr(bfqq);
-+		else if (time_is_before_jiffies(bfqq->last_wr_start_finish +
-+					   bfqq->wr_cur_max_time)) {
-+			if (bfqq->wr_cur_max_time != bfqd->bfq_wr_rt_max_time ||
-+			time_is_before_jiffies(bfqq->wr_start_at_switch_to_srt +
-+					bfq_wr_duration(bfqd)))
-+				bfq_bfqq_end_wr(bfqq);
-+			else {
-+				/* switch back to interactive wr */
-+				bfqq->wr_coeff = bfqd->bfq_wr_coeff;
-+				bfqq->wr_cur_max_time = bfq_wr_duration(bfqd);
-+				bfqq->last_wr_start_finish =
-+					bfqq->wr_start_at_switch_to_srt;
-+				BUG_ON(time_is_after_jiffies(
-+					       bfqq->last_wr_start_finish));
-+				bfqq->entity.prio_changed = 1;
-+				bfq_log_bfqq(bfqd, bfqq,
-+					"back to interactive wr");
-+			}
- 		}
- 	}
- 	/* Update weight both if it must be raised and if it must be lowered */
-@@ -2815,13 +3640,29 @@ static int bfq_dispatch_request(struct bfq_data *bfqd,
- 		 */
- 		if (!bfqd->rq_in_driver)
- 			bfq_schedule_dispatch(bfqd);
-+		BUG_ON(bfqq->entity.budget < bfqq->entity.service);
- 		goto expire;
- 	}
- 
-+	BUG_ON(bfqq->entity.budget < bfqq->entity.service);
- 	/* Finally, insert request into driver dispatch list. */
- 	bfq_bfqq_served(bfqq, service_to_charge);
-+
-+	BUG_ON(bfqq->entity.budget < bfqq->entity.service);
-+
- 	bfq_dispatch_insert(bfqd->queue, rq);
- 
-+	/*
-+	 * If weight raising has to terminate for bfqq, then next
-+	 * function causes an immediate update of bfqq's weight,
-+	 * without waiting for next activation. As a consequence, on
-+	 * expiration, bfqq will be timestamped as if has never been
-+	 * weight-raised during this service slot, even if it has
-+	 * received part or even most of the service as a
-+	 * weight-raised queue. This inflates bfqq's timestamps, which
-+	 * is beneficial, as bfqq is then more willing to leave the
-+	 * device immediately to possible other weight-raised queues.
-+	 */
- 	bfq_update_wr_data(bfqd, bfqq);
- 
- 	bfq_log_bfqq(bfqd, bfqq,
-@@ -2837,9 +3678,7 @@ static int bfq_dispatch_request(struct bfq_data *bfqd,
- 		bfqd->in_service_bic = RQ_BIC(rq);
- 	}
- 
--	if (bfqd->busy_queues > 1 && ((!bfq_bfqq_sync(bfqq) &&
--	    dispatched >= bfqd->bfq_max_budget_async_rq) ||
--	    bfq_class_idle(bfqq)))
-+	if (bfqd->busy_queues > 1 && bfq_class_idle(bfqq))
- 		goto expire;
- 
- 	return dispatched;
-@@ -2885,8 +3724,8 @@ static int bfq_forced_dispatch(struct bfq_data *bfqd)
- 		st = bfq_entity_service_tree(&bfqq->entity);
- 
- 		dispatched += __bfq_forced_dispatch_bfqq(bfqq);
--		bfqq->max_budget = bfq_max_budget(bfqd);
- 
-+		bfqq->max_budget = bfq_max_budget(bfqd);
- 		bfq_forget_idle(st);
- 	}
- 
-@@ -2899,37 +3738,37 @@ static int bfq_dispatch_requests(struct request_queue *q, int force)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
- 	struct bfq_queue *bfqq;
--	int max_dispatch;
- 
- 	bfq_log(bfqd, "dispatch requests: %d busy queues", bfqd->busy_queues);
-+
- 	if (bfqd->busy_queues == 0)
- 		return 0;
- 
- 	if (unlikely(force))
- 		return bfq_forced_dispatch(bfqd);
- 
-+	/*
-+	 * Force device to serve one request at a time if
-+	 * strict_guarantees is true. Forcing this service scheme is
-+	 * currently the ONLY way to guarantee that the request
-+	 * service order enforced by the scheduler is respected by a
-+	 * queueing device. Otherwise the device is free even to make
-+	 * some unlucky request wait for as long as the device
-+	 * wishes.
-+	 *
-+	 * Of course, serving one request at at time may cause loss of
-+	 * throughput.
-+	 */
-+	if (bfqd->strict_guarantees && bfqd->rq_in_driver > 0)
-+		return 0;
-+
- 	bfqq = bfq_select_queue(bfqd);
- 	if (!bfqq)
- 		return 0;
- 
--	if (bfq_class_idle(bfqq))
--		max_dispatch = 1;
--
--	if (!bfq_bfqq_sync(bfqq))
--		max_dispatch = bfqd->bfq_max_budget_async_rq;
--
--	if (!bfq_bfqq_sync(bfqq) && bfqq->dispatched >= max_dispatch) {
--		if (bfqd->busy_queues > 1)
--			return 0;
--		if (bfqq->dispatched >= 4 * max_dispatch)
--			return 0;
--	}
--
--	if (bfqd->sync_flight != 0 && !bfq_bfqq_sync(bfqq))
--		return 0;
-+	BUG_ON(bfqq->entity.budget < bfqq->entity.service);
- 
--	bfq_clear_bfqq_wait_request(bfqq);
--	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+	BUG_ON(bfq_bfqq_wait_request(bfqq));
- 
- 	if (!bfq_dispatch_request(bfqd, bfqq))
- 		return 0;
-@@ -2937,6 +3776,8 @@ static int bfq_dispatch_requests(struct request_queue *q, int force)
- 	bfq_log_bfqq(bfqd, bfqq, "dispatched %s request",
- 			bfq_bfqq_sync(bfqq) ? "sync" : "async");
- 
-+	BUG_ON(bfqq->next_rq == NULL &&
-+	       bfqq->entity.budget < bfqq->entity.service);
- 	return 1;
- }
- 
-@@ -2948,23 +3789,22 @@ static int bfq_dispatch_requests(struct request_queue *q, int force)
-  */
- static void bfq_put_queue(struct bfq_queue *bfqq)
- {
--	struct bfq_data *bfqd = bfqq->bfqd;
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	struct bfq_group *bfqg = bfqq_group(bfqq);
- #endif
- 
--	BUG_ON(atomic_read(&bfqq->ref) <= 0);
-+	BUG_ON(bfqq->ref <= 0);
- 
--	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p %d", bfqq,
--		     atomic_read(&bfqq->ref));
--	if (!atomic_dec_and_test(&bfqq->ref))
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d", bfqq, bfqq->ref);
-+	bfqq->ref--;
-+	if (bfqq->ref)
- 		return;
- 
- 	BUG_ON(rb_first(&bfqq->sort_list));
- 	BUG_ON(bfqq->allocated[READ] + bfqq->allocated[WRITE] != 0);
- 	BUG_ON(bfqq->entity.tree);
- 	BUG_ON(bfq_bfqq_busy(bfqq));
--	BUG_ON(bfqd->in_service_queue == bfqq);
-+	BUG_ON(bfqq->bfqd->in_service_queue == bfqq);
- 
- 	if (bfq_bfqq_sync(bfqq))
- 		/*
-@@ -2977,7 +3817,7 @@ static void bfq_put_queue(struct bfq_queue *bfqq)
- 		 */
- 		hlist_del_init(&bfqq->burst_list_node);
- 
--	bfq_log_bfqq(bfqd, bfqq, "put_queue: %p freed", bfqq);
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p freed", bfqq);
- 
- 	kmem_cache_free(bfq_pool, bfqq);
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
-@@ -3011,8 +3851,7 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 		bfq_schedule_dispatch(bfqd);
- 	}
- 
--	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq,
--		     atomic_read(&bfqq->ref));
-+	bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq, bfqq->ref);
- 
- 	bfq_put_cooperator(bfqq);
- 
-@@ -3021,28 +3860,7 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 
- static void bfq_init_icq(struct io_cq *icq)
- {
--	struct bfq_io_cq *bic = icq_to_bic(icq);
--
--	bic->ttime.last_end_request = jiffies;
--	/*
--	 * A newly created bic indicates that the process has just
--	 * started doing I/O, and is probably mapping into memory its
--	 * executable and libraries: it definitely needs weight raising.
--	 * There is however the possibility that the process performs,
--	 * for a while, I/O close to some other process. EQM intercepts
--	 * this behavior and may merge the queue corresponding to the
--	 * process  with some other queue, BEFORE the weight of the queue
--	 * is raised. Merged queues are not weight-raised (they are assumed
--	 * to belong to processes that benefit only from high throughput).
--	 * If the merge is basically the consequence of an accident, then
--	 * the queue will be split soon and will get back its old weight.
--	 * It is then important to write down somewhere that this queue
--	 * does need weight raising, even if it did not make it to get its
--	 * weight raised before being merged. To this purpose, we overload
--	 * the field raising_time_left and assign 1 to it, to mark the queue
--	 * as needing weight raising.
--	 */
--	bic->wr_time_left = 1;
-+	icq_to_bic(icq)->ttime.last_end_request = ktime_get_ns() - (1ULL<<32);
- }
- 
- static void bfq_exit_icq(struct io_cq *icq)
-@@ -3050,21 +3868,21 @@ static void bfq_exit_icq(struct io_cq *icq)
- 	struct bfq_io_cq *bic = icq_to_bic(icq);
- 	struct bfq_data *bfqd = bic_to_bfqd(bic);
- 
--	if (bic->bfqq[BLK_RW_ASYNC]) {
--		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_ASYNC]);
--		bic->bfqq[BLK_RW_ASYNC] = NULL;
-+	if (bic_to_bfqq(bic, false)) {
-+		bfq_exit_bfqq(bfqd, bic_to_bfqq(bic, false));
-+		bic_set_bfqq(bic, NULL, false);
- 	}
- 
--	if (bic->bfqq[BLK_RW_SYNC]) {
-+	if (bic_to_bfqq(bic, true)) {
- 		/*
- 		 * If the bic is using a shared queue, put the reference
- 		 * taken on the io_context when the bic started using a
- 		 * shared bfq_queue.
- 		 */
--		if (bfq_bfqq_coop(bic->bfqq[BLK_RW_SYNC]))
-+		if (bfq_bfqq_coop(bic_to_bfqq(bic, true)))
- 			put_io_context(icq->ioc);
--		bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]);
--		bic->bfqq[BLK_RW_SYNC] = NULL;
-+		bfq_exit_bfqq(bfqd, bic_to_bfqq(bic, true));
-+		bic_set_bfqq(bic, NULL, true);
- 	}
- }
- 
-@@ -3072,8 +3890,8 @@ static void bfq_exit_icq(struct io_cq *icq)
-  * Update the entity prio values; note that the new values will not
-  * be used until the next (re)activation.
-  */
--static void
--bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
-+static void bfq_set_next_ioprio_data(struct bfq_queue *bfqq,
-+				     struct bfq_io_cq *bic)
- {
- 	struct task_struct *tsk = current;
- 	int ioprio_class;
-@@ -3105,7 +3923,7 @@ bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
- 		break;
- 	}
- 
--	if (bfqq->new_ioprio < 0 || bfqq->new_ioprio >= IOPRIO_BE_NR) {
-+	if (bfqq->new_ioprio >= IOPRIO_BE_NR) {
- 		pr_crit("bfq_set_next_ioprio_data: new_ioprio %d\n",
- 			bfqq->new_ioprio);
- 		BUG();
-@@ -3113,45 +3931,40 @@ bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic)
- 
- 	bfqq->entity.new_weight = bfq_ioprio_to_weight(bfqq->new_ioprio);
- 	bfqq->entity.prio_changed = 1;
-+	bfq_log_bfqq(bfqq->bfqd, bfqq,
-+		     "set_next_ioprio_data: bic_class %d prio %d class %d",
-+		     ioprio_class, bfqq->new_ioprio, bfqq->new_ioprio_class);
- }
- 
- static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio)
- {
--	struct bfq_data *bfqd;
--	struct bfq_queue *bfqq, *new_bfqq;
-+	struct bfq_data *bfqd = bic_to_bfqd(bic);
-+	struct bfq_queue *bfqq;
- 	unsigned long uninitialized_var(flags);
- 	int ioprio = bic->icq.ioc->ioprio;
- 
--	bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data),
--				   &flags);
- 	/*
- 	 * This condition may trigger on a newly created bic, be sure to
- 	 * drop the lock before returning.
- 	 */
- 	if (unlikely(!bfqd) || likely(bic->ioprio == ioprio))
--		goto out;
-+		return;
- 
- 	bic->ioprio = ioprio;
- 
--	bfqq = bic->bfqq[BLK_RW_ASYNC];
-+	bfqq = bic_to_bfqq(bic, false);
- 	if (bfqq) {
--		new_bfqq = bfq_get_queue(bfqd, bio, BLK_RW_ASYNC, bic,
--					 GFP_ATOMIC);
--		if (new_bfqq) {
--			bic->bfqq[BLK_RW_ASYNC] = new_bfqq;
--			bfq_log_bfqq(bfqd, bfqq,
--				     "check_ioprio_change: bfqq %p %d",
--				     bfqq, atomic_read(&bfqq->ref));
--			bfq_put_queue(bfqq);
--		}
-+		bfq_put_queue(bfqq);
-+		bfqq = bfq_get_queue(bfqd, bio, BLK_RW_ASYNC, bic);
-+		bic_set_bfqq(bic, bfqq, false);
-+		bfq_log_bfqq(bfqd, bfqq,
-+			     "check_ioprio_change: bfqq %p %d",
-+			     bfqq, bfqq->ref);
- 	}
- 
--	bfqq = bic->bfqq[BLK_RW_SYNC];
-+	bfqq = bic_to_bfqq(bic, true);
- 	if (bfqq)
- 		bfq_set_next_ioprio_data(bfqq, bic);
--
--out:
--	bfq_put_bfqd_unlock(bfqd, &flags);
- }
- 
- static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-@@ -3160,8 +3973,9 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	RB_CLEAR_NODE(&bfqq->entity.rb_node);
- 	INIT_LIST_HEAD(&bfqq->fifo);
- 	INIT_HLIST_NODE(&bfqq->burst_list_node);
-+	BUG_ON(!hlist_unhashed(&bfqq->burst_list_node));
- 
--	atomic_set(&bfqq->ref, 0);
-+	bfqq->ref = 0;
- 	bfqq->bfqd = bfqd;
- 
- 	if (bic)
-@@ -3171,6 +3985,7 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 		if (!bfq_class_idle(bfqq))
- 			bfq_mark_bfqq_idle_window(bfqq);
- 		bfq_mark_bfqq_sync(bfqq);
-+		bfq_mark_bfqq_just_created(bfqq);
- 	} else
- 		bfq_clear_bfqq_sync(bfqq);
- 	bfq_mark_bfqq_IO_bound(bfqq);
-@@ -3180,72 +3995,19 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	bfqq->pid = pid;
- 
- 	bfqq->wr_coeff = 1;
--	bfqq->last_wr_start_finish = 0;
-+	bfqq->last_wr_start_finish = jiffies;
-+	bfqq->wr_start_at_switch_to_srt = bfq_smallest_from_now();
-+	bfqq->budget_timeout = bfq_smallest_from_now();
-+	bfqq->split_time = bfq_smallest_from_now();
-+
- 	/*
- 	 * Set to the value for which bfqq will not be deemed as
- 	 * soft rt when it becomes backlogged.
- 	 */
--	bfqq->soft_rt_next_start = bfq_infinity_from_now(jiffies);
--}
--
--static struct bfq_queue *bfq_find_alloc_queue(struct bfq_data *bfqd,
--					      struct bio *bio, int is_sync,
--					      struct bfq_io_cq *bic,
--					      gfp_t gfp_mask)
--{
--	struct bfq_group *bfqg;
--	struct bfq_queue *bfqq, *new_bfqq = NULL;
--	struct blkcg *blkcg;
--
--retry:
--	rcu_read_lock();
--
--	blkcg = bio_blkcg(bio);
--	bfqg = bfq_find_alloc_group(bfqd, blkcg);
--	/* bic always exists here */
--	bfqq = bic_to_bfqq(bic, is_sync);
--
--	/*
--	 * Always try a new alloc if we fall back to the OOM bfqq
--	 * originally, since it should just be a temporary situation.
--	 */
--	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
--		bfqq = NULL;
--		if (new_bfqq) {
--			bfqq = new_bfqq;
--			new_bfqq = NULL;
--		} else if (gfpflags_allow_blocking(gfp_mask)) {
--			rcu_read_unlock();
--			spin_unlock_irq(bfqd->queue->queue_lock);
--			new_bfqq = kmem_cache_alloc_node(bfq_pool,
--					gfp_mask | __GFP_ZERO,
--					bfqd->queue->node);
--			spin_lock_irq(bfqd->queue->queue_lock);
--			if (new_bfqq)
--				goto retry;
--		} else {
--			bfqq = kmem_cache_alloc_node(bfq_pool,
--					gfp_mask | __GFP_ZERO,
--					bfqd->queue->node);
--		}
--
--		if (bfqq) {
--			bfq_init_bfqq(bfqd, bfqq, bic, current->pid,
--				      is_sync);
--			bfq_init_entity(&bfqq->entity, bfqg);
--			bfq_log_bfqq(bfqd, bfqq, "allocated");
--		} else {
--			bfqq = &bfqd->oom_bfqq;
--			bfq_log_bfqq(bfqd, bfqq, "using oom bfqq");
--		}
--	}
--
--	if (new_bfqq)
--		kmem_cache_free(bfq_pool, new_bfqq);
--
--	rcu_read_unlock();
-+	bfqq->soft_rt_next_start = bfq_greatest_from_now();
- 
--	return bfqq;
-+	/* first request is almost certainly seeky */
-+	bfqq->seek_history = 1;
- }
- 
- static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd,
-@@ -3268,90 +4030,84 @@ static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd,
- }
- 
- static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
--				       struct bio *bio, int is_sync,
--				       struct bfq_io_cq *bic, gfp_t gfp_mask)
-+				       struct bio *bio, bool is_sync,
-+				       struct bfq_io_cq *bic)
- {
- 	const int ioprio = IOPRIO_PRIO_DATA(bic->ioprio);
- 	const int ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);
- 	struct bfq_queue **async_bfqq = NULL;
--	struct bfq_queue *bfqq = NULL;
-+	struct bfq_queue *bfqq;
-+	struct bfq_group *bfqg;
- 
--	if (!is_sync) {
--		struct blkcg *blkcg;
--		struct bfq_group *bfqg;
-+	rcu_read_lock();
-+
-+	bfqg = bfq_find_set_group(bfqd, bio_blkcg(bio));
-+	if (!bfqg) {
-+		bfqq = &bfqd->oom_bfqq;
-+		goto out;
-+	}
- 
--		rcu_read_lock();
--		blkcg = bio_blkcg(bio);
--		rcu_read_unlock();
--		bfqg = bfq_find_alloc_group(bfqd, blkcg);
-+	if (!is_sync) {
- 		async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class,
- 						  ioprio);
- 		bfqq = *async_bfqq;
-+		if (bfqq)
-+			goto out;
- 	}
- 
--	if (!bfqq)
--		bfqq = bfq_find_alloc_queue(bfqd, bio, is_sync, bic, gfp_mask);
-+	bfqq = kmem_cache_alloc_node(bfq_pool, GFP_NOWAIT | __GFP_ZERO,
-+				     bfqd->queue->node);
-+
-+	if (bfqq) {
-+		bfq_init_bfqq(bfqd, bfqq, bic, current->pid,
-+			      is_sync);
-+		bfq_init_entity(&bfqq->entity, bfqg);
-+		bfq_log_bfqq(bfqd, bfqq, "allocated");
-+	} else {
-+		bfqq = &bfqd->oom_bfqq;
-+		bfq_log_bfqq(bfqd, bfqq, "using oom bfqq");
-+		goto out;
-+	}
- 
- 	/*
- 	 * Pin the queue now that it's allocated, scheduler exit will
- 	 * prune it.
- 	 */
--	if (!is_sync && !(*async_bfqq)) {
--		atomic_inc(&bfqq->ref);
-+	if (async_bfqq) {
-+		bfqq->ref++;
- 		bfq_log_bfqq(bfqd, bfqq, "get_queue, bfqq not in async: %p, %d",
--			     bfqq, atomic_read(&bfqq->ref));
-+			     bfqq, bfqq->ref);
- 		*async_bfqq = bfqq;
- 	}
- 
--	atomic_inc(&bfqq->ref);
--	bfq_log_bfqq(bfqd, bfqq, "get_queue, at end: %p, %d", bfqq,
--		     atomic_read(&bfqq->ref));
-+out:
-+	bfqq->ref++;
-+	bfq_log_bfqq(bfqd, bfqq, "get_queue, at end: %p, %d", bfqq, bfqq->ref);
-+	rcu_read_unlock();
- 	return bfqq;
- }
- 
- static void bfq_update_io_thinktime(struct bfq_data *bfqd,
- 				    struct bfq_io_cq *bic)
- {
--	unsigned long elapsed = jiffies - bic->ttime.last_end_request;
--	unsigned long ttime = min(elapsed, 2UL * bfqd->bfq_slice_idle);
-+	struct bfq_ttime *ttime = &bic->ttime;
-+	u64 elapsed = ktime_get_ns() - bic->ttime.last_end_request;
-+
-+	elapsed = min_t(u64, elapsed, 2 * bfqd->bfq_slice_idle);
- 
--	bic->ttime.ttime_samples = (7*bic->ttime.ttime_samples + 256) / 8;
--	bic->ttime.ttime_total = (7*bic->ttime.ttime_total + 256*ttime) / 8;
--	bic->ttime.ttime_mean = (bic->ttime.ttime_total + 128) /
--				bic->ttime.ttime_samples;
-+	ttime->ttime_samples = (7*bic->ttime.ttime_samples + 256) / 8;
-+	ttime->ttime_total = div_u64(7*ttime->ttime_total + 256*elapsed,  8);
-+	ttime->ttime_mean = div64_ul(ttime->ttime_total + 128,
-+				     ttime->ttime_samples);
- }
- 
--static void bfq_update_io_seektime(struct bfq_data *bfqd,
--				   struct bfq_queue *bfqq,
--				   struct request *rq)
-+static void
-+bfq_update_io_seektime(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+		       struct request *rq)
- {
--	sector_t sdist;
--	u64 total;
--
--	if (bfqq->last_request_pos < blk_rq_pos(rq))
--		sdist = blk_rq_pos(rq) - bfqq->last_request_pos;
--	else
--		sdist = bfqq->last_request_pos - blk_rq_pos(rq);
--
--	/*
--	 * Don't allow the seek distance to get too large from the
--	 * odd fragment, pagein, etc.
--	 */
--	if (bfqq->seek_samples == 0) /* first request, not really a seek */
--		sdist = 0;
--	else if (bfqq->seek_samples <= 60) /* second & third seek */
--		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*1024);
--	else
--		sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*64);
--
--	bfqq->seek_samples = (7*bfqq->seek_samples + 256) / 8;
--	bfqq->seek_total = (7*bfqq->seek_total + (u64)256*sdist) / 8;
--	total = bfqq->seek_total + (bfqq->seek_samples/2);
--	do_div(total, bfqq->seek_samples);
--	bfqq->seek_mean = (sector_t)total;
--
--	bfq_log_bfqq(bfqd, bfqq, "dist=%llu mean=%llu", (u64)sdist,
--			(u64)bfqq->seek_mean);
-+	bfqq->seek_history <<= 1;
-+	bfqq->seek_history |=
-+		get_sdist(bfqq->last_request_pos, rq) > BFQQ_SEEK_THR;
- }
- 
- /*
-@@ -3369,7 +4125,8 @@ static void bfq_update_idle_window(struct bfq_data *bfqd,
- 		return;
- 
- 	/* Idle window just restored, statistics are meaningless. */
--	if (bfq_bfqq_just_split(bfqq))
-+	if (time_is_after_eq_jiffies(bfqq->split_time +
-+				     bfqd->bfq_wr_min_idle_time))
- 		return;
- 
- 	enable_idle = bfq_bfqq_idle_window(bfqq);
-@@ -3409,22 +4166,13 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 
- 	bfq_update_io_thinktime(bfqd, bic);
- 	bfq_update_io_seektime(bfqd, bfqq, rq);
--	if (!BFQQ_SEEKY(bfqq) && bfq_bfqq_constantly_seeky(bfqq)) {
--		bfq_clear_bfqq_constantly_seeky(bfqq);
--		if (!blk_queue_nonrot(bfqd->queue)) {
--			BUG_ON(!bfqd->const_seeky_busy_in_flight_queues);
--			bfqd->const_seeky_busy_in_flight_queues--;
--		}
--	}
- 	if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 ||
- 	    !BFQQ_SEEKY(bfqq))
- 		bfq_update_idle_window(bfqd, bfqq, bic);
--	bfq_clear_bfqq_just_split(bfqq);
- 
- 	bfq_log_bfqq(bfqd, bfqq,
--		     "rq_enqueued: idle_window=%d (seeky %d, mean %llu)",
--		     bfq_bfqq_idle_window(bfqq), BFQQ_SEEKY(bfqq),
--		     (unsigned long long) bfqq->seek_mean);
-+		     "rq_enqueued: idle_window=%d (seeky %d)",
-+		     bfq_bfqq_idle_window(bfqq), BFQQ_SEEKY(bfqq));
- 
- 	bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq);
- 
-@@ -3438,14 +4186,15 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 		 * is small and the queue is not to be expired, then
- 		 * just exit.
- 		 *
--		 * In this way, if the disk is being idled to wait for
--		 * a new request from the in-service queue, we avoid
--		 * unplugging the device and committing the disk to serve
--		 * just a small request. On the contrary, we wait for
--		 * the block layer to decide when to unplug the device:
--		 * hopefully, new requests will be merged to this one
--		 * quickly, then the device will be unplugged and
--		 * larger requests will be dispatched.
-+		 * In this way, if the device is being idled to wait
-+		 * for a new request from the in-service queue, we
-+		 * avoid unplugging the device and committing the
-+		 * device to serve just a small request. On the
-+		 * contrary, we wait for the block layer to decide
-+		 * when to unplug the device: hopefully, new requests
-+		 * will be merged to this one quickly, then the device
-+		 * will be unplugged and larger requests will be
-+		 * dispatched.
- 		 */
- 		if (small_req && !budget_timeout)
- 			return;
-@@ -3457,10 +4206,8 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 		 * timer.
- 		 */
- 		bfq_clear_bfqq_wait_request(bfqq);
--		del_timer(&bfqd->idle_slice_timer);
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		hrtimer_try_to_cancel(&bfqd->idle_slice_timer);
- 		bfqg_stats_update_idle_time(bfqq_group(bfqq));
--#endif
- 
- 		/*
- 		 * The queue is not empty, because a new request just
-@@ -3504,28 +4251,21 @@ static void bfq_insert_request(struct request_queue *q, struct request *rq)
- 			 */
- 			new_bfqq->allocated[rq_data_dir(rq)]++;
- 			bfqq->allocated[rq_data_dir(rq)]--;
--			atomic_inc(&new_bfqq->ref);
-+			new_bfqq->ref++;
-+			bfq_clear_bfqq_just_created(bfqq);
- 			bfq_put_queue(bfqq);
- 			if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq)
- 				bfq_merge_bfqqs(bfqd, RQ_BIC(rq),
- 						bfqq, new_bfqq);
- 			rq->elv.priv[1] = new_bfqq;
- 			bfqq = new_bfqq;
--		} else
--			bfq_bfqq_increase_failed_cooperations(bfqq);
-+		}
- 	}
- 
- 	bfq_add_request(rq);
- 
--	/*
--	 * Here a newly-created bfq_queue has already started a weight-raising
--	 * period: clear raising_time_left to prevent bfq_bfqq_save_state()
--	 * from assigning it a full weight-raising period. See the detailed
--	 * comments about this field in bfq_init_icq().
--	 */
--	if (bfqq->bic)
--		bfqq->bic->wr_time_left = 0;
--	rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)];
-+	rq->fifo_time = ktime_get_ns() +
-+	  jiffies_to_nsecs(bfqd->bfq_fifo_expire[rq_is_sync(rq)]);
- 	list_add_tail(&rq->queuelist, &bfqq->fifo);
- 
- 	bfq_rq_enqueued(bfqd, bfqq, rq);
-@@ -3533,8 +4273,8 @@ static void bfq_insert_request(struct request_queue *q, struct request *rq)
- 
- static void bfq_update_hw_tag(struct bfq_data *bfqd)
- {
--	bfqd->max_rq_in_driver = max(bfqd->max_rq_in_driver,
--				     bfqd->rq_in_driver);
-+	bfqd->max_rq_in_driver = max_t(int, bfqd->max_rq_in_driver,
-+				       bfqd->rq_in_driver);
- 
- 	if (bfqd->hw_tag == 1)
- 		return;
-@@ -3560,48 +4300,85 @@ static void bfq_completed_request(struct request_queue *q, struct request *rq)
- {
- 	struct bfq_queue *bfqq = RQ_BFQQ(rq);
- 	struct bfq_data *bfqd = bfqq->bfqd;
--	bool sync = bfq_bfqq_sync(bfqq);
-+	u64 now_ns;
-+	u32 delta_us;
- 
--	bfq_log_bfqq(bfqd, bfqq, "completed one req with %u sects left (%d)",
--		     blk_rq_sectors(rq), sync);
-+	bfq_log_bfqq(bfqd, bfqq, "completed one req with %u sects left",
-+		     blk_rq_sectors(rq));
- 
-+	assert_spin_locked(bfqd->queue->queue_lock);
- 	bfq_update_hw_tag(bfqd);
- 
- 	BUG_ON(!bfqd->rq_in_driver);
- 	BUG_ON(!bfqq->dispatched);
- 	bfqd->rq_in_driver--;
- 	bfqq->dispatched--;
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	bfqg_stats_update_completion(bfqq_group(bfqq),
- 				     rq_start_time_ns(rq),
--				     rq_io_start_time_ns(rq), rq->cmd_flags);
--#endif
-+				     rq_io_start_time_ns(rq), req_op(rq),
-+				     rq->cmd_flags);
- 
- 	if (!bfqq->dispatched && !bfq_bfqq_busy(bfqq)) {
-+		BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+		/*
-+		 * Set budget_timeout (which we overload to store the
-+		 * time at which the queue remains with no backlog and
-+		 * no outstanding request; used by the weight-raising
-+		 * mechanism).
-+		 */
-+		bfqq->budget_timeout = jiffies;
-+
- 		bfq_weights_tree_remove(bfqd, &bfqq->entity,
- 					&bfqd->queue_weights_tree);
--		if (!blk_queue_nonrot(bfqd->queue)) {
--			BUG_ON(!bfqd->busy_in_flight_queues);
--			bfqd->busy_in_flight_queues--;
--			if (bfq_bfqq_constantly_seeky(bfqq)) {
--				BUG_ON(!bfqd->
--					const_seeky_busy_in_flight_queues);
--				bfqd->const_seeky_busy_in_flight_queues--;
--			}
--		}
- 	}
- 
--	if (sync) {
--		bfqd->sync_flight--;
--		RQ_BIC(rq)->ttime.last_end_request = jiffies;
--	}
-+	now_ns = ktime_get_ns();
-+
-+	RQ_BIC(rq)->ttime.last_end_request = now_ns;
-+
-+	/*
-+	 * Using us instead of ns, to get a reasonable precision in
-+	 * computing rate in next check.
-+	 */
-+	delta_us = div_u64(now_ns - bfqd->last_completion, NSEC_PER_USEC);
-+
-+	bfq_log(bfqd, "rq_completed: delta %uus/%luus max_size %u rate %llu/%llu",
-+		delta_us, BFQ_MIN_TT/NSEC_PER_USEC, bfqd->last_rq_max_size,
-+		(USEC_PER_SEC*
-+		(u64)((bfqd->last_rq_max_size<<BFQ_RATE_SHIFT)/delta_us))
-+			>>BFQ_RATE_SHIFT,
-+		(USEC_PER_SEC*(u64)(1UL<<(BFQ_RATE_SHIFT-10)))>>BFQ_RATE_SHIFT);
-+
-+	/*
-+	 * If the request took rather long to complete, and, according
-+	 * to the maximum request size recorded, this completion latency
-+	 * implies that the request was certainly served at a very low
-+	 * rate (less than 1M sectors/sec), then the whole observation
-+	 * interval that lasts up to this time instant cannot be a
-+	 * valid time interval for computing a new peak rate.  Invoke
-+	 * bfq_update_rate_reset to have the following three steps
-+	 * taken:
-+	 * - close the observation interval at the last (previous)
-+	 *   request dispatch or completion
-+	 * - compute rate, if possible, for that observation interval
-+	 * - reset to zero samples, which will trigger a proper
-+	 *   re-initialization of the observation interval on next
-+	 *   dispatch
-+	 */
-+	if (delta_us > BFQ_MIN_TT/NSEC_PER_USEC &&
-+	   (bfqd->last_rq_max_size<<BFQ_RATE_SHIFT)/delta_us <
-+			1UL<<(BFQ_RATE_SHIFT - 10))
-+		bfq_update_rate_reset(bfqd, NULL);
-+	bfqd->last_completion = now_ns;
- 
- 	/*
--	 * If we are waiting to discover whether the request pattern of the
--	 * task associated with the queue is actually isochronous, and
--	 * both requisites for this condition to hold are satisfied, then
--	 * compute soft_rt_next_start (see the comments to the function
--	 * bfq_bfqq_softrt_next_start()).
-+	 * If we are waiting to discover whether the request pattern
-+	 * of the task associated with the queue is actually
-+	 * isochronous, and both requisites for this condition to hold
-+	 * are now satisfied, then compute soft_rt_next_start (see the
-+	 * comments on the function bfq_bfqq_softrt_next_start()). We
-+	 * schedule this delayed check when bfqq expires, if it still
-+	 * has in-flight requests.
- 	 */
- 	if (bfq_bfqq_softrt_update(bfqq) && bfqq->dispatched == 0 &&
- 	    RB_EMPTY_ROOT(&bfqq->sort_list))
-@@ -3613,10 +4390,7 @@ static void bfq_completed_request(struct request_queue *q, struct request *rq)
- 	 * or if we want to idle in case it has no pending requests.
- 	 */
- 	if (bfqd->in_service_queue == bfqq) {
--		if (bfq_bfqq_budget_new(bfqq))
--			bfq_set_budget_timeout(bfqd);
--
--		if (bfq_bfqq_must_idle(bfqq)) {
-+		if (bfqq->dispatched == 0 && bfq_bfqq_must_idle(bfqq)) {
- 			bfq_arm_slice_timer(bfqd);
- 			goto out;
- 		} else if (bfq_may_expire_for_budg_timeout(bfqq))
-@@ -3646,7 +4420,7 @@ static int __bfq_may_queue(struct bfq_queue *bfqq)
- 	return ELV_MQUEUE_MAY;
- }
- 
--static int bfq_may_queue(struct request_queue *q, int rw)
-+static int bfq_may_queue(struct request_queue *q, int op, int op_flags)
- {
- 	struct bfq_data *bfqd = q->elevator->elevator_data;
- 	struct task_struct *tsk = current;
-@@ -3663,7 +4437,7 @@ static int bfq_may_queue(struct request_queue *q, int rw)
- 	if (!bic)
- 		return ELV_MQUEUE_MAY;
- 
--	bfqq = bic_to_bfqq(bic, rw_is_sync(rw));
-+	bfqq = bic_to_bfqq(bic, rw_is_sync(op, op_flags));
- 	if (bfqq)
- 		return __bfq_may_queue(bfqq);
- 
-@@ -3687,14 +4461,14 @@ static void bfq_put_request(struct request *rq)
- 		rq->elv.priv[1] = NULL;
- 
- 		bfq_log_bfqq(bfqq->bfqd, bfqq, "put_request %p, %d",
--			     bfqq, atomic_read(&bfqq->ref));
-+			     bfqq, bfqq->ref);
- 		bfq_put_queue(bfqq);
- 	}
- }
- 
- /*
-  * Returns NULL if a new bfqq should be allocated, or the old bfqq if this
-- * was the last process referring to said bfqq.
-+ * was the last process referring to that bfqq.
-  */
- static struct bfq_queue *
- bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
-@@ -3732,11 +4506,8 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	unsigned long flags;
- 	bool split = false;
- 
--	might_sleep_if(gfpflags_allow_blocking(gfp_mask));
--
--	bfq_check_ioprio_change(bic, bio);
--
- 	spin_lock_irqsave(q->queue_lock, flags);
-+	bfq_check_ioprio_change(bic, bio);
- 
- 	if (!bic)
- 		goto queue_fail;
-@@ -3746,23 +4517,47 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- new_queue:
- 	bfqq = bic_to_bfqq(bic, is_sync);
- 	if (!bfqq || bfqq == &bfqd->oom_bfqq) {
--		bfqq = bfq_get_queue(bfqd, bio, is_sync, bic, gfp_mask);
-+		if (bfqq)
-+			bfq_put_queue(bfqq);
-+		bfqq = bfq_get_queue(bfqd, bio, is_sync, bic);
-+		BUG_ON(!hlist_unhashed(&bfqq->burst_list_node));
-+
- 		bic_set_bfqq(bic, bfqq, is_sync);
- 		if (split && is_sync) {
-+			bfq_log_bfqq(bfqd, bfqq,
-+				     "set_request: was_in_list %d "
-+				     "was_in_large_burst %d "
-+				     "large burst in progress %d",
-+				     bic->was_in_burst_list,
-+				     bic->saved_in_large_burst,
-+				     bfqd->large_burst);
-+
- 			if ((bic->was_in_burst_list && bfqd->large_burst) ||
--			    bic->saved_in_large_burst)
-+			    bic->saved_in_large_burst) {
-+				bfq_log_bfqq(bfqd, bfqq,
-+					     "set_request: marking in "
-+					     "large burst");
- 				bfq_mark_bfqq_in_large_burst(bfqq);
--			else {
-+			} else {
-+				bfq_log_bfqq(bfqd, bfqq,
-+					     "set_request: clearing in "
-+					     "large burst");
- 				bfq_clear_bfqq_in_large_burst(bfqq);
- 				if (bic->was_in_burst_list)
- 					hlist_add_head(&bfqq->burst_list_node,
- 						       &bfqd->burst_list);
- 			}
-+			bfqq->split_time = jiffies;
- 		}
- 	} else {
- 		/* If the queue was seeky for too long, break it apart. */
- 		if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) {
- 			bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq");
-+
-+			/* Update bic before losing reference to bfqq */
-+			if (bfq_bfqq_in_large_burst(bfqq))
-+				bic->saved_in_large_burst = true;
-+
- 			bfqq = bfq_split_bfqq(bic, bfqq);
- 			split = true;
- 			if (!bfqq)
-@@ -3771,9 +4566,8 @@ new_queue:
- 	}
- 
- 	bfqq->allocated[rw]++;
--	atomic_inc(&bfqq->ref);
--	bfq_log_bfqq(bfqd, bfqq, "set_request: bfqq %p, %d", bfqq,
--		     atomic_read(&bfqq->ref));
-+	bfqq->ref++;
-+	bfq_log_bfqq(bfqd, bfqq, "set_request: bfqq %p, %d", bfqq, bfqq->ref);
- 
- 	rq->elv.priv[0] = bic;
- 	rq->elv.priv[1] = bfqq;
-@@ -3788,7 +4582,6 @@ new_queue:
- 	if (likely(bfqq != &bfqd->oom_bfqq) && bfqq_process_refs(bfqq) == 1) {
- 		bfqq->bic = bic;
- 		if (split) {
--			bfq_mark_bfqq_just_split(bfqq);
- 			/*
- 			 * If the queue has just been split from a shared
- 			 * queue, restore the idle window and the possible
-@@ -3798,6 +4591,9 @@ new_queue:
- 		}
- 	}
- 
-+	if (unlikely(bfq_bfqq_just_created(bfqq)))
-+		bfq_handle_burst(bfqd, bfqq);
-+
- 	spin_unlock_irqrestore(q->queue_lock, flags);
- 
- 	return 0;
-@@ -3824,9 +4620,10 @@ static void bfq_kick_queue(struct work_struct *work)
-  * Handler of the expiration of the timer running if the in-service queue
-  * is idling inside its time slice.
-  */
--static void bfq_idle_slice_timer(unsigned long data)
-+static enum hrtimer_restart bfq_idle_slice_timer(struct hrtimer *timer)
- {
--	struct bfq_data *bfqd = (struct bfq_data *)data;
-+	struct bfq_data *bfqd = container_of(timer, struct bfq_data,
-+					     idle_slice_timer);
- 	struct bfq_queue *bfqq;
- 	unsigned long flags;
- 	enum bfqq_expiration reason;
-@@ -3844,6 +4641,8 @@ static void bfq_idle_slice_timer(unsigned long data)
- 	 */
- 	if (bfqq) {
- 		bfq_log_bfqq(bfqd, bfqq, "slice_timer expired");
-+		bfq_clear_bfqq_wait_request(bfqq);
-+
- 		if (bfq_bfqq_budget_timeout(bfqq))
- 			/*
- 			 * Also here the queue can be safely expired
-@@ -3869,14 +4668,16 @@ schedule_dispatch:
- 	bfq_schedule_dispatch(bfqd);
- 
- 	spin_unlock_irqrestore(bfqd->queue->queue_lock, flags);
-+	return HRTIMER_NORESTART;
- }
- 
- static void bfq_shutdown_timer_wq(struct bfq_data *bfqd)
- {
--	del_timer_sync(&bfqd->idle_slice_timer);
-+	hrtimer_cancel(&bfqd->idle_slice_timer);
- 	cancel_work_sync(&bfqd->unplug_work);
- }
- 
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
- static void __bfq_put_async_bfqq(struct bfq_data *bfqd,
- 					struct bfq_queue **bfqq_ptr)
- {
-@@ -3885,9 +4686,9 @@ static void __bfq_put_async_bfqq(struct bfq_data *bfqd,
- 
- 	bfq_log(bfqd, "put_async_bfqq: %p", bfqq);
- 	if (bfqq) {
--		bfq_bfqq_move(bfqd, bfqq, &bfqq->entity, root_group);
-+		bfq_bfqq_move(bfqd, bfqq, root_group);
- 		bfq_log_bfqq(bfqd, bfqq, "put_async_bfqq: putting %p, %d",
--			     bfqq, atomic_read(&bfqq->ref));
-+			     bfqq, bfqq->ref);
- 		bfq_put_queue(bfqq);
- 		*bfqq_ptr = NULL;
- 	}
-@@ -3909,6 +4710,7 @@ static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg)
- 
- 	__bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq);
- }
-+#endif
- 
- static void bfq_exit_queue(struct elevator_queue *e)
- {
-@@ -3928,9 +4730,7 @@ static void bfq_exit_queue(struct elevator_queue *e)
- 
- 	bfq_shutdown_timer_wq(bfqd);
- 
--	synchronize_rcu();
--
--	BUG_ON(timer_pending(&bfqd->idle_slice_timer));
-+	BUG_ON(hrtimer_active(&bfqd->idle_slice_timer));
- 
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	blkcg_deactivate_policy(q, &blkcg_policy_bfq);
-@@ -3978,11 +4778,14 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
- 	 * will not attempt to free it.
- 	 */
- 	bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, NULL, 1, 0);
--	atomic_inc(&bfqd->oom_bfqq.ref);
-+	bfqd->oom_bfqq.ref++;
- 	bfqd->oom_bfqq.new_ioprio = BFQ_DEFAULT_QUEUE_IOPRIO;
- 	bfqd->oom_bfqq.new_ioprio_class = IOPRIO_CLASS_BE;
- 	bfqd->oom_bfqq.entity.new_weight =
- 		bfq_ioprio_to_weight(bfqd->oom_bfqq.new_ioprio);
-+
-+	/* oom_bfqq does not participate to bursts */
-+	bfq_clear_bfqq_just_created(&bfqd->oom_bfqq);
- 	/*
- 	 * Trigger weight initialization, according to ioprio, at the
- 	 * oom_bfqq's first activation. The oom_bfqq's ioprio and ioprio
-@@ -4001,13 +4804,10 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
- 		goto out_free;
- 	bfq_init_root_group(bfqd->root_group, bfqd);
- 	bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group);
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
--	bfqd->active_numerous_groups = 0;
--#endif
- 
--	init_timer(&bfqd->idle_slice_timer);
-+	hrtimer_init(&bfqd->idle_slice_timer, CLOCK_MONOTONIC,
-+		     HRTIMER_MODE_REL);
- 	bfqd->idle_slice_timer.function = bfq_idle_slice_timer;
--	bfqd->idle_slice_timer.data = (unsigned long)bfqd;
- 
- 	bfqd->queue_weights_tree = RB_ROOT;
- 	bfqd->group_weights_tree = RB_ROOT;
-@@ -4028,20 +4828,19 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
- 	bfqd->bfq_back_penalty = bfq_back_penalty;
- 	bfqd->bfq_slice_idle = bfq_slice_idle;
- 	bfqd->bfq_class_idle_last_service = 0;
--	bfqd->bfq_max_budget_async_rq = bfq_max_budget_async_rq;
--	bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async;
--	bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync;
-+	bfqd->bfq_timeout = bfq_timeout;
- 
--	bfqd->bfq_coop_thresh = 2;
--	bfqd->bfq_failed_cooperations = 7000;
- 	bfqd->bfq_requests_within_timer = 120;
- 
--	bfqd->bfq_large_burst_thresh = 11;
--	bfqd->bfq_burst_interval = msecs_to_jiffies(500);
-+	bfqd->bfq_large_burst_thresh = 8;
-+	bfqd->bfq_burst_interval = msecs_to_jiffies(180);
- 
- 	bfqd->low_latency = true;
- 
--	bfqd->bfq_wr_coeff = 20;
-+	/*
-+	 * Trade-off between responsiveness and fairness.
-+	 */
-+	bfqd->bfq_wr_coeff = 30;
- 	bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300);
- 	bfqd->bfq_wr_max_time = 0;
- 	bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000);
-@@ -4053,16 +4852,15 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
- 					      * video.
- 					      */
- 	bfqd->wr_busy_queues = 0;
--	bfqd->busy_in_flight_queues = 0;
--	bfqd->const_seeky_busy_in_flight_queues = 0;
- 
- 	/*
--	 * Begin by assuming, optimistically, that the device peak rate is
--	 * equal to the highest reference rate.
-+	 * Begin by assuming, optimistically, that the device is a
-+	 * high-speed one, and that its peak rate is equal to 2/3 of
-+	 * the highest reference rate.
- 	 */
- 	bfqd->RT_prod = R_fast[blk_queue_nonrot(bfqd->queue)] *
- 			T_fast[blk_queue_nonrot(bfqd->queue)];
--	bfqd->peak_rate = R_fast[blk_queue_nonrot(bfqd->queue)];
-+	bfqd->peak_rate = R_fast[blk_queue_nonrot(bfqd->queue)] * 2 / 3;
- 	bfqd->device_speed = BFQ_BFQD_FAST;
- 
- 	return 0;
-@@ -4088,7 +4886,7 @@ static int __init bfq_slab_setup(void)
- 
- static ssize_t bfq_var_show(unsigned int var, char *page)
- {
--	return sprintf(page, "%d\n", var);
-+	return sprintf(page, "%u\n", var);
- }
- 
- static ssize_t bfq_var_store(unsigned long *var, const char *page,
-@@ -4159,21 +4957,21 @@ static ssize_t bfq_weights_show(struct elevator_queue *e, char *page)
- static ssize_t __FUNC(struct elevator_queue *e, char *page)		\
- {									\
- 	struct bfq_data *bfqd = e->elevator_data;			\
--	unsigned int __data = __VAR;					\
--	if (__CONV)							\
-+	u64 __data = __VAR;						\
-+	if (__CONV == 1)						\
- 		__data = jiffies_to_msecs(__data);			\
-+	else if (__CONV == 2)						\
-+		__data = div_u64(__data, NSEC_PER_MSEC);		\
- 	return bfq_var_show(__data, (page));				\
- }
--SHOW_FUNCTION(bfq_fifo_expire_sync_show, bfqd->bfq_fifo_expire[1], 1);
--SHOW_FUNCTION(bfq_fifo_expire_async_show, bfqd->bfq_fifo_expire[0], 1);
-+SHOW_FUNCTION(bfq_fifo_expire_sync_show, bfqd->bfq_fifo_expire[1], 2);
-+SHOW_FUNCTION(bfq_fifo_expire_async_show, bfqd->bfq_fifo_expire[0], 2);
- SHOW_FUNCTION(bfq_back_seek_max_show, bfqd->bfq_back_max, 0);
- SHOW_FUNCTION(bfq_back_seek_penalty_show, bfqd->bfq_back_penalty, 0);
--SHOW_FUNCTION(bfq_slice_idle_show, bfqd->bfq_slice_idle, 1);
-+SHOW_FUNCTION(bfq_slice_idle_show, bfqd->bfq_slice_idle, 2);
- SHOW_FUNCTION(bfq_max_budget_show, bfqd->bfq_user_max_budget, 0);
--SHOW_FUNCTION(bfq_max_budget_async_rq_show,
--	      bfqd->bfq_max_budget_async_rq, 0);
--SHOW_FUNCTION(bfq_timeout_sync_show, bfqd->bfq_timeout[BLK_RW_SYNC], 1);
--SHOW_FUNCTION(bfq_timeout_async_show, bfqd->bfq_timeout[BLK_RW_ASYNC], 1);
-+SHOW_FUNCTION(bfq_timeout_sync_show, bfqd->bfq_timeout, 1);
-+SHOW_FUNCTION(bfq_strict_guarantees_show, bfqd->strict_guarantees, 0);
- SHOW_FUNCTION(bfq_low_latency_show, bfqd->low_latency, 0);
- SHOW_FUNCTION(bfq_wr_coeff_show, bfqd->bfq_wr_coeff, 0);
- SHOW_FUNCTION(bfq_wr_rt_max_time_show, bfqd->bfq_wr_rt_max_time, 1);
-@@ -4183,6 +4981,17 @@ SHOW_FUNCTION(bfq_wr_min_inter_arr_async_show, bfqd->bfq_wr_min_inter_arr_async,
- SHOW_FUNCTION(bfq_wr_max_softrt_rate_show, bfqd->bfq_wr_max_softrt_rate, 0);
- #undef SHOW_FUNCTION
- 
-+#define USEC_SHOW_FUNCTION(__FUNC, __VAR)				\
-+static ssize_t __FUNC(struct elevator_queue *e, char *page)		\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	u64 __data = __VAR;						\
-+	__data = div_u64(__data, NSEC_PER_USEC);			\
-+	return bfq_var_show(__data, (page));				\
-+}
-+USEC_SHOW_FUNCTION(bfq_slice_idle_us_show, bfqd->bfq_slice_idle);
-+#undef USEC_SHOW_FUNCTION
-+
- #define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV)			\
- static ssize_t								\
- __FUNC(struct elevator_queue *e, const char *page, size_t count)	\
-@@ -4194,24 +5003,22 @@ __FUNC(struct elevator_queue *e, const char *page, size_t count)	\
- 		__data = (MIN);						\
- 	else if (__data > (MAX))					\
- 		__data = (MAX);						\
--	if (__CONV)							\
-+	if (__CONV == 1)						\
- 		*(__PTR) = msecs_to_jiffies(__data);			\
-+	else if (__CONV == 2)						\
-+		*(__PTR) = (u64)__data * NSEC_PER_MSEC;			\
- 	else								\
- 		*(__PTR) = __data;					\
- 	return ret;							\
- }
- STORE_FUNCTION(bfq_fifo_expire_sync_store, &bfqd->bfq_fifo_expire[1], 1,
--		INT_MAX, 1);
-+		INT_MAX, 2);
- STORE_FUNCTION(bfq_fifo_expire_async_store, &bfqd->bfq_fifo_expire[0], 1,
--		INT_MAX, 1);
-+		INT_MAX, 2);
- STORE_FUNCTION(bfq_back_seek_max_store, &bfqd->bfq_back_max, 0, INT_MAX, 0);
- STORE_FUNCTION(bfq_back_seek_penalty_store, &bfqd->bfq_back_penalty, 1,
- 		INT_MAX, 0);
--STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 1);
--STORE_FUNCTION(bfq_max_budget_async_rq_store, &bfqd->bfq_max_budget_async_rq,
--		1, INT_MAX, 0);
--STORE_FUNCTION(bfq_timeout_async_store, &bfqd->bfq_timeout[BLK_RW_ASYNC], 0,
--		INT_MAX, 1);
-+STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 2);
- STORE_FUNCTION(bfq_wr_coeff_store, &bfqd->bfq_wr_coeff, 1, INT_MAX, 0);
- STORE_FUNCTION(bfq_wr_max_time_store, &bfqd->bfq_wr_max_time, 0, INT_MAX, 1);
- STORE_FUNCTION(bfq_wr_rt_max_time_store, &bfqd->bfq_wr_rt_max_time, 0, INT_MAX,
-@@ -4224,6 +5031,23 @@ STORE_FUNCTION(bfq_wr_max_softrt_rate_store, &bfqd->bfq_wr_max_softrt_rate, 0,
- 		INT_MAX, 0);
- #undef STORE_FUNCTION
- 
-+#define USEC_STORE_FUNCTION(__FUNC, __PTR, MIN, MAX)			\
-+static ssize_t __FUNC(struct elevator_queue *e, const char *page, size_t count)\
-+{									\
-+	struct bfq_data *bfqd = e->elevator_data;			\
-+	unsigned long __data;						\
-+	int ret = bfq_var_store(&__data, (page), count);		\
-+	if (__data < (MIN))						\
-+		__data = (MIN);						\
-+	else if (__data > (MAX))					\
-+		__data = (MAX);						\
-+	*(__PTR) = (u64)__data * NSEC_PER_USEC;				\
-+	return ret;							\
-+}
-+USEC_STORE_FUNCTION(bfq_slice_idle_us_store, &bfqd->bfq_slice_idle, 0,
-+		    UINT_MAX);
-+#undef USEC_STORE_FUNCTION
-+
- /* do nothing for the moment */
- static ssize_t bfq_weights_store(struct elevator_queue *e,
- 				    const char *page, size_t count)
-@@ -4231,16 +5055,6 @@ static ssize_t bfq_weights_store(struct elevator_queue *e,
- 	return count;
- }
- 
--static unsigned long bfq_estimated_max_budget(struct bfq_data *bfqd)
--{
--	u64 timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]);
--
--	if (bfqd->peak_rate_samples >= BFQ_PEAK_RATE_SAMPLES)
--		return bfq_calc_max_budget(bfqd->peak_rate, timeout);
--	else
--		return bfq_default_max_budget;
--}
--
- static ssize_t bfq_max_budget_store(struct elevator_queue *e,
- 				    const char *page, size_t count)
- {
-@@ -4249,7 +5063,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e,
- 	int ret = bfq_var_store(&__data, (page), count);
- 
- 	if (__data == 0)
--		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+		bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd);
- 	else {
- 		if (__data > INT_MAX)
- 			__data = INT_MAX;
-@@ -4261,6 +5075,10 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e,
- 	return ret;
- }
- 
-+/*
-+ * Leaving this name to preserve name compatibility with cfq
-+ * parameters, but this timeout is used for both sync and async.
-+ */
- static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
- 				      const char *page, size_t count)
- {
-@@ -4273,9 +5091,27 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
- 	else if (__data > INT_MAX)
- 		__data = INT_MAX;
- 
--	bfqd->bfq_timeout[BLK_RW_SYNC] = msecs_to_jiffies(__data);
-+	bfqd->bfq_timeout = msecs_to_jiffies(__data);
- 	if (bfqd->bfq_user_max_budget == 0)
--		bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd);
-+		bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd);
-+
-+	return ret;
-+}
-+
-+static ssize_t bfq_strict_guarantees_store(struct elevator_queue *e,
-+				     const char *page, size_t count)
-+{
-+	struct bfq_data *bfqd = e->elevator_data;
-+	unsigned long uninitialized_var(__data);
-+	int ret = bfq_var_store(&__data, (page), count);
-+
-+	if (__data > 1)
-+		__data = 1;
-+	if (!bfqd->strict_guarantees && __data == 1
-+	    && bfqd->bfq_slice_idle < 8 * NSEC_PER_MSEC)
-+		bfqd->bfq_slice_idle = 8 * NSEC_PER_MSEC;
-+
-+	bfqd->strict_guarantees = __data;
- 
- 	return ret;
- }
-@@ -4305,10 +5141,10 @@ static struct elv_fs_entry bfq_attrs[] = {
- 	BFQ_ATTR(back_seek_max),
- 	BFQ_ATTR(back_seek_penalty),
- 	BFQ_ATTR(slice_idle),
-+	BFQ_ATTR(slice_idle_us),
- 	BFQ_ATTR(max_budget),
--	BFQ_ATTR(max_budget_async_rq),
- 	BFQ_ATTR(timeout_sync),
--	BFQ_ATTR(timeout_async),
-+	BFQ_ATTR(strict_guarantees),
- 	BFQ_ATTR(low_latency),
- 	BFQ_ATTR(wr_coeff),
- 	BFQ_ATTR(wr_max_time),
-@@ -4328,7 +5164,8 @@ static struct elevator_type iosched_bfq = {
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 		.elevator_bio_merged_fn =	bfq_bio_merged,
- #endif
--		.elevator_allow_merge_fn =	bfq_allow_merge,
-+		.elevator_allow_bio_merge_fn =	bfq_allow_bio_merge,
-+		.elevator_allow_rq_merge_fn =	bfq_allow_rq_merge,
- 		.elevator_dispatch_fn =		bfq_dispatch_requests,
- 		.elevator_add_req_fn =		bfq_insert_request,
- 		.elevator_activate_req_fn =	bfq_activate_request,
-@@ -4351,18 +5188,28 @@ static struct elevator_type iosched_bfq = {
- 	.elevator_owner =	THIS_MODULE,
- };
- 
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static struct blkcg_policy blkcg_policy_bfq = {
-+	.dfl_cftypes		= bfq_blkg_files,
-+	.legacy_cftypes		= bfq_blkcg_legacy_files,
-+
-+	.cpd_alloc_fn		= bfq_cpd_alloc,
-+	.cpd_init_fn		= bfq_cpd_init,
-+	.cpd_bind_fn	        = bfq_cpd_init,
-+	.cpd_free_fn		= bfq_cpd_free,
-+
-+	.pd_alloc_fn		= bfq_pd_alloc,
-+	.pd_init_fn		= bfq_pd_init,
-+	.pd_offline_fn		= bfq_pd_offline,
-+	.pd_free_fn		= bfq_pd_free,
-+	.pd_reset_stats_fn	= bfq_pd_reset_stats,
-+};
-+#endif
-+
- static int __init bfq_init(void)
- {
- 	int ret;
--
--	/*
--	 * Can be 0 on HZ < 1000 setups.
--	 */
--	if (bfq_slice_idle == 0)
--		bfq_slice_idle = 1;
--
--	if (bfq_timeout_async == 0)
--		bfq_timeout_async = 1;
-+	char msg[50] = "BFQ I/O-scheduler: v8r4";
- 
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	ret = blkcg_policy_register(&blkcg_policy_bfq);
-@@ -4375,27 +5222,46 @@ static int __init bfq_init(void)
- 		goto err_pol_unreg;
- 
- 	/*
--	 * Times to load large popular applications for the typical systems
--	 * installed on the reference devices (see the comments before the
--	 * definitions of the two arrays).
-+	 * Times to load large popular applications for the typical
-+	 * systems installed on the reference devices (see the
-+	 * comments before the definitions of the next two
-+	 * arrays). Actually, we use slightly slower values, as the
-+	 * estimated peak rate tends to be smaller than the actual
-+	 * peak rate.  The reason for this last fact is that estimates
-+	 * are computed over much shorter time intervals than the long
-+	 * intervals typically used for benchmarking. Why? First, to
-+	 * adapt more quickly to variations. Second, because an I/O
-+	 * scheduler cannot rely on a peak-rate-evaluation workload to
-+	 * be run for a long time.
- 	 */
--	T_slow[0] = msecs_to_jiffies(2600);
--	T_slow[1] = msecs_to_jiffies(1000);
--	T_fast[0] = msecs_to_jiffies(5500);
--	T_fast[1] = msecs_to_jiffies(2000);
-+	T_slow[0] = msecs_to_jiffies(3500); /* actually 4 sec */
-+	T_slow[1] = msecs_to_jiffies(1000); /* actually 1.5 sec */
-+	T_fast[0] = msecs_to_jiffies(7000); /* actually 8 sec */
-+	T_fast[1] = msecs_to_jiffies(2500); /* actually 3 sec */
- 
- 	/*
--	 * Thresholds that determine the switch between speed classes (see
--	 * the comments before the definition of the array).
-+	 * Thresholds that determine the switch between speed classes
-+	 * (see the comments before the definition of the array
-+	 * device_speed_thresh). These thresholds are biased towards
-+	 * transitions to the fast class. This is safer than the
-+	 * opposite bias. In fact, a wrong transition to the slow
-+	 * class results in short weight-raising periods, because the
-+	 * speed of the device then tends to be higher that the
-+	 * reference peak rate. On the opposite end, a wrong
-+	 * transition to the fast class tends to increase
-+	 * weight-raising periods, because of the opposite reason.
- 	 */
--	device_speed_thresh[0] = (R_fast[0] + R_slow[0]) / 2;
--	device_speed_thresh[1] = (R_fast[1] + R_slow[1]) / 2;
-+	device_speed_thresh[0] = (4 * R_slow[0]) / 3;
-+	device_speed_thresh[1] = (4 * R_slow[1]) / 3;
- 
- 	ret = elv_register(&iosched_bfq);
- 	if (ret)
- 		goto err_pol_unreg;
- 
--	pr_info("BFQ I/O-scheduler: v7r11");
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	strcat(msg, " (with cgroups support)");
-+#endif
-+	pr_info("%s", msg);
- 
- 	return 0;
- 
-diff --git a/block/bfq-sched.c b/block/bfq-sched.c
-index a5ed694..45d63d3 100644
---- a/block/bfq-sched.c
-+++ b/block/bfq-sched.c
-@@ -7,9 +7,13 @@
-  * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-  *		      Paolo Valente <paolo.valente@unimore.it>
-  *
-- * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ * Copyright (C) 2015 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2016 Paolo Valente <paolo.valente@linaro.org>
-  */
- 
-+static struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
-+
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- #define for_each_entity(entity)	\
- 	for (; entity ; entity = entity->parent)
-@@ -22,8 +26,6 @@ static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
- 						 int extract,
- 						 struct bfq_data *bfqd);
- 
--static struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
--
- static void bfq_update_budget(struct bfq_entity *next_in_service)
- {
- 	struct bfq_entity *bfqg_entity;
-@@ -48,6 +50,7 @@ static void bfq_update_budget(struct bfq_entity *next_in_service)
- static int bfq_update_next_in_service(struct bfq_sched_data *sd)
- {
- 	struct bfq_entity *next_in_service;
-+	struct bfq_queue *bfqq;
- 
- 	if (sd->in_service_entity)
- 		/* will update/requeue at the end of service */
-@@ -65,14 +68,29 @@ static int bfq_update_next_in_service(struct bfq_sched_data *sd)
- 
- 	if (next_in_service)
- 		bfq_update_budget(next_in_service);
-+	else
-+		goto exit;
-+
-+	bfqq = bfq_entity_to_bfqq(next_in_service);
-+	if (bfqq)
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			     "update_next_in_service: chosen this queue");
-+	else {
-+		struct bfq_group *bfqg =
-+			container_of(next_in_service,
-+				     struct bfq_group, entity);
- 
-+		bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+			     "update_next_in_service: chosen this entity");
-+	}
-+exit:
- 	return 1;
- }
- 
- static void bfq_check_next_in_service(struct bfq_sched_data *sd,
- 				      struct bfq_entity *entity)
- {
--	BUG_ON(sd->next_in_service != entity);
-+	WARN_ON(sd->next_in_service != entity);
- }
- #else
- #define for_each_entity(entity)	\
-@@ -151,20 +169,36 @@ static u64 bfq_delta(unsigned long service, unsigned long weight)
- static void bfq_calc_finish(struct bfq_entity *entity, unsigned long service)
- {
- 	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	unsigned long long start, finish, delta;
- 
- 	BUG_ON(entity->weight == 0);
- 
- 	entity->finish = entity->start +
- 		bfq_delta(service, entity->weight);
- 
-+	start = ((entity->start>>10)*1000)>>12;
-+	finish = ((entity->finish>>10)*1000)>>12;
-+	delta = ((bfq_delta(service, entity->weight)>>10)*1000)>>12;
-+
- 	if (bfqq) {
- 		bfq_log_bfqq(bfqq->bfqd, bfqq,
- 			"calc_finish: serv %lu, w %d",
- 			service, entity->weight);
- 		bfq_log_bfqq(bfqq->bfqd, bfqq,
- 			"calc_finish: start %llu, finish %llu, delta %llu",
--			entity->start, entity->finish,
--			bfq_delta(service, entity->weight));
-+			start, finish, delta);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	} else {
-+		struct bfq_group *bfqg =
-+			container_of(entity, struct bfq_group, entity);
-+
-+		bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+			"calc_finish group: serv %lu, w %d",
-+			     service, entity->weight);
-+		bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+			"calc_finish group: start %llu, finish %llu, delta %llu",
-+			start, finish, delta);
-+#endif
- 	}
- }
- 
-@@ -293,10 +327,26 @@ static void bfq_update_min(struct bfq_entity *entity, struct rb_node *node)
- static void bfq_update_active_node(struct rb_node *node)
- {
- 	struct bfq_entity *entity = rb_entry(node, struct bfq_entity, rb_node);
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
- 
- 	entity->min_start = entity->start;
- 	bfq_update_min(entity, node->rb_right);
- 	bfq_update_min(entity, node->rb_left);
-+
-+	if (bfqq) {
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			     "update_active_node: new min_start %llu",
-+			     ((entity->min_start>>10)*1000)>>12);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	} else {
-+		struct bfq_group *bfqg =
-+			container_of(entity, struct bfq_group, entity);
-+
-+		bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+			     "update_active_node: new min_start %llu",
-+			     ((entity->min_start>>10)*1000)>>12);
-+#endif
-+	}
- }
- 
- /**
-@@ -386,8 +436,6 @@ static void bfq_active_insert(struct bfq_service_tree *st,
- 		BUG_ON(!bfqg);
- 		BUG_ON(!bfqd);
- 		bfqg->active_entities++;
--		if (bfqg->active_entities == 2)
--			bfqd->active_numerous_groups++;
- 	}
- #endif
- }
-@@ -399,7 +447,7 @@ static void bfq_active_insert(struct bfq_service_tree *st,
- static unsigned short bfq_ioprio_to_weight(int ioprio)
- {
- 	BUG_ON(ioprio < 0 || ioprio >= IOPRIO_BE_NR);
--	return IOPRIO_BE_NR * BFQ_WEIGHT_CONVERSION_COEFF - ioprio;
-+	return (IOPRIO_BE_NR - ioprio) * BFQ_WEIGHT_CONVERSION_COEFF;
- }
- 
- /**
-@@ -422,9 +470,9 @@ static void bfq_get_entity(struct bfq_entity *entity)
- 	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
- 
- 	if (bfqq) {
--		atomic_inc(&bfqq->ref);
-+		bfqq->ref++;
- 		bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d",
--			     bfqq, atomic_read(&bfqq->ref));
-+			     bfqq, bfqq->ref);
- 	}
- }
- 
-@@ -499,10 +547,6 @@ static void bfq_active_extract(struct bfq_service_tree *st,
- 		BUG_ON(!bfqd);
- 		BUG_ON(!bfqg->active_entities);
- 		bfqg->active_entities--;
--		if (bfqg->active_entities == 1) {
--			BUG_ON(!bfqd->active_numerous_groups);
--			bfqd->active_numerous_groups--;
--		}
- 	}
- #endif
- }
-@@ -552,7 +596,7 @@ static void bfq_forget_entity(struct bfq_service_tree *st,
- 	if (bfqq) {
- 		sd = entity->sched_data;
- 		bfq_log_bfqq(bfqq->bfqd, bfqq, "forget_entity: %p %d",
--			     bfqq, atomic_read(&bfqq->ref));
-+			     bfqq, bfqq->ref);
- 		bfq_put_queue(bfqq);
- 	}
- }
-@@ -602,7 +646,7 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
- 
- 	if (entity->prio_changed) {
- 		struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
--		unsigned short prev_weight, new_weight;
-+		unsigned int prev_weight, new_weight;
- 		struct bfq_data *bfqd = NULL;
- 		struct rb_root *root;
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
-@@ -630,7 +674,10 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
- 			    entity->new_weight > BFQ_MAX_WEIGHT) {
- 				pr_crit("update_weight_prio: new_weight %d\n",
- 					entity->new_weight);
--				BUG();
-+				if (entity->new_weight < BFQ_MIN_WEIGHT)
-+					entity->new_weight = BFQ_MIN_WEIGHT;
-+				else
-+					entity->new_weight = BFQ_MAX_WEIGHT;
- 			}
- 			entity->orig_weight = entity->new_weight;
- 			if (bfqq)
-@@ -661,6 +708,13 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
- 		 * associated with its new weight.
- 		 */
- 		if (prev_weight != new_weight) {
-+			if (bfqq)
-+				bfq_log_bfqq(bfqq->bfqd, bfqq,
-+					     "weight changed %d %d(%d %d)",
-+					     prev_weight, new_weight,
-+					     entity->orig_weight,
-+					     bfqq->wr_coeff);
-+
- 			root = bfqq ? &bfqd->queue_weights_tree :
- 				      &bfqd->group_weights_tree;
- 			bfq_weights_tree_remove(bfqd, entity, root);
-@@ -707,7 +761,7 @@ static void bfq_bfqq_served(struct bfq_queue *bfqq, int served)
- 		st = bfq_entity_service_tree(entity);
- 
- 		entity->service += served;
--		BUG_ON(entity->service > entity->budget);
-+
- 		BUG_ON(st->wsum == 0);
- 
- 		st->vtime += bfq_delta(served, st->wsum);
-@@ -716,31 +770,69 @@ static void bfq_bfqq_served(struct bfq_queue *bfqq, int served)
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	bfqg_stats_set_start_empty_time(bfqq_group(bfqq));
- #endif
--	bfq_log_bfqq(bfqq->bfqd, bfqq, "bfqq_served %d secs", served);
-+	st = bfq_entity_service_tree(&bfqq->entity);
-+	bfq_log_bfqq(bfqq->bfqd, bfqq, "bfqq_served %d secs, vtime %llu on %p",
-+		     served,  ((st->vtime>>10)*1000)>>12, st);
- }
- 
- /**
-- * bfq_bfqq_charge_full_budget - set the service to the entity budget.
-+ * bfq_bfqq_charge_time - charge an amount of service equivalent to the length
-+ *			  of the time interval during which bfqq has been in
-+ *			  service.
-+ * @bfqd: the device
-  * @bfqq: the queue that needs a service update.
-+ * @time_ms: the amount of time during which the queue has received service
-  *
-- * When it's not possible to be fair in the service domain, because
-- * a queue is not consuming its budget fast enough (the meaning of
-- * fast depends on the timeout parameter), we charge it a full
-- * budget.  In this way we should obtain a sort of time-domain
-- * fairness among all the seeky/slow queues.
-+ * If a queue does not consume its budget fast enough, then providing
-+ * the queue with service fairness may impair throughput, more or less
-+ * severely. For this reason, queues that consume their budget slowly
-+ * are provided with time fairness instead of service fairness. This
-+ * goal is achieved through the BFQ scheduling engine, even if such an
-+ * engine works in the service, and not in the time domain. The trick
-+ * is charging these queues with an inflated amount of service, equal
-+ * to the amount of service that they would have received during their
-+ * service slot if they had been fast, i.e., if their requests had
-+ * been dispatched at a rate equal to the estimated peak rate.
-+ *
-+ * It is worth noting that time fairness can cause important
-+ * distortions in terms of bandwidth distribution, on devices with
-+ * internal queueing. The reason is that I/O requests dispatched
-+ * during the service slot of a queue may be served after that service
-+ * slot is finished, and may have a total processing time loosely
-+ * correlated with the duration of the service slot. This is
-+ * especially true for short service slots.
-  */
--static void bfq_bfqq_charge_full_budget(struct bfq_queue *bfqq)
-+static void bfq_bfqq_charge_time(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-+				 unsigned long time_ms)
- {
- 	struct bfq_entity *entity = &bfqq->entity;
-+	int tot_serv_to_charge = entity->service;
-+	unsigned int timeout_ms = jiffies_to_msecs(bfq_timeout);
-+
-+	if (time_ms > 0 && time_ms < timeout_ms)
-+		tot_serv_to_charge =
-+			(bfqd->bfq_max_budget * time_ms) / timeout_ms;
- 
--	bfq_log_bfqq(bfqq->bfqd, bfqq, "charge_full_budget");
-+	if (tot_serv_to_charge < entity->service)
-+		tot_serv_to_charge = entity->service;
- 
--	bfq_bfqq_served(bfqq, entity->budget - entity->service);
-+	bfq_log_bfqq(bfqq->bfqd, bfqq,
-+		     "charge_time: %lu/%u ms, %d/%d/%d sectors",
-+		     time_ms, timeout_ms, entity->service,
-+		     tot_serv_to_charge, entity->budget);
-+
-+	/* Increase budget to avoid inconsistencies */
-+	if (tot_serv_to_charge > entity->budget)
-+		entity->budget = tot_serv_to_charge;
-+
-+	bfq_bfqq_served(bfqq,
-+			max_t(int, 0, tot_serv_to_charge - entity->service));
- }
- 
- /**
-  * __bfq_activate_entity - activate an entity.
-  * @entity: the entity being activated.
-+ * @non_blocking_wait_rq: true if this entity was waiting for a request
-  *
-  * Called whenever an entity is activated, i.e., it is not active and one
-  * of its children receives a new request, or has to be reactivated due to
-@@ -748,11 +840,16 @@ static void bfq_bfqq_charge_full_budget(struct bfq_queue *bfqq)
-  * service received if @entity is active) of the queue to calculate its
-  * timestamps.
-  */
--static void __bfq_activate_entity(struct bfq_entity *entity)
-+static void __bfq_activate_entity(struct bfq_entity *entity,
-+				  bool non_blocking_wait_rq)
- {
- 	struct bfq_sched_data *sd = entity->sched_data;
- 	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
-+	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+	bool backshifted = false;
- 
-+	BUG_ON(!sd);
-+	BUG_ON(!st);
- 	if (entity == sd->in_service_entity) {
- 		BUG_ON(entity->tree);
- 		/*
-@@ -770,45 +867,133 @@ static void __bfq_activate_entity(struct bfq_entity *entity)
- 		 * old start time.
- 		 */
- 		bfq_active_extract(st, entity);
--	} else if (entity->tree == &st->idle) {
--		/*
--		 * Must be on the idle tree, bfq_idle_extract() will
--		 * check for that.
--		 */
--		bfq_idle_extract(st, entity);
--		entity->start = bfq_gt(st->vtime, entity->finish) ?
--				       st->vtime : entity->finish;
- 	} else {
--		/*
--		 * The finish time of the entity may be invalid, and
--		 * it is in the past for sure, otherwise the queue
--		 * would have been on the idle tree.
--		 */
--		entity->start = st->vtime;
--		st->wsum += entity->weight;
--		bfq_get_entity(entity);
-+		unsigned long long min_vstart;
-+
-+		/* See comments on bfq_fqq_update_budg_for_activation */
-+		if (non_blocking_wait_rq && bfq_gt(st->vtime, entity->finish)) {
-+			backshifted = true;
-+			min_vstart = entity->finish;
-+		} else
-+			min_vstart = st->vtime;
-+
-+		if (entity->tree == &st->idle) {
-+			/*
-+			 * Must be on the idle tree, bfq_idle_extract() will
-+			 * check for that.
-+			 */
-+			bfq_idle_extract(st, entity);
-+			entity->start = bfq_gt(min_vstart, entity->finish) ?
-+				min_vstart : entity->finish;
-+		} else {
-+			/*
-+			 * The finish time of the entity may be invalid, and
-+			 * it is in the past for sure, otherwise the queue
-+			 * would have been on the idle tree.
-+			 */
-+			entity->start = min_vstart;
-+			st->wsum += entity->weight;
-+			bfq_get_entity(entity);
- 
--		BUG_ON(entity->on_st);
--		entity->on_st = 1;
-+			BUG_ON(entity->on_st);
-+			entity->on_st = 1;
-+		}
- 	}
- 
- 	st = __bfq_entity_update_weight_prio(st, entity);
- 	bfq_calc_finish(entity, entity->budget);
-+
-+	/*
-+	 * If some queues enjoy backshifting for a while, then their
-+	 * (virtual) finish timestamps may happen to become lower and
-+	 * lower than the system virtual time.  In particular, if
-+	 * these queues often happen to be idle for short time
-+	 * periods, and during such time periods other queues with
-+	 * higher timestamps happen to be busy, then the backshifted
-+	 * timestamps of the former queues can become much lower than
-+	 * the system virtual time. In fact, to serve the queues with
-+	 * higher timestamps while the ones with lower timestamps are
-+	 * idle, the system virtual time may be pushed-up to much
-+	 * higher values than the finish timestamps of the idle
-+	 * queues. As a consequence, the finish timestamps of all new
-+	 * or newly activated queues may end up being much larger than
-+	 * those of lucky queues with backshifted timestamps. The
-+	 * latter queues may then monopolize the device for a lot of
-+	 * time. This would simply break service guarantees.
-+	 *
-+	 * To reduce this problem, push up a little bit the
-+	 * backshifted timestamps of the queue associated with this
-+	 * entity (only a queue can happen to have the backshifted
-+	 * flag set): just enough to let the finish timestamp of the
-+	 * queue be equal to the current value of the system virtual
-+	 * time. This may introduce a little unfairness among queues
-+	 * with backshifted timestamps, but it does not break
-+	 * worst-case fairness guarantees.
-+	 *
-+	 * As a special case, if bfqq is weight-raised, push up
-+	 * timestamps much less, to keep very low the probability that
-+	 * this push up causes the backshifted finish timestamps of
-+	 * weight-raised queues to become higher than the backshifted
-+	 * finish timestamps of non weight-raised queues.
-+	 */
-+	if (backshifted && bfq_gt(st->vtime, entity->finish)) {
-+		unsigned long delta = st->vtime - entity->finish;
-+
-+		if (bfqq)
-+			delta /= bfqq->wr_coeff;
-+
-+		entity->start += delta;
-+		entity->finish += delta;
-+
-+		if (bfqq) {
-+			bfq_log_bfqq(bfqq->bfqd, bfqq,
-+				     "__activate_entity: new queue finish %llu",
-+				     ((entity->finish>>10)*1000)>>12);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		} else {
-+			struct bfq_group *bfqg =
-+				container_of(entity, struct bfq_group, entity);
-+
-+			bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+				     "__activate_entity: new group finish %llu",
-+				     ((entity->finish>>10)*1000)>>12);
-+#endif
-+		}
-+	}
-+
- 	bfq_active_insert(st, entity);
-+
-+	if (bfqq) {
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			"__activate_entity: queue %seligible in st %p",
-+			     entity->start <= st->vtime ? "" : "non ", st);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	} else {
-+		struct bfq_group *bfqg =
-+			container_of(entity, struct bfq_group, entity);
-+
-+		bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+			"__activate_entity: group %seligible in st %p",
-+			     entity->start <= st->vtime ? "" : "non ", st);
-+#endif
-+	}
- }
- 
- /**
-  * bfq_activate_entity - activate an entity and its ancestors if necessary.
-  * @entity: the entity to activate.
-+ * @non_blocking_wait_rq: true if this entity was waiting for a request
-  *
-  * Activate @entity and all the entities on the path from it to the root.
-  */
--static void bfq_activate_entity(struct bfq_entity *entity)
-+static void bfq_activate_entity(struct bfq_entity *entity,
-+				bool non_blocking_wait_rq)
- {
- 	struct bfq_sched_data *sd;
- 
- 	for_each_entity(entity) {
--		__bfq_activate_entity(entity);
-+		BUG_ON(!entity);
-+		__bfq_activate_entity(entity, non_blocking_wait_rq);
- 
- 		sd = entity->sched_data;
- 		if (!bfq_update_next_in_service(sd))
-@@ -889,23 +1074,24 @@ static void bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
- 
- 		if (!__bfq_deactivate_entity(entity, requeue))
- 			/*
--			 * The parent entity is still backlogged, and
--			 * we don't need to update it as it is still
--			 * in service.
-+			 * next_in_service has not been changed, so
-+			 * no upwards update is needed
- 			 */
- 			break;
- 
- 		if (sd->next_in_service)
- 			/*
--			 * The parent entity is still backlogged and
--			 * the budgets on the path towards the root
--			 * need to be updated.
-+			 * The parent entity is still backlogged,
-+			 * because next_in_service is not NULL, and
-+			 * next_in_service has been updated (see
-+			 * comment on the body of the above if):
-+			 * upwards update of the schedule is needed.
- 			 */
- 			goto update;
- 
- 		/*
--		 * If we reach there the parent is no more backlogged and
--		 * we want to propagate the dequeue upwards.
-+		 * If we get here, then the parent is no more backlogged and
-+		 * we want to propagate the deactivation upwards.
- 		 */
- 		requeue = 1;
- 	}
-@@ -915,9 +1101,23 @@ static void bfq_deactivate_entity(struct bfq_entity *entity, int requeue)
- update:
- 	entity = parent;
- 	for_each_entity(entity) {
--		__bfq_activate_entity(entity);
-+		struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+		__bfq_activate_entity(entity, false);
- 
- 		sd = entity->sched_data;
-+		if (bfqq)
-+			bfq_log_bfqq(bfqq->bfqd, bfqq,
-+				     "invoking udpdate_next for this queue");
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		else {
-+			struct bfq_group *bfqg =
-+				container_of(entity,
-+					     struct bfq_group, entity);
-+
-+			bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+				     "invoking udpdate_next for this entity");
-+		}
-+#endif
- 		if (!bfq_update_next_in_service(sd))
- 			break;
- 	}
-@@ -943,7 +1143,23 @@ static void bfq_update_vtime(struct bfq_service_tree *st)
- 
- 	entry = rb_entry(node, struct bfq_entity, rb_node);
- 	if (bfq_gt(entry->min_start, st->vtime)) {
-+		struct bfq_queue *bfqq = bfq_entity_to_bfqq(entry);
- 		st->vtime = entry->min_start;
-+
-+		if (bfqq)
-+			bfq_log_bfqq(bfqq->bfqd, bfqq,
-+				     "update_vtime: new vtime %llu %p",
-+				     ((st->vtime>>10)*1000)>>12, st);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		else {
-+			struct bfq_group *bfqg =
-+				container_of(entry, struct bfq_group, entity);
-+
-+			bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+				     "update_vtime: new vtime %llu %p",
-+				     ((st->vtime>>10)*1000)>>12, st);
-+		}
-+#endif
- 		bfq_forget_idle(st);
- 	}
- }
-@@ -996,10 +1212,11 @@ left:
-  * Update the virtual time in @st and return the first eligible entity
-  * it contains.
-  */
--static struct bfq_entity *__bfq_lookup_next_entity(struct bfq_service_tree *st,
--						   bool force)
-+static struct bfq_entity *
-+__bfq_lookup_next_entity(struct bfq_service_tree *st, bool force)
- {
- 	struct bfq_entity *entity, *new_next_in_service = NULL;
-+	struct bfq_queue *bfqq;
- 
- 	if (RB_EMPTY_ROOT(&st->active))
- 		return NULL;
-@@ -1008,6 +1225,24 @@ static struct bfq_entity *__bfq_lookup_next_entity(struct bfq_service_tree *st,
- 	entity = bfq_first_active_entity(st);
- 	BUG_ON(bfq_gt(entity->start, st->vtime));
- 
-+	bfqq = bfq_entity_to_bfqq(entity);
-+	if (bfqq)
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			     "__lookup_next: start %llu vtime %llu st %p",
-+			     ((entity->start>>10)*1000)>>12,
-+			     ((st->vtime>>10)*1000)>>12, st);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	else {
-+		struct bfq_group *bfqg =
-+			container_of(entity, struct bfq_group, entity);
-+
-+		bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+			     "__lookup_next: start %llu vtime %llu st %p",
-+			     ((entity->start>>10)*1000)>>12,
-+			     ((st->vtime>>10)*1000)>>12, st);
-+	}
-+#endif
-+
- 	/*
- 	 * If the chosen entity does not match with the sched_data's
- 	 * next_in_service and we are forcedly serving the IDLE priority
-@@ -1043,11 +1278,36 @@ static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
- 
- 	BUG_ON(sd->in_service_entity);
- 
-+	/*
-+	 * Choose from idle class, if needed to guarantee a minimum
-+	 * bandwidth to this class. This should also mitigate
-+	 * priority-inversion problems in case a low priority task is
-+	 * holding file system resources.
-+	 */
- 	if (bfqd &&
--	    jiffies - bfqd->bfq_class_idle_last_service > BFQ_CL_IDLE_TIMEOUT) {
-+	    jiffies - bfqd->bfq_class_idle_last_service >
-+	    BFQ_CL_IDLE_TIMEOUT) {
- 		entity = __bfq_lookup_next_entity(st + BFQ_IOPRIO_CLASSES - 1,
- 						  true);
- 		if (entity) {
-+			struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+			if (bfqq)
-+				bfq_log_bfqq(bfqd, bfqq,
-+					     "idle chosen from st %p %d",
-+					     st + BFQ_IOPRIO_CLASSES - 1,
-+					BFQ_IOPRIO_CLASSES - 1);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+			else {
-+				struct bfq_group *bfqg =
-+				container_of(entity, struct bfq_group, entity);
-+
-+				bfq_log_bfqg(bfqd, bfqg,
-+					     "idle chosen from st %p %d",
-+					     st + BFQ_IOPRIO_CLASSES - 1,
-+					BFQ_IOPRIO_CLASSES - 1);
-+			}
-+#endif
- 			i = BFQ_IOPRIO_CLASSES - 1;
- 			bfqd->bfq_class_idle_last_service = jiffies;
- 			sd->next_in_service = entity;
-@@ -1056,6 +1316,25 @@ static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
- 	for (; i < BFQ_IOPRIO_CLASSES; i++) {
- 		entity = __bfq_lookup_next_entity(st + i, false);
- 		if (entity) {
-+			if (bfqd != NULL) {
-+			struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
-+
-+			if (bfqq)
-+				bfq_log_bfqq(bfqd, bfqq,
-+					     "chosen from st %p %d",
-+					     st + i, i);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+			else {
-+				struct bfq_group *bfqg =
-+				container_of(entity, struct bfq_group, entity);
-+
-+				bfq_log_bfqg(bfqd, bfqg,
-+					     "chosen from st %p %d",
-+					     st + i, i);
-+			}
-+#endif
-+			}
-+
- 			if (extract) {
- 				bfq_check_next_in_service(sd, entity);
- 				bfq_active_extract(st + i, entity);
-@@ -1069,6 +1348,13 @@ static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
- 	return entity;
- }
- 
-+static bool next_queue_may_preempt(struct bfq_data *bfqd)
-+{
-+	struct bfq_sched_data *sd = &bfqd->root_group->sched_data;
-+
-+	return sd->next_in_service != sd->in_service_entity;
-+}
-+
- /*
-  * Get next queue for service.
-  */
-@@ -1085,7 +1371,36 @@ static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd)
- 
- 	sd = &bfqd->root_group->sched_data;
- 	for (; sd ; sd = entity->my_sched_data) {
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		if (entity) {
-+			struct bfq_group *bfqg =
-+				container_of(entity, struct bfq_group, entity);
-+
-+			bfq_log_bfqg(bfqd, bfqg,
-+				     "get_next_queue: lookup in this group");
-+		} else
-+			bfq_log_bfqg(bfqd, bfqd->root_group,
-+				     "get_next_queue: lookup in root group");
-+#endif
-+
- 		entity = bfq_lookup_next_entity(sd, 1, bfqd);
-+
-+		bfqq = bfq_entity_to_bfqq(entity);
-+		if (bfqq)
-+			bfq_log_bfqq(bfqd, bfqq,
-+			     "get_next_queue: this queue, finish %llu",
-+				(((entity->finish>>10)*1000)>>10)>>2);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+		else {
-+			struct bfq_group *bfqg =
-+				container_of(entity, struct bfq_group, entity);
-+
-+			bfq_log_bfqg(bfqd, bfqg,
-+			     "get_next_queue: this entity, finish %llu",
-+				(((entity->finish>>10)*1000)>>10)>>2);
-+		}
-+#endif
-+
- 		BUG_ON(!entity);
- 		entity->service = 0;
- 	}
-@@ -1103,8 +1418,9 @@ static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd)
- 		bfqd->in_service_bic = NULL;
- 	}
- 
-+	bfq_clear_bfqq_wait_request(bfqd->in_service_queue);
-+	hrtimer_try_to_cancel(&bfqd->idle_slice_timer);
- 	bfqd->in_service_queue = NULL;
--	del_timer(&bfqd->idle_slice_timer);
- }
- 
- static void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
-@@ -1112,9 +1428,7 @@ static void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- {
- 	struct bfq_entity *entity = &bfqq->entity;
- 
--	if (bfqq == bfqd->in_service_queue)
--		__bfq_bfqd_reset_in_service(bfqd);
--
-+	BUG_ON(bfqq == bfqd->in_service_queue);
- 	bfq_deactivate_entity(entity, requeue);
- }
- 
-@@ -1122,12 +1436,11 @@ static void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- {
- 	struct bfq_entity *entity = &bfqq->entity;
- 
--	bfq_activate_entity(entity);
-+	bfq_activate_entity(entity, bfq_bfqq_non_blocking_wait_rq(bfqq));
-+	bfq_clear_bfqq_non_blocking_wait_rq(bfqq);
- }
- 
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
- static void bfqg_stats_update_dequeue(struct bfq_group *bfqg);
--#endif
- 
- /*
-  * Called when the bfqq no longer has requests pending, remove it from
-@@ -1138,6 +1451,7 @@ static void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- {
- 	BUG_ON(!bfq_bfqq_busy(bfqq));
- 	BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list));
-+	BUG_ON(bfqq == bfqd->in_service_queue);
- 
- 	bfq_log_bfqq(bfqd, bfqq, "del from busy");
- 
-@@ -1146,27 +1460,20 @@ static void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq,
- 	BUG_ON(bfqd->busy_queues == 0);
- 	bfqd->busy_queues--;
- 
--	if (!bfqq->dispatched) {
-+	if (!bfqq->dispatched)
- 		bfq_weights_tree_remove(bfqd, &bfqq->entity,
- 					&bfqd->queue_weights_tree);
--		if (!blk_queue_nonrot(bfqd->queue)) {
--			BUG_ON(!bfqd->busy_in_flight_queues);
--			bfqd->busy_in_flight_queues--;
--			if (bfq_bfqq_constantly_seeky(bfqq)) {
--				BUG_ON(!bfqd->
--					const_seeky_busy_in_flight_queues);
--				bfqd->const_seeky_busy_in_flight_queues--;
--			}
--		}
--	}
-+
- 	if (bfqq->wr_coeff > 1)
- 		bfqd->wr_busy_queues--;
- 
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	bfqg_stats_update_dequeue(bfqq_group(bfqq));
--#endif
-+
-+	BUG_ON(bfqq->entity.budget < 0);
- 
- 	bfq_deactivate_bfqq(bfqd, bfqq, requeue);
-+
-+	BUG_ON(bfqq->entity.budget < 0);
- }
- 
- /*
-@@ -1184,16 +1491,11 @@ static void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq)
- 	bfq_mark_bfqq_busy(bfqq);
- 	bfqd->busy_queues++;
- 
--	if (!bfqq->dispatched) {
-+	if (!bfqq->dispatched)
- 		if (bfqq->wr_coeff == 1)
- 			bfq_weights_tree_add(bfqd, &bfqq->entity,
- 					     &bfqd->queue_weights_tree);
--		if (!blk_queue_nonrot(bfqd->queue)) {
--			bfqd->busy_in_flight_queues++;
--			if (bfq_bfqq_constantly_seeky(bfqq))
--				bfqd->const_seeky_busy_in_flight_queues++;
--		}
--	}
-+
- 	if (bfqq->wr_coeff > 1)
- 		bfqd->wr_busy_queues++;
- }
-diff --git a/block/bfq.h b/block/bfq.h
-index fcce855..ea1e7d8 100644
---- a/block/bfq.h
-+++ b/block/bfq.h
-@@ -1,5 +1,5 @@
- /*
-- * BFQ-v7r11 for 4.5.0: data structures and common functions prototypes.
-+ * BFQ-v8r4 for 4.8.0: data structures and common functions prototypes.
-  *
-  * Based on ideas and code from CFQ:
-  * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
-@@ -7,7 +7,9 @@
-  * Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
-  *		      Paolo Valente <paolo.valente@unimore.it>
-  *
-- * Copyright (C) 2010 Paolo Valente <paolo.valente@unimore.it>
-+ * Copyright (C) 2015 Paolo Valente <paolo.valente@unimore.it>
-+ *
-+ * Copyright (C) 2016 Paolo Valente <paolo.valente@linaro.org>
-  */
- 
- #ifndef _BFQ_H
-@@ -28,20 +30,21 @@
- 
- #define BFQ_DEFAULT_QUEUE_IOPRIO	4
- 
--#define BFQ_DEFAULT_GRP_WEIGHT	10
-+#define BFQ_WEIGHT_LEGACY_DFL	100
- #define BFQ_DEFAULT_GRP_IOPRIO	0
- #define BFQ_DEFAULT_GRP_CLASS	IOPRIO_CLASS_BE
- 
-+/*
-+ * Soft real-time applications are extremely more latency sensitive
-+ * than interactive ones. Over-raise the weight of the former to
-+ * privilege them against the latter.
-+ */
-+#define BFQ_SOFTRT_WEIGHT_FACTOR	100
-+
- struct bfq_entity;
- 
- /**
-  * struct bfq_service_tree - per ioprio_class service tree.
-- * @active: tree for active entities (i.e., those backlogged).
-- * @idle: tree for idle entities (i.e., those not backlogged, with V <= F_i).
-- * @first_idle: idle entity with minimum F_i.
-- * @last_idle: idle entity with maximum F_i.
-- * @vtime: scheduler virtual time.
-- * @wsum: scheduler weight sum; active and idle entities contribute to it.
-  *
-  * Each service tree represents a B-WF2Q+ scheduler on its own.  Each
-  * ioprio_class has its own independent scheduler, and so its own
-@@ -49,27 +52,28 @@ struct bfq_entity;
-  * of the containing bfqd.
-  */
- struct bfq_service_tree {
-+	/* tree for active entities (i.e., those backlogged) */
- 	struct rb_root active;
-+	/* tree for idle entities (i.e., not backlogged, with V <= F_i)*/
- 	struct rb_root idle;
- 
--	struct bfq_entity *first_idle;
--	struct bfq_entity *last_idle;
-+	struct bfq_entity *first_idle;	/* idle entity with minimum F_i */
-+	struct bfq_entity *last_idle;	/* idle entity with maximum F_i */
- 
--	u64 vtime;
-+	u64 vtime; /* scheduler virtual time */
-+	/* scheduler weight sum; active and idle entities contribute to it */
- 	unsigned long wsum;
- };
- 
- /**
-  * struct bfq_sched_data - multi-class scheduler.
-- * @in_service_entity: entity in service.
-- * @next_in_service: head-of-the-line entity in the scheduler.
-- * @service_tree: array of service trees, one per ioprio_class.
-  *
-  * bfq_sched_data is the basic scheduler queue.  It supports three
-- * ioprio_classes, and can be used either as a toplevel queue or as
-- * an intermediate queue on a hierarchical setup.
-- * @next_in_service points to the active entity of the sched_data
-- * service trees that will be scheduled next.
-+ * ioprio_classes, and can be used either as a toplevel queue or as an
-+ * intermediate queue on a hierarchical setup.  @next_in_service
-+ * points to the active entity of the sched_data service trees that
-+ * will be scheduled next. It is used to reduce the number of steps
-+ * needed for each hierarchical-schedule update.
-  *
-  * The supported ioprio_classes are the same as in CFQ, in descending
-  * priority order, IOPRIO_CLASS_RT, IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE.
-@@ -79,48 +83,29 @@ struct bfq_service_tree {
-  * All the fields are protected by the queue lock of the containing bfqd.
-  */
- struct bfq_sched_data {
--	struct bfq_entity *in_service_entity;
-+	struct bfq_entity *in_service_entity;  /* entity in service */
-+	/* head-of-the-line entity in the scheduler (see comments above) */
- 	struct bfq_entity *next_in_service;
-+	/* array of service trees, one per ioprio_class */
- 	struct bfq_service_tree service_tree[BFQ_IOPRIO_CLASSES];
- };
- 
- /**
-  * struct bfq_weight_counter - counter of the number of all active entities
-  *                             with a given weight.
-- * @weight: weight of the entities that this counter refers to.
-- * @num_active: number of active entities with this weight.
-- * @weights_node: weights tree member (see bfq_data's @queue_weights_tree
-- *                and @group_weights_tree).
-  */
- struct bfq_weight_counter {
--	short int weight;
--	unsigned int num_active;
-+	unsigned int weight; /* weight of the entities this counter refers to */
-+	unsigned int num_active; /* nr of active entities with this weight */
-+	/*
-+	 * Weights tree member (see bfq_data's @queue_weights_tree and
-+	 * @group_weights_tree)
-+	 */
- 	struct rb_node weights_node;
- };
- 
- /**
-  * struct bfq_entity - schedulable entity.
-- * @rb_node: service_tree member.
-- * @weight_counter: pointer to the weight counter associated with this entity.
-- * @on_st: flag, true if the entity is on a tree (either the active or
-- *         the idle one of its service_tree).
-- * @finish: B-WF2Q+ finish timestamp (aka F_i).
-- * @start: B-WF2Q+ start timestamp (aka S_i).
-- * @tree: tree the entity is enqueued into; %NULL if not on a tree.
-- * @min_start: minimum start time of the (active) subtree rooted at
-- *             this entity; used for O(log N) lookups into active trees.
-- * @service: service received during the last round of service.
-- * @budget: budget used to calculate F_i; F_i = S_i + @budget / @weight.
-- * @weight: weight of the queue
-- * @parent: parent entity, for hierarchical scheduling.
-- * @my_sched_data: for non-leaf nodes in the cgroup hierarchy, the
-- *                 associated scheduler queue, %NULL on leaf nodes.
-- * @sched_data: the scheduler queue this entity belongs to.
-- * @ioprio: the ioprio in use.
-- * @new_weight: when a weight change is requested, the new weight value.
-- * @orig_weight: original weight, used to implement weight boosting
-- * @prio_changed: flag, true when the user requested a weight, ioprio or
-- *		  ioprio_class change.
-  *
-  * A bfq_entity is used to represent either a bfq_queue (leaf node in the
-  * cgroup hierarchy) or a bfq_group into the upper level scheduler.  Each
-@@ -147,27 +132,52 @@ struct bfq_weight_counter {
-  * containing bfqd.
-  */
- struct bfq_entity {
--	struct rb_node rb_node;
-+	struct rb_node rb_node; /* service_tree member */
-+	/* pointer to the weight counter associated with this entity */
- 	struct bfq_weight_counter *weight_counter;
- 
-+	/*
-+	 * flag, true if the entity is on a tree (either the active or
-+	 * the idle one of its service_tree).
-+	 */
- 	int on_st;
- 
--	u64 finish;
--	u64 start;
-+	u64 finish; /* B-WF2Q+ finish timestamp (aka F_i) */
-+	u64 start;  /* B-WF2Q+ start timestamp (aka S_i) */
- 
-+	/* tree the entity is enqueued into; %NULL if not on a tree */
- 	struct rb_root *tree;
- 
-+	/*
-+	 * minimum start time of the (active) subtree rooted at this
-+	 * entity; used for O(log N) lookups into active trees
-+	 */
- 	u64 min_start;
- 
--	int service, budget;
--	unsigned short weight, new_weight;
--	unsigned short orig_weight;
-+	/* amount of service received during the last service slot */
-+	int service;
-+
-+	/* budget, used also to calculate F_i: F_i = S_i + @budget / @weight */
-+	int budget;
-+
-+	unsigned int weight;	 /* weight of the queue */
-+	unsigned int new_weight; /* next weight if a change is in progress */
-+
-+	/* original weight, used to implement weight boosting */
-+	unsigned int orig_weight;
- 
-+	/* parent entity, for hierarchical scheduling */
- 	struct bfq_entity *parent;
- 
-+	/*
-+	 * For non-leaf nodes in the hierarchy, the associated
-+	 * scheduler queue, %NULL on leaf nodes.
-+	 */
- 	struct bfq_sched_data *my_sched_data;
-+	/* the scheduler queue this entity belongs to */
- 	struct bfq_sched_data *sched_data;
- 
-+	/* flag, set to request a weight, ioprio or ioprio_class change  */
- 	int prio_changed;
- };
- 
-@@ -175,56 +185,6 @@ struct bfq_group;
- 
- /**
-  * struct bfq_queue - leaf schedulable entity.
-- * @ref: reference counter.
-- * @bfqd: parent bfq_data.
-- * @new_ioprio: when an ioprio change is requested, the new ioprio value.
-- * @ioprio_class: the ioprio_class in use.
-- * @new_ioprio_class: when an ioprio_class change is requested, the new
-- *                    ioprio_class value.
-- * @new_bfqq: shared bfq_queue if queue is cooperating with
-- *           one or more other queues.
-- * @pos_node: request-position tree member (see bfq_group's @rq_pos_tree).
-- * @pos_root: request-position tree root (see bfq_group's @rq_pos_tree).
-- * @sort_list: sorted list of pending requests.
-- * @next_rq: if fifo isn't expired, next request to serve.
-- * @queued: nr of requests queued in @sort_list.
-- * @allocated: currently allocated requests.
-- * @meta_pending: pending metadata requests.
-- * @fifo: fifo list of requests in sort_list.
-- * @entity: entity representing this queue in the scheduler.
-- * @max_budget: maximum budget allowed from the feedback mechanism.
-- * @budget_timeout: budget expiration (in jiffies).
-- * @dispatched: number of requests on the dispatch list or inside driver.
-- * @flags: status flags.
-- * @bfqq_list: node for active/idle bfqq list inside our bfqd.
-- * @burst_list_node: node for the device's burst list.
-- * @seek_samples: number of seeks sampled
-- * @seek_total: sum of the distances of the seeks sampled
-- * @seek_mean: mean seek distance
-- * @last_request_pos: position of the last request enqueued
-- * @requests_within_timer: number of consecutive pairs of request completion
-- *                         and arrival, such that the queue becomes idle
-- *                         after the completion, but the next request arrives
-- *                         within an idle time slice; used only if the queue's
-- *                         IO_bound has been cleared.
-- * @pid: pid of the process owning the queue, used for logging purposes.
-- * @last_wr_start_finish: start time of the current weight-raising period if
-- *                        the @bfq-queue is being weight-raised, otherwise
-- *                        finish time of the last weight-raising period
-- * @wr_cur_max_time: current max raising time for this queue
-- * @soft_rt_next_start: minimum time instant such that, only if a new
-- *                      request is enqueued after this time instant in an
-- *                      idle @bfq_queue with no outstanding requests, then
-- *                      the task associated with the queue it is deemed as
-- *                      soft real-time (see the comments to the function
-- *                      bfq_bfqq_softrt_next_start())
-- * @last_idle_bklogged: time of the last transition of the @bfq_queue from
-- *                      idle to backlogged
-- * @service_from_backlogged: cumulative service received from the @bfq_queue
-- *                           since the last transition from idle to
-- *                           backlogged
-- * @bic: pointer to the bfq_io_cq owning the bfq_queue, set to %NULL if the
-- *	 queue is shared
-  *
-  * A bfq_queue is a leaf request queue; it can be associated with an
-  * io_context or more, if it  is  async or shared  between  cooperating
-@@ -235,117 +195,174 @@ struct bfq_group;
-  * All the fields are protected by the queue lock of the containing bfqd.
-  */
- struct bfq_queue {
--	atomic_t ref;
-+	/* reference counter */
-+	int ref;
-+	/* parent bfq_data */
- 	struct bfq_data *bfqd;
- 
--	unsigned short ioprio, new_ioprio;
--	unsigned short ioprio_class, new_ioprio_class;
-+	/* current ioprio and ioprio class */
-+	unsigned short ioprio, ioprio_class;
-+	/* next ioprio and ioprio class if a change is in progress */
-+	unsigned short new_ioprio, new_ioprio_class;
- 
--	/* fields for cooperating queues handling */
-+	/*
-+	 * Shared bfq_queue if queue is cooperating with one or more
-+	 * other queues.
-+	 */
- 	struct bfq_queue *new_bfqq;
-+	/* request-position tree member (see bfq_group's @rq_pos_tree) */
- 	struct rb_node pos_node;
-+	/* request-position tree root (see bfq_group's @rq_pos_tree) */
- 	struct rb_root *pos_root;
- 
-+	/* sorted list of pending requests */
- 	struct rb_root sort_list;
-+	/* if fifo isn't expired, next request to serve */
- 	struct request *next_rq;
-+	/* number of sync and async requests queued */
- 	int queued[2];
-+	/* number of sync and async requests currently allocated */
- 	int allocated[2];
-+	/* number of pending metadata requests */
- 	int meta_pending;
-+	/* fifo list of requests in sort_list */
- 	struct list_head fifo;
- 
-+	/* entity representing this queue in the scheduler */
- 	struct bfq_entity entity;
- 
-+	/* maximum budget allowed from the feedback mechanism */
- 	int max_budget;
-+	/* budget expiration (in jiffies) */
- 	unsigned long budget_timeout;
- 
-+	/* number of requests on the dispatch list or inside driver */
- 	int dispatched;
- 
--	unsigned int flags;
-+	unsigned int flags; /* status flags.*/
- 
-+	/* node for active/idle bfqq list inside parent bfqd */
- 	struct list_head bfqq_list;
- 
-+	/* bit vector: a 1 for each seeky requests in history */
-+	u32 seek_history;
-+
-+	/* node for the device's burst list */
- 	struct hlist_node burst_list_node;
- 
--	unsigned int seek_samples;
--	u64 seek_total;
--	sector_t seek_mean;
-+	/* position of the last request enqueued */
- 	sector_t last_request_pos;
- 
-+	/* Number of consecutive pairs of request completion and
-+	 * arrival, such that the queue becomes idle after the
-+	 * completion, but the next request arrives within an idle
-+	 * time slice; used only if the queue's IO_bound flag has been
-+	 * cleared.
-+	 */
- 	unsigned int requests_within_timer;
- 
-+	/* pid of the process owning the queue, used for logging purposes */
- 	pid_t pid;
-+
-+	/*
-+	 * Pointer to the bfq_io_cq owning the bfq_queue, set to %NULL
-+	 * if the queue is shared.
-+	 */
- 	struct bfq_io_cq *bic;
- 
--	/* weight-raising fields */
-+	/* current maximum weight-raising time for this queue */
- 	unsigned long wr_cur_max_time;
-+	/*
-+	 * Minimum time instant such that, only if a new request is
-+	 * enqueued after this time instant in an idle @bfq_queue with
-+	 * no outstanding requests, then the task associated with the
-+	 * queue it is deemed as soft real-time (see the comments on
-+	 * the function bfq_bfqq_softrt_next_start())
-+	 */
- 	unsigned long soft_rt_next_start;
-+	/*
-+	 * Start time of the current weight-raising period if
-+	 * the @bfq-queue is being weight-raised, otherwise
-+	 * finish time of the last weight-raising period.
-+	 */
- 	unsigned long last_wr_start_finish;
-+	/* factor by which the weight of this queue is multiplied */
- 	unsigned int wr_coeff;
-+	/*
-+	 * Time of the last transition of the @bfq_queue from idle to
-+	 * backlogged.
-+	 */
- 	unsigned long last_idle_bklogged;
-+	/*
-+	 * Cumulative service received from the @bfq_queue since the
-+	 * last transition from idle to backlogged.
-+	 */
- 	unsigned long service_from_backlogged;
-+	/*
-+	 * Value of wr start time when switching to soft rt
-+	 */
-+	unsigned long wr_start_at_switch_to_srt;
-+
-+	unsigned long split_time; /* time of last split */
- };
- 
- /**
-  * struct bfq_ttime - per process thinktime stats.
-- * @ttime_total: total process thinktime
-- * @ttime_samples: number of thinktime samples
-- * @ttime_mean: average process thinktime
-  */
- struct bfq_ttime {
--	unsigned long last_end_request;
-+	u64 last_end_request; /* completion time of last request */
-+
-+	u64 ttime_total; /* total process thinktime */
-+	unsigned long ttime_samples; /* number of thinktime samples */
-+	u64 ttime_mean; /* average process thinktime */
- 
--	unsigned long ttime_total;
--	unsigned long ttime_samples;
--	unsigned long ttime_mean;
- };
- 
- /**
-  * struct bfq_io_cq - per (request_queue, io_context) structure.
-- * @icq: associated io_cq structure
-- * @bfqq: array of two process queues, the sync and the async
-- * @ttime: associated @bfq_ttime struct
-- * @ioprio: per (request_queue, blkcg) ioprio.
-- * @blkcg_id: id of the blkcg the related io_cq belongs to.
-- * @wr_time_left: snapshot of the time left before weight raising ends
-- *                for the sync queue associated to this process; this
-- *		  snapshot is taken to remember this value while the weight
-- *		  raising is suspended because the queue is merged with a
-- *		  shared queue, and is used to set @raising_cur_max_time
-- *		  when the queue is split from the shared queue and its
-- *		  weight is raised again
-- * @saved_idle_window: same purpose as the previous field for the idle
-- *                     window
-- * @saved_IO_bound: same purpose as the previous two fields for the I/O
-- *                  bound classification of a queue
-- * @saved_in_large_burst: same purpose as the previous fields for the
-- *                        value of the field keeping the queue's belonging
-- *                        to a large burst
-- * @was_in_burst_list: true if the queue belonged to a burst list
-- *                     before its merge with another cooperating queue
-- * @cooperations: counter of consecutive successful queue merges underwent
-- *                by any of the process' @bfq_queues
-- * @failed_cooperations: counter of consecutive failed queue merges of any
-- *                       of the process' @bfq_queues
-  */
- struct bfq_io_cq {
-+	/* associated io_cq structure */
- 	struct io_cq icq; /* must be the first member */
-+	/* array of two process queues, the sync and the async */
- 	struct bfq_queue *bfqq[2];
-+	/* associated @bfq_ttime struct */
- 	struct bfq_ttime ttime;
-+	/* per (request_queue, blkcg) ioprio */
- 	int ioprio;
--
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
--	uint64_t blkcg_id; /* the current blkcg ID */
-+	uint64_t blkcg_serial_nr; /* the current blkcg serial */
- #endif
- 
--	unsigned int wr_time_left;
-+	/*
-+	 * Snapshot of the idle window before merging; taken to
-+	 * remember this value while the queue is merged, so as to be
-+	 * able to restore it in case of split.
-+	 */
- 	bool saved_idle_window;
-+	/*
-+	 * Same purpose as the previous two fields for the I/O bound
-+	 * classification of a queue.
-+	 */
- 	bool saved_IO_bound;
- 
-+	/*
-+	 * Same purpose as the previous fields for the value of the
-+	 * field keeping the queue's belonging to a large burst
-+	 */
- 	bool saved_in_large_burst;
-+	/*
-+	 * True if the queue belonged to a burst list before its merge
-+	 * with another cooperating queue.
-+	 */
- 	bool was_in_burst_list;
- 
--	unsigned int cooperations;
--	unsigned int failed_cooperations;
-+	/*
-+	 * Similar to previous fields: save wr information.
-+	 */
-+	unsigned long saved_wr_coeff;
-+	unsigned long saved_last_wr_start_finish;
-+	unsigned long saved_wr_start_at_switch_to_srt;
- };
- 
- enum bfq_device_speed {
-@@ -354,224 +371,234 @@ enum bfq_device_speed {
- };
- 
- /**
-- * struct bfq_data - per device data structure.
-- * @queue: request queue for the managed device.
-- * @root_group: root bfq_group for the device.
-- * @active_numerous_groups: number of bfq_groups containing more than one
-- *                          active @bfq_entity.
-- * @queue_weights_tree: rbtree of weight counters of @bfq_queues, sorted by
-- *                      weight. Used to keep track of whether all @bfq_queues
-- *                     have the same weight. The tree contains one counter
-- *                     for each distinct weight associated to some active
-- *                     and not weight-raised @bfq_queue (see the comments to
-- *                      the functions bfq_weights_tree_[add|remove] for
-- *                     further details).
-- * @group_weights_tree: rbtree of non-queue @bfq_entity weight counters, sorted
-- *                      by weight. Used to keep track of whether all
-- *                     @bfq_groups have the same weight. The tree contains
-- *                     one counter for each distinct weight associated to
-- *                     some active @bfq_group (see the comments to the
-- *                     functions bfq_weights_tree_[add|remove] for further
-- *                     details).
-- * @busy_queues: number of bfq_queues containing requests (including the
-- *		 queue in service, even if it is idling).
-- * @busy_in_flight_queues: number of @bfq_queues containing pending or
-- *                         in-flight requests, plus the @bfq_queue in
-- *                         service, even if idle but waiting for the
-- *                         possible arrival of its next sync request. This
-- *                         field is updated only if the device is rotational,
-- *                         but used only if the device is also NCQ-capable.
-- *                         The reason why the field is updated also for non-
-- *                         NCQ-capable rotational devices is related to the
-- *                         fact that the value of @hw_tag may be set also
-- *                         later than when busy_in_flight_queues may need to
-- *                         be incremented for the first time(s). Taking also
-- *                         this possibility into account, to avoid unbalanced
-- *                         increments/decrements, would imply more overhead
-- *                         than just updating busy_in_flight_queues
-- *                         regardless of the value of @hw_tag.
-- * @const_seeky_busy_in_flight_queues: number of constantly-seeky @bfq_queues
-- *                                     (that is, seeky queues that expired
-- *                                     for budget timeout at least once)
-- *                                     containing pending or in-flight
-- *                                     requests, including the in-service
-- *                                     @bfq_queue if constantly seeky. This
-- *                                     field is updated only if the device
-- *                                     is rotational, but used only if the
-- *                                     device is also NCQ-capable (see the
-- *                                     comments to @busy_in_flight_queues).
-- * @wr_busy_queues: number of weight-raised busy @bfq_queues.
-- * @queued: number of queued requests.
-- * @rq_in_driver: number of requests dispatched and waiting for completion.
-- * @sync_flight: number of sync requests in the driver.
-- * @max_rq_in_driver: max number of reqs in driver in the last
-- *                    @hw_tag_samples completed requests.
-- * @hw_tag_samples: nr of samples used to calculate hw_tag.
-- * @hw_tag: flag set to one if the driver is showing a queueing behavior.
-- * @budgets_assigned: number of budgets assigned.
-- * @idle_slice_timer: timer set when idling for the next sequential request
-- *                    from the queue in service.
-- * @unplug_work: delayed work to restart dispatching on the request queue.
-- * @in_service_queue: bfq_queue in service.
-- * @in_service_bic: bfq_io_cq (bic) associated with the @in_service_queue.
-- * @last_position: on-disk position of the last served request.
-- * @last_budget_start: beginning of the last budget.
-- * @last_idling_start: beginning of the last idle slice.
-- * @peak_rate: peak transfer rate observed for a budget.
-- * @peak_rate_samples: number of samples used to calculate @peak_rate.
-- * @bfq_max_budget: maximum budget allotted to a bfq_queue before
-- *                  rescheduling.
-- * @active_list: list of all the bfq_queues active on the device.
-- * @idle_list: list of all the bfq_queues idle on the device.
-- * @bfq_fifo_expire: timeout for async/sync requests; when it expires
-- *                   requests are served in fifo order.
-- * @bfq_back_penalty: weight of backward seeks wrt forward ones.
-- * @bfq_back_max: maximum allowed backward seek.
-- * @bfq_slice_idle: maximum idling time.
-- * @bfq_user_max_budget: user-configured max budget value
-- *                       (0 for auto-tuning).
-- * @bfq_max_budget_async_rq: maximum budget (in nr of requests) allotted to
-- *                           async queues.
-- * @bfq_timeout: timeout for bfq_queues to consume their budget; used to
-- *               to prevent seeky queues to impose long latencies to well
-- *               behaved ones (this also implies that seeky queues cannot
-- *               receive guarantees in the service domain; after a timeout
-- *               they are charged for the whole allocated budget, to try
-- *               to preserve a behavior reasonably fair among them, but
-- *               without service-domain guarantees).
-- * @bfq_coop_thresh: number of queue merges after which a @bfq_queue is
-- *                   no more granted any weight-raising.
-- * @bfq_failed_cooperations: number of consecutive failed cooperation
-- *                           chances after which weight-raising is restored
-- *                           to a queue subject to more than bfq_coop_thresh
-- *                           queue merges.
-- * @bfq_requests_within_timer: number of consecutive requests that must be
-- *                             issued within the idle time slice to set
-- *                             again idling to a queue which was marked as
-- *                             non-I/O-bound (see the definition of the
-- *                             IO_bound flag for further details).
-- * @last_ins_in_burst: last time at which a queue entered the current
-- *                     burst of queues being activated shortly after
-- *                     each other; for more details about this and the
-- *                     following parameters related to a burst of
-- *                     activations, see the comments to the function
-- *                     @bfq_handle_burst.
-- * @bfq_burst_interval: reference time interval used to decide whether a
-- *                      queue has been activated shortly after
-- *                      @last_ins_in_burst.
-- * @burst_size: number of queues in the current burst of queue activations.
-- * @bfq_large_burst_thresh: maximum burst size above which the current
-- *			    queue-activation burst is deemed as 'large'.
-- * @large_burst: true if a large queue-activation burst is in progress.
-- * @burst_list: head of the burst list (as for the above fields, more details
-- *		in the comments to the function bfq_handle_burst).
-- * @low_latency: if set to true, low-latency heuristics are enabled.
-- * @bfq_wr_coeff: maximum factor by which the weight of a weight-raised
-- *                queue is multiplied.
-- * @bfq_wr_max_time: maximum duration of a weight-raising period (jiffies).
-- * @bfq_wr_rt_max_time: maximum duration for soft real-time processes.
-- * @bfq_wr_min_idle_time: minimum idle period after which weight-raising
-- *			  may be reactivated for a queue (in jiffies).
-- * @bfq_wr_min_inter_arr_async: minimum period between request arrivals
-- *				after which weight-raising may be
-- *				reactivated for an already busy queue
-- *				(in jiffies).
-- * @bfq_wr_max_softrt_rate: max service-rate for a soft real-time queue,
-- *			    sectors per seconds.
-- * @RT_prod: cached value of the product R*T used for computing the maximum
-- *	     duration of the weight raising automatically.
-- * @device_speed: device-speed class for the low-latency heuristic.
-- * @oom_bfqq: fallback dummy bfqq for extreme OOM conditions.
-+ * struct bfq_data - per-device data structure.
-  *
-  * All the fields are protected by the @queue lock.
-  */
- struct bfq_data {
-+	/* request queue for the device */
- 	struct request_queue *queue;
- 
-+	/* root bfq_group for the device */
- 	struct bfq_group *root_group;
- 
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
--	int active_numerous_groups;
--#endif
--
-+	/*
-+	 * rbtree of weight counters of @bfq_queues, sorted by
-+	 * weight. Used to keep track of whether all @bfq_queues have
-+	 * the same weight. The tree contains one counter for each
-+	 * distinct weight associated to some active and not
-+	 * weight-raised @bfq_queue (see the comments to the functions
-+	 * bfq_weights_tree_[add|remove] for further details).
-+	 */
- 	struct rb_root queue_weights_tree;
-+	/*
-+	 * rbtree of non-queue @bfq_entity weight counters, sorted by
-+	 * weight. Used to keep track of whether all @bfq_groups have
-+	 * the same weight. The tree contains one counter for each
-+	 * distinct weight associated to some active @bfq_group (see
-+	 * the comments to the functions bfq_weights_tree_[add|remove]
-+	 * for further details).
-+	 */
- 	struct rb_root group_weights_tree;
- 
-+	/*
-+	 * Number of bfq_queues containing requests (including the
-+	 * queue in service, even if it is idling).
-+	 */
- 	int busy_queues;
--	int busy_in_flight_queues;
--	int const_seeky_busy_in_flight_queues;
-+	/* number of weight-raised busy @bfq_queues */
- 	int wr_busy_queues;
-+	/* number of queued requests */
- 	int queued;
-+	/* number of requests dispatched and waiting for completion */
- 	int rq_in_driver;
--	int sync_flight;
- 
-+	/*
-+	 * Maximum number of requests in driver in the last
-+	 * @hw_tag_samples completed requests.
-+	 */
- 	int max_rq_in_driver;
-+	/* number of samples used to calculate hw_tag */
- 	int hw_tag_samples;
-+	/* flag set to one if the driver is showing a queueing behavior */
- 	int hw_tag;
- 
-+	/* number of budgets assigned */
- 	int budgets_assigned;
- 
--	struct timer_list idle_slice_timer;
-+	/*
-+	 * Timer set when idling (waiting) for the next request from
-+	 * the queue in service.
-+	 */
-+	struct hrtimer idle_slice_timer;
-+	/* delayed work to restart dispatching on the request queue */
- 	struct work_struct unplug_work;
- 
-+	/* bfq_queue in service */
- 	struct bfq_queue *in_service_queue;
-+	/* bfq_io_cq (bic) associated with the @in_service_queue */
- 	struct bfq_io_cq *in_service_bic;
- 
-+	/* on-disk position of the last served request */
- 	sector_t last_position;
- 
-+	/* time of last request completion (ns) */
-+	u64 last_completion;
-+
-+	/* time of first rq dispatch in current observation interval (ns) */
-+	u64 first_dispatch;
-+	/* time of last rq dispatch in current observation interval (ns) */
-+	u64 last_dispatch;
-+
-+	/* beginning of the last budget */
- 	ktime_t last_budget_start;
-+	/* beginning of the last idle slice */
- 	ktime_t last_idling_start;
-+
-+	/* number of samples in current observation interval */
- 	int peak_rate_samples;
--	u64 peak_rate;
-+	/* num of samples of seq dispatches in current observation interval */
-+	u32 sequential_samples;
-+	/* total num of sectors transferred in current observation interval */
-+	u64 tot_sectors_dispatched;
-+	/* max rq size seen during current observation interval (sectors) */
-+	u32 last_rq_max_size;
-+	/* time elapsed from first dispatch in current observ. interval (us) */
-+	u64 delta_from_first;
-+	/* current estimate of device peak rate */
-+	u32 peak_rate;
-+
-+	/* maximum budget allotted to a bfq_queue before rescheduling */
- 	int bfq_max_budget;
- 
-+	/* list of all the bfq_queues active on the device */
- 	struct list_head active_list;
-+	/* list of all the bfq_queues idle on the device */
- 	struct list_head idle_list;
- 
--	unsigned int bfq_fifo_expire[2];
-+	/*
-+	 * Timeout for async/sync requests; when it fires, requests
-+	 * are served in fifo order.
-+	 */
-+	u64 bfq_fifo_expire[2];
-+	/* weight of backward seeks wrt forward ones */
- 	unsigned int bfq_back_penalty;
-+	/* maximum allowed backward seek */
- 	unsigned int bfq_back_max;
--	unsigned int bfq_slice_idle;
-+	/* maximum idling time */
-+	u32 bfq_slice_idle;
-+	/* last time CLASS_IDLE was served */
- 	u64 bfq_class_idle_last_service;
- 
-+	/* user-configured max budget value (0 for auto-tuning) */
- 	int bfq_user_max_budget;
--	int bfq_max_budget_async_rq;
--	unsigned int bfq_timeout[2];
--
--	unsigned int bfq_coop_thresh;
--	unsigned int bfq_failed_cooperations;
-+	/*
-+	 * Timeout for bfq_queues to consume their budget; used to
-+	 * prevent seeky queues from imposing long latencies to
-+	 * sequential or quasi-sequential ones (this also implies that
-+	 * seeky queues cannot receive guarantees in the service
-+	 * domain; after a timeout they are charged for the time they
-+	 * have been in service, to preserve fairness among them, but
-+	 * without service-domain guarantees).
-+	 */
-+	unsigned int bfq_timeout;
-+
-+	/*
-+	 * Number of consecutive requests that must be issued within
-+	 * the idle time slice to set again idling to a queue which
-+	 * was marked as non-I/O-bound (see the definition of the
-+	 * IO_bound flag for further details).
-+	 */
- 	unsigned int bfq_requests_within_timer;
- 
-+	/*
-+	 * Force device idling whenever needed to provide accurate
-+	 * service guarantees, without caring about throughput
-+	 * issues. CAVEAT: this may even increase latencies, in case
-+	 * of useless idling for processes that did stop doing I/O.
-+	 */
-+	bool strict_guarantees;
-+
-+	/*
-+	 * Last time at which a queue entered the current burst of
-+	 * queues being activated shortly after each other; for more
-+	 * details about this and the following parameters related to
-+	 * a burst of activations, see the comments on the function
-+	 * bfq_handle_burst.
-+	 */
- 	unsigned long last_ins_in_burst;
-+	/*
-+	 * Reference time interval used to decide whether a queue has
-+	 * been activated shortly after @last_ins_in_burst.
-+	 */
- 	unsigned long bfq_burst_interval;
-+	/* number of queues in the current burst of queue activations */
- 	int burst_size;
-+
-+	/* common parent entity for the queues in the burst */
-+	struct bfq_entity *burst_parent_entity;
-+	/* Maximum burst size above which the current queue-activation
-+	 * burst is deemed as 'large'.
-+	 */
- 	unsigned long bfq_large_burst_thresh;
-+	/* true if a large queue-activation burst is in progress */
- 	bool large_burst;
-+	/*
-+	 * Head of the burst list (as for the above fields, more
-+	 * details in the comments on the function bfq_handle_burst).
-+	 */
- 	struct hlist_head burst_list;
- 
-+	/* if set to true, low-latency heuristics are enabled */
- 	bool low_latency;
--
--	/* parameters of the low_latency heuristics */
-+	/*
-+	 * Maximum factor by which the weight of a weight-raised queue
-+	 * is multiplied.
-+	 */
- 	unsigned int bfq_wr_coeff;
-+	/* maximum duration of a weight-raising period (jiffies) */
- 	unsigned int bfq_wr_max_time;
-+
-+	/* Maximum weight-raising duration for soft real-time processes */
- 	unsigned int bfq_wr_rt_max_time;
-+	/*
-+	 * Minimum idle period after which weight-raising may be
-+	 * reactivated for a queue (in jiffies).
-+	 */
- 	unsigned int bfq_wr_min_idle_time;
-+	/*
-+	 * Minimum period between request arrivals after which
-+	 * weight-raising may be reactivated for an already busy async
-+	 * queue (in jiffies).
-+	 */
- 	unsigned long bfq_wr_min_inter_arr_async;
-+
-+	/* Max service-rate for a soft real-time queue, in sectors/sec */
- 	unsigned int bfq_wr_max_softrt_rate;
-+	/*
-+	 * Cached value of the product R*T, used for computing the
-+	 * maximum duration of weight raising automatically.
-+	 */
- 	u64 RT_prod;
-+	/* device-speed class for the low-latency heuristic */
- 	enum bfq_device_speed device_speed;
- 
-+	/* fallback dummy bfqq for extreme OOM conditions */
- 	struct bfq_queue oom_bfqq;
- };
- 
- enum bfqq_state_flags {
--	BFQ_BFQQ_FLAG_busy = 0,		/* has requests or is in service */
-+	BFQ_BFQQ_FLAG_just_created = 0,	/* queue just allocated */
-+	BFQ_BFQQ_FLAG_busy,		/* has requests or is in service */
- 	BFQ_BFQQ_FLAG_wait_request,	/* waiting for a request */
-+	BFQ_BFQQ_FLAG_non_blocking_wait_rq, /*
-+					     * waiting for a request
-+					     * without idling the device
-+					     */
- 	BFQ_BFQQ_FLAG_must_alloc,	/* must be allowed rq alloc */
- 	BFQ_BFQQ_FLAG_fifo_expire,	/* FIFO checked in this slice */
- 	BFQ_BFQQ_FLAG_idle_window,	/* slice idling enabled */
- 	BFQ_BFQQ_FLAG_sync,		/* synchronous queue */
--	BFQ_BFQQ_FLAG_budget_new,	/* no completion with this budget */
- 	BFQ_BFQQ_FLAG_IO_bound,		/*
- 					 * bfqq has timed-out at least once
- 					 * having consumed at most 2/10 of
-@@ -581,17 +608,12 @@ enum bfqq_state_flags {
- 					 * bfqq activated in a large burst,
- 					 * see comments to bfq_handle_burst.
- 					 */
--	BFQ_BFQQ_FLAG_constantly_seeky,	/*
--					 * bfqq has proved to be slow and
--					 * seeky until budget timeout
--					 */
- 	BFQ_BFQQ_FLAG_softrt_update,	/*
- 					 * may need softrt-next-start
- 					 * update
- 					 */
- 	BFQ_BFQQ_FLAG_coop,		/* bfqq is shared */
--	BFQ_BFQQ_FLAG_split_coop,	/* shared bfqq will be split */
--	BFQ_BFQQ_FLAG_just_split,	/* queue has just been split */
-+	BFQ_BFQQ_FLAG_split_coop	/* shared bfqq will be split */
- };
- 
- #define BFQ_BFQQ_FNS(name)						\
-@@ -608,25 +630,53 @@ static int bfq_bfqq_##name(const struct bfq_queue *bfqq)		\
- 	return ((bfqq)->flags & (1 << BFQ_BFQQ_FLAG_##name)) != 0;	\
- }
- 
-+BFQ_BFQQ_FNS(just_created);
- BFQ_BFQQ_FNS(busy);
- BFQ_BFQQ_FNS(wait_request);
-+BFQ_BFQQ_FNS(non_blocking_wait_rq);
- BFQ_BFQQ_FNS(must_alloc);
- BFQ_BFQQ_FNS(fifo_expire);
- BFQ_BFQQ_FNS(idle_window);
- BFQ_BFQQ_FNS(sync);
--BFQ_BFQQ_FNS(budget_new);
- BFQ_BFQQ_FNS(IO_bound);
- BFQ_BFQQ_FNS(in_large_burst);
--BFQ_BFQQ_FNS(constantly_seeky);
- BFQ_BFQQ_FNS(coop);
- BFQ_BFQQ_FNS(split_coop);
--BFQ_BFQQ_FNS(just_split);
- BFQ_BFQQ_FNS(softrt_update);
- #undef BFQ_BFQQ_FNS
- 
- /* Logging facilities. */
--#define bfq_log_bfqq(bfqd, bfqq, fmt, args...) \
--	blk_add_trace_msg((bfqd)->queue, "bfq%d " fmt, (bfqq)->pid, ##args)
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+static struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
-+static struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg);
-+
-+#define bfq_log_bfqq(bfqd, bfqq, fmt, args...)	do {			\
-+	char __pbuf[128];						\
-+									\
-+	assert_spin_locked((bfqd)->queue->queue_lock);			\
-+	blkg_path(bfqg_to_blkg(bfqq_group(bfqq)), __pbuf, sizeof(__pbuf)); \
-+	blk_add_trace_msg((bfqd)->queue, "bfq%d%c %s " fmt, \
-+			  (bfqq)->pid,			  \
-+			  bfq_bfqq_sync((bfqq)) ? 'S' : 'A',	\
-+			  __pbuf, ##args);				\
-+} while (0)
-+
-+#define bfq_log_bfqg(bfqd, bfqg, fmt, args...)	do {			\
-+	char __pbuf[128];						\
-+									\
-+	blkg_path(bfqg_to_blkg(bfqg), __pbuf, sizeof(__pbuf));		\
-+	blk_add_trace_msg((bfqd)->queue, "%s " fmt, __pbuf, ##args);	\
-+} while (0)
-+
-+#else /* CONFIG_BFQ_GROUP_IOSCHED */
-+
-+#define bfq_log_bfqq(bfqd, bfqq, fmt, args...)	\
-+	blk_add_trace_msg((bfqd)->queue, "bfq%d%c " fmt, (bfqq)->pid,	\
-+			bfq_bfqq_sync((bfqq)) ? 'S' : 'A',		\
-+				##args)
-+#define bfq_log_bfqg(bfqd, bfqg, fmt, args...)		do {} while (0)
-+
-+#endif /* CONFIG_BFQ_GROUP_IOSCHED */
- 
- #define bfq_log(bfqd, fmt, args...) \
- 	blk_add_trace_msg((bfqd)->queue, "bfq " fmt, ##args)
-@@ -640,15 +690,12 @@ enum bfqq_expiration {
- 	BFQ_BFQQ_BUDGET_TIMEOUT,	/* budget took too long to be used */
- 	BFQ_BFQQ_BUDGET_EXHAUSTED,	/* budget consumed */
- 	BFQ_BFQQ_NO_MORE_REQUESTS,	/* the queue has no more requests */
-+	BFQ_BFQQ_PREEMPTED		/* preemption in progress */
- };
- 
--#ifdef CONFIG_BFQ_GROUP_IOSCHED
- 
- struct bfqg_stats {
--	/* total bytes transferred */
--	struct blkg_rwstat		service_bytes;
--	/* total IOs serviced, post merge */
--	struct blkg_rwstat		serviced;
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	/* number of ios merged */
- 	struct blkg_rwstat		merged;
- 	/* total time spent on device in ns, may not be accurate w/ queueing */
-@@ -657,12 +704,8 @@ struct bfqg_stats {
- 	struct blkg_rwstat		wait_time;
- 	/* number of IOs queued up */
- 	struct blkg_rwstat		queued;
--	/* total sectors transferred */
--	struct blkg_stat		sectors;
- 	/* total disk time and nr sectors dispatched by this group */
- 	struct blkg_stat		time;
--	/* time not charged to this cgroup */
--	struct blkg_stat		unaccounted_time;
- 	/* sum of number of ios queued across all samples */
- 	struct blkg_stat		avg_queue_size_sum;
- 	/* count of samples taken for average */
-@@ -680,8 +723,10 @@ struct bfqg_stats {
- 	uint64_t			start_idle_time;
- 	uint64_t			start_empty_time;
- 	uint16_t			flags;
-+#endif
- };
- 
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
- /*
-  * struct bfq_group_data - per-blkcg storage for the blkio subsystem.
-  *
-@@ -692,7 +737,7 @@ struct bfq_group_data {
- 	/* must be the first member */
- 	struct blkcg_policy_data pd;
- 
--	unsigned short weight;
-+	unsigned int weight;
- };
- 
- /**
-@@ -712,7 +757,7 @@ struct bfq_group_data {
-  *                   unused for the root group. Used to know whether there
-  *                   are groups with more than one active @bfq_entity
-  *                   (see the comments to the function
-- *                   bfq_bfqq_must_not_expire()).
-+ *                   bfq_bfqq_may_idle()).
-  * @rq_pos_tree: rbtree sorted by next_request position, used when
-  *               determining if two or more queues have interleaving
-  *               requests (see bfq_find_close_cooperator()).
-@@ -745,7 +790,6 @@ struct bfq_group {
- 	struct rb_root rq_pos_tree;
- 
- 	struct bfqg_stats stats;
--	struct bfqg_stats dead_stats;	/* stats pushed from dead children */
- };
- 
- #else
-@@ -767,11 +811,25 @@ bfq_entity_service_tree(struct bfq_entity *entity)
- 	struct bfq_sched_data *sched_data = entity->sched_data;
- 	struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity);
- 	unsigned int idx = bfqq ? bfqq->ioprio_class - 1 :
--				  BFQ_DEFAULT_GRP_CLASS;
-+				  BFQ_DEFAULT_GRP_CLASS - 1;
- 
- 	BUG_ON(idx >= BFQ_IOPRIO_CLASSES);
- 	BUG_ON(sched_data == NULL);
- 
-+	if (bfqq)
-+		bfq_log_bfqq(bfqq->bfqd, bfqq,
-+			     "entity_service_tree %p %d",
-+			     sched_data->service_tree + idx, idx);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
-+	else {
-+		struct bfq_group *bfqg =
-+			container_of(entity, struct bfq_group, entity);
-+
-+		bfq_log_bfqg((struct bfq_data *)bfqg->bfqd, bfqg,
-+			     "entity_service_tree %p %d",
-+			     sched_data->service_tree + idx, idx);
-+	}
-+#endif
- 	return sched_data->service_tree + idx;
- }
- 
-@@ -791,47 +849,6 @@ static struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic)
- 	return bic->icq.q->elevator->elevator_data;
- }
- 
--/**
-- * bfq_get_bfqd_locked - get a lock to a bfqd using a RCU protected pointer.
-- * @ptr: a pointer to a bfqd.
-- * @flags: storage for the flags to be saved.
-- *
-- * This function allows bfqg->bfqd to be protected by the
-- * queue lock of the bfqd they reference; the pointer is dereferenced
-- * under RCU, so the storage for bfqd is assured to be safe as long
-- * as the RCU read side critical section does not end.  After the
-- * bfqd->queue->queue_lock is taken the pointer is rechecked, to be
-- * sure that no other writer accessed it.  If we raced with a writer,
-- * the function returns NULL, with the queue unlocked, otherwise it
-- * returns the dereferenced pointer, with the queue locked.
-- */
--static struct bfq_data *bfq_get_bfqd_locked(void **ptr, unsigned long *flags)
--{
--	struct bfq_data *bfqd;
--
--	rcu_read_lock();
--	bfqd = rcu_dereference(*(struct bfq_data **)ptr);
--
--	if (bfqd != NULL) {
--		spin_lock_irqsave(bfqd->queue->queue_lock, *flags);
--		if (ptr == NULL)
--			printk(KERN_CRIT "get_bfqd_locked pointer NULL\n");
--		else if (*ptr == bfqd)
--			goto out;
--		spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
--	}
--
--	bfqd = NULL;
--out:
--	rcu_read_unlock();
--	return bfqd;
--}
--
--static void bfq_put_bfqd_unlock(struct bfq_data *bfqd, unsigned long *flags)
--{
--	spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags);
--}
--
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 
- static struct bfq_group *bfq_bfqq_to_bfqg(struct bfq_queue *bfqq)
-@@ -857,11 +874,13 @@ static void bfq_check_ioprio_change(struct bfq_io_cq *bic, struct bio *bio);
- static void bfq_put_queue(struct bfq_queue *bfqq);
- static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
- static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd,
--				       struct bio *bio, int is_sync,
--				       struct bfq_io_cq *bic, gfp_t gfp_mask);
-+				       struct bio *bio, bool is_sync,
-+				       struct bfq_io_cq *bic);
- static void bfq_end_wr_async_queues(struct bfq_data *bfqd,
- 				    struct bfq_group *bfqg);
-+#ifdef CONFIG_BFQ_GROUP_IOSCHED
- static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg);
-+#endif
- static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq);
- 
- #endif /* _BFQ_H */
--- 
-2.7.4 (Apple Git-66)
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/10-calculate-x86-4.8 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/10-calculate-x86-4.8
deleted file mode 100644
index bd9ce1a39..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/10-calculate-x86-4.8
+++ /dev/null
@@ -1,3568 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==i686
-CONFIG_3C515=m
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_ALS=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_IPMI is not set
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-# CONFIG_AFE4404 is not set
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-# CONFIG_ALIENWARE_WMI is not set
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AM2315=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-CONFIG_APM_ALLOW_INTS=y
-CONFIG_APM_CPU_IDLE=y
-CONFIG_APM_DISPLAY_BLANK=y
-CONFIG_APM_DO_ENABLE=y
-CONFIG_APM_IGNORE_USER_SUSPEND=y
-CONFIG_APM=m
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASN1=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_HWRNG=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_COMMON=m
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-# CONFIG_ATLAS_PH_SENSOR is not set
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_AURORA_NB8800=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=m
-# CONFIG_AXP288_CHARGER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_B53=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATTERY_DA9150 is not set
-# CONFIG_BATTERY_RT5033 is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMGENET=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BINFMT_AOUT=y
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-# CONFIG_BLK_DEV_NVME_SCSI is not set
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_LEDS=y
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_RTL=m
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHARGER_ISP1704=m
-# CONFIG_CHARGER_MAX14577 is not set
-# CONFIG_CHARGER_MAX77693 is not set
-CONFIG_CHELSIO_LIB=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_SMB311=y
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_UPCALL=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLZ_TAB=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_NXP is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DH=m
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_ECHAINIV=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_KPP=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CS89x0=m
-CONFIG_CS89x0_PLATFORM=y
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-# CONFIG_DA9062_WATCHDOG is not set
-# CONFIG_DA9063_WATCHDOG is not set
-# CONFIG_DA9150_GPADC is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_AMD_ACP=y
-CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_AMD_POWERPLAY=y
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_DP_AUX_CHARDEV=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DS1803 is not set
-# CONFIG_DTLK is not set
-CONFIG_DUMMY=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_B2C2_FLEXCOP=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_DVB_PLL=m
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_TC90522=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EBC_C384_WDT=m
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_FAKE_MEMMAP=y
-CONFIG_EFI_MAX_FAKE_MEM=8
-CONFIG_EFI_PGT_DUMP=y
-CONFIG_EFI_STUB=y
-# CONFIG_EFI_VARS is not set
-CONFIG_EISA_NAMES=y
-CONFIG_EISA_PCI_EISA=y
-CONFIG_EISA_VIRTUAL_ROOT=y
-# CONFIG_EISA_VLB_PRIMING is not set
-CONFIG_EISA=y
-CONFIG_EL3=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_AXP288=m
-CONFIG_EXTCON=m
-CONFIG_EXTCON_MAX14577=m
-CONFIG_EXTCON_MAX77693=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-# CONFIG_FB_EFI is not set
-# CONFIG_FB_SM750 is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_ENCRYPTION=m
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FTRACE is not set
-CONFIG_FUJITSU_ES=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
-CONFIG_FW_CFG_SYSFS=m
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_GENERIC_PHY=y
-# CONFIG_GENEVE is not set
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_GTP=m
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-# CONFIG_HDC100X is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CORSAIR=y
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GENERIC=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-# CONFIG_HIGHPTE is not set
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HP03 is not set
-CONFIG_HP100=m
-# CONFIG_HP206C is not set
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_EG20T=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-# CONFIG_I2C_PCA_ISA is not set
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_I82092=m
-# CONFIG_I82365 is not set
-CONFIG_I8K=m
-# CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_CONFIGFS=m
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_HRTIMER_TRIGGER is not set
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-CONFIG_IIO_SW_DEVICE=m
-CONFIG_IIO_SW_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-# CONFIG_INA2XX_ADC is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_88PM80X_ONKEY=m
-# CONFIG_INPUT_AXP20X_PEK is not set
-CONFIG_INPUT_BMA150=m
-# CONFIG_INPUT_DA9063_ONKEY is not set
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT3406_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_IDLE=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MEI_WDT=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_INTEL_PMC_CORE=y
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INTEL_VBTN=m
-CONFIG_INTEL_XWAY_PHY=m
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=y
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_ILA=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_IRQ_POLL=y
-CONFIG_ISA_BUS_API=y
-CONFIG_ISAPNP=y
-CONFIG_ISA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-CONFIG_IWLWIFI_PCIE_RTPM=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_XZ=y
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-# CONFIG_KS7010 is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_ASYNC_PF=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-CONFIG_LANCE=m
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-# CONFIG_LGUEST_GUEST is not set
-CONFIG_LGUEST=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_LLC=m
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-# CONFIG_LNET_SELFTEST is not set
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-# CONFIG_M62332 is not set
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACSEC=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX517 is not set
-CONFIG_MAX63XX_WATCHDOG=m
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_88PM800=m
-CONFIG_MFD_88PM805=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DA9062=m
-CONFIG_MFD_DA9063=m
-CONFIG_MFD_DA9150=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_MAX14577=m
-CONFIG_MFD_MAX77693=m
-CONFIG_MFD_MAX8907=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RT5033=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TPS65086=m
-CONFIG_MFD_TPS65912_I2C=m
-CONFIG_MFD_TPS65912=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIXCOMWD is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-# CONFIG_MLX90614 is not set
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SWITCHX2=m
-# CONFIG_MMA7455_I2C is not set
-CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC35240=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_MTK=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MOST is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_MPILIB=m
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MT7601U=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_NET_VRF=m
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_SCSILAYOUT is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NI65=m
-CONFIG_NI903X_WDT=m
-CONFIG_NILFS2_FS=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-CONFIG_NVM_DEBUG=y
-CONFIG_NVME_CORE=y
-# CONFIG_NVME_TARGET is not set
-CONFIG_NVM_GENNVM=m
-CONFIG_NVM_RRPC=m
-CONFIG_NVM=y
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-# CONFIG_OPT3001 is not set
-CONFIG_ORANGEFS_FS=m
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-# CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
-CONFIG_PACKET=m
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_ISAPNP is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_QDI is not set
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-# CONFIG_PATA_WINBOND_VLB is not set
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCH_DMA=m
-CONFIG_PCH_GBE=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCI_ATS=y
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-CONFIG_PCI_IOV=y
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-# CONFIG_PCWATCHDOG is not set
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_PHY_TUSB1210=m
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_PM_TRACE_RTC is not set
-# CONFIG_PNPBIOS is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PVPANIC=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-CONFIG_QEDE=m
-CONFIG_QED=m
-CONFIG_QED_SRIOV=y
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUEUED_LOCK_STAT is not set
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_R8723AU=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPR0521 is not set
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_DRV_88PM80X=m
-# CONFIG_RTC_DRV_DA9063 is not set
-CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_I2C_AND_SPI=m
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-# CONFIG_SATA_DWC_DEBUG is not set
-CONFIG_SATA_DWC=m
-# CONFIG_SATA_DWC_OLD_DMA is not set
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC7240_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-# CONFIG_SCSI_DTC3280 is not set
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IN2000 is not set
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_SNIC=m
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-# CONFIG_SCSI_SYM53C416 is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-CONFIG_SCSI_UFS_DWC_TC_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SCx200_ACB=m
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMC9194=m
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_AD1889=m
-CONFIG_SND_ADLIB=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_MSND_PINNACLE=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SC6000=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_SSCAPE=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STK3310=m
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-# CONFIG_STX104 is not set
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-# CONFIG_SUNXI_CCU is not set
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SWPHY=y
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
-CONFIG_TAHVO_USB=m
-CONFIG_TC1100_WMI=m
-# CONFIG_TCIC is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADS1015 is not set
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TI_SYSCON_RESET=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA=m
-CONFIG_TOSHIBA_WMI=m
-# CONFIG_TPL0102 is not set
-CONFIG_TRIM_UNUSED_KSYMS=y
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-CONFIG_TTPCI_EEPROM=m
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TUN_VNET_CROSS_LE=y
-CONFIG_TYPHOON=m
-CONFIG_UCSI=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_ULTRA=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_US5182D is not set
-CONFIG_USB_ACM=m
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-CONFIG_USB_FUSB300=m
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-CONFIG_USB_HACKRF=m
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSO=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USERIO=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VEML6070 is not set
-CONFIG_VETH=m
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW686X=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-# CONFIG_VZ89X is not set
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WD80x3=m
-# CONFIG_WDT is not set
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-# CONFIG_WILC1000_HW_OOB_INTR is not set
-CONFIG_WILC1000=m
-CONFIG_WILC1000_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_X86_APM_BOOT=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_CPUID=m
-CONFIG_X86_E_POWERSAVER=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_PTDUMP_CORE=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_Z3FOLD=y
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_ZPOOL=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_CPU_HOTPLUG_STATE_CONTROL=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_ENTRY=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_HIGHMEM=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PAGE_REF=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WQ_FORCE_RR_CPU=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_DRM_I810=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EFI_BOOTLOADER_CONTROL=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT2=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HIST_TRIGGERS=
-!CONFIG_HPET_MMAP=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MCE_AMD_INJ=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MMIOTRACE=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_EQS_DEBUG=
-!CONFIG_RCU_PERF_TEST=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_LOADPIN=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_FSL=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_STATIC_KEYS_SELFTEST=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_CDG=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_NV=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_EGALAX_SERIAL=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MELFAS_MIP4=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_PROPERTIES=
-!CONFIG_TOUCHSCREEN_ROHM_BU21023=
-!CONFIG_TOUCHSCREEN_SILEAD=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2004=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TOUCHSCREEN_WDT87XX_I2C=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_WQ_WATCHDOG=
-!CONFIG_X86_32_NON_STANDARD=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_FPU=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_INTEL_MID=
-!CONFIG_X86_INTEL_QUARK=
-!CONFIG_X86_INTEL_USERCOPY=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_RDC321X=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/10-calculate-x86_64-4.8 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/10-calculate-x86_64-4.8
deleted file mode 100644
index c828a38dc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/10-calculate-x86_64-4.8
+++ /dev/null
@@ -1,3456 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==x86_64
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_ALS=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-# CONFIG_AFE4404 is not set
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AM2315=m
-CONFIG_AMD8111_ETH=m
-# CONFIG_AMD_IOMMU is not set
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASN1=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_HWRNG=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_COMMON=m
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-# CONFIG_ATLAS_PH_SENSOR is not set
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_AURORA_NB8800=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=m
-# CONFIG_AXP288_CHARGER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_B53=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATTERY_DA9150 is not set
-# CONFIG_BATTERY_RT5033 is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMGENET=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-# CONFIG_BLK_DEV_NVME_SCSI is not set
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_LEDS=y
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_RTL=m
-CONFIG_BTT=y
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHARGER_ISP1704=m
-# CONFIG_CHARGER_MAX14577 is not set
-# CONFIG_CHARGER_MAX77693 is not set
-CONFIG_CHELSIO_LIB=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_SMB311=y
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_UPCALL=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLZ_TAB=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_NXP is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DH=m
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_ECHAINIV=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_KPP=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA1_MB=m
-CONFIG_CRYPTO_SHA256_MB=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_SHA512_MB=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-# CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-# CONFIG_DA9062_WATCHDOG is not set
-# CONFIG_DA9063_WATCHDOG is not set
-# CONFIG_DA9150_GPADC is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCA=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-# CONFIG_DEVFREQ_GOV_USERSPACE is not set
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_AMD_ACP=y
-CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_AMD_POWERPLAY=y
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_DP_AUX_CHARDEV=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DS1803 is not set
-CONFIG_DUMMY=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_B2C2_FLEXCOP=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_DVB_PLL=m
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_TC90522=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_FAKE_MEMMAP=y
-CONFIG_EFI_MAX_FAKE_MEM=8
-CONFIG_EFI_MIXED=y
-CONFIG_EFI_PGT_DUMP=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_VARS=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_AXP288=m
-CONFIG_EXTCON=m
-CONFIG_EXTCON_MAX14577=m
-CONFIG_EXTCON_MAX77693=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-# CONFIG_FB_SM750 is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_FRAME_WARN=1024
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_ENCRYPTION=m
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FTRACE is not set
-CONFIG_FUJITSU_ES=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
-CONFIG_FW_CFG_SYSFS=m
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-CONFIG_GART_IOMMU=y
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_GENERIC_PHY=y
-CONFIG_GENEVE=m
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_GTP=m
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-# CONFIG_HDC100X is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CORSAIR=y
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HP03 is not set
-CONFIG_HP100=m
-# CONFIG_HP206C is not set
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-CONFIG_I82092=m
-CONFIG_I8K=m
-# CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_CONFIGFS=m
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_HRTIMER_TRIGGER is not set
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-CONFIG_IIO_SW_DEVICE=m
-CONFIG_IIO_SW_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-# CONFIG_INA2XX_ADC is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_88PM80X_ONKEY=m
-# CONFIG_INPUT_AXP20X_PEK is not set
-CONFIG_INPUT_BMA150=m
-# CONFIG_INPUT_DA9063_ONKEY is not set
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT3406_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_IDLE=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IOATDMA=m
-# CONFIG_INTEL_IOMMU is not set
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MEI_WDT=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_MIC_BUS=m
-# CONFIG_INTEL_MIC_X100_DMA is not set
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_INTEL_PMC_CORE=y
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INTEL_TELEMETRY=m
-CONFIG_INTEL_VBTN=m
-CONFIG_INTEL_XWAY_PHY=m
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=y
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_ILA=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_IRQ_POLL=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-CONFIG_IWLWIFI_PCIE_RTPM=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_XZ=y
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-# CONFIG_KS7010 is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_KVM_COMPAT=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-CONFIG_LIBNVDIMM=y
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_LIQUIDIO=m
-CONFIG_LLC=m
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-# CONFIG_LNET_SELFTEST is not set
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-# CONFIG_M62332 is not set
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACSEC=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX517 is not set
-CONFIG_MAX63XX_WATCHDOG=m
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_88PM800=m
-CONFIG_MFD_88PM805=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DA9062=m
-CONFIG_MFD_DA9063=m
-CONFIG_MFD_DA9150=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_MAX14577=m
-CONFIG_MFD_MAX77693=m
-CONFIG_MFD_MAX8907=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RT5033=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TPS65086=m
-CONFIG_MFD_TPS65912_I2C=m
-CONFIG_MFD_TPS65912=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-# CONFIG_MLX90614 is not set
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SWITCHX2=m
-# CONFIG_MMA7455_I2C is not set
-CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC35240=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_MTK=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MOST is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_MPILIB=m
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MT7601U=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_ND_BLK=m
-CONFIG_ND_BTT=m
-CONFIG_ND_CLAIM=y
-CONFIG_NE2K_PCI=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VRF=m
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_SCSILAYOUT is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NI903X_WDT=m
-CONFIG_NILFS2_FS=m
-CONFIG_NIU=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-# CONFIG_NO_HZ is not set
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-# CONFIG_NTP_PPS is not set
-# CONFIG_NUMA is not set
-CONFIG_NVM_DEBUG=y
-CONFIG_NVME_CORE=y
-# CONFIG_NVME_TARGET is not set
-CONFIG_NVM_GENNVM=m
-CONFIG_NVM_RRPC=m
-CONFIG_NVM=y
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-# CONFIG_OPT3001 is not set
-CONFIG_ORANGEFS_FS=m
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-# CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-CONFIG_PCI_IOV=y
-# CONFIG_PCI_PASID is not set
-CONFIG_PCIPCWATCHDOG=m
-# CONFIG_PCI_PRI is not set
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_PHY_TUSB1210=m
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PVPANIC=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-CONFIG_QEDE=m
-CONFIG_QED=m
-CONFIG_QED_SRIOV=y
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUEUED_LOCK_STAT is not set
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_R8723AU=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPR0521 is not set
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_DRV_88PM80X=m
-# CONFIG_RTC_DRV_DA9063 is not set
-CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_I2C_AND_SPI=m
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-# CONFIG_SATA_DWC_DEBUG is not set
-CONFIG_SATA_DWC=m
-# CONFIG_SATA_DWC_OLD_DMA is not set
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_SNIC=m
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_UFS_DWC_TC_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB_COMMON=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SONICVIBES=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STK3310=m
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-# CONFIG_SUNXI_CCU is not set
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SWPHY=y
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
-CONFIG_TAHVO_USB=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADS1015 is not set
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TI_SYSCON_RESET=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-# CONFIG_TPL0102 is not set
-CONFIG_TRIM_UNUSED_KSYMS=y
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-CONFIG_TTPCI_EEPROM=m
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TUN_VNET_CROSS_LE=y
-CONFIG_TYPHOON=m
-CONFIG_UCSI=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_UNISYSSPAR is not set
-CONFIG_UNIX_DIAG=m
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_US5182D is not set
-CONFIG_USB_ACM=m
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_PRINTER=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-CONFIG_USB_HACKRF=m
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSO=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USERIO=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VEML6070 is not set
-CONFIG_VETH=m
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW686X=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_VMD=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-# CONFIG_VZ89X is not set
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-# CONFIG_WILC1000_HW_OOB_INTR is not set
-CONFIG_WILC1000=m
-CONFIG_WILC1000_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUID=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_PTDUMP_CORE=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_X2APIC=y
-CONFIG_X86_X32=y
-# CONFIG_XEN is not set
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_Z3FOLD=y
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_ZPOOL=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_ACPI_NUMA=
-!CONFIG_AMD_IOMMU_V2=
-!CONFIG_AMD_NUMA=
-!CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_CPU_HOTPLUG_STATE_CONTROL=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_ENTRY=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PAGE_REF=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WQ_FORCE_RR_CPU=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_DMAR_TABLE=
-!CONFIG_DRM_I810=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT2=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HAVE_INTEL_TXT=
-!CONFIG_HIST_TRIGGERS=
-!CONFIG_HPET_MMAP=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTEL_IOMMU_DEFAULT_ON=
-!CONFIG_INTEL_IOMMU_FLOPPY_WA=
-!CONFIG_INTEL_IOMMU_SVM=
-!CONFIG_INTEL_TXT=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IOMMU_API=
-!CONFIG_IOMMU_IOVA=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MAXSMP=
-!CONFIG_MCE_AMD_INJ=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MMIOTRACE=
-!CONFIG_MOVABLE_NODE=
-!CONFIG_NEED_MULTIPLE_NODES=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NODES_SHIFT=
-!CONFIG_NODES_SPAN_OTHER_NODES=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_NUMA_BALANCING=
-!CONFIG_NUMA_EMU=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_EQS_DEBUG=
-!CONFIG_RCU_PERF_TEST=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_LOADPIN=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_FSL=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_STATIC_KEYS_SELFTEST=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_CDG=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_NV=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_EGALAX_SERIAL=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MELFAS_MIP4=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_PROPERTIES=
-!CONFIG_TOUCHSCREEN_ROHM_BU21023=
-!CONFIG_TOUCHSCREEN_SILEAD=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2004=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TOUCHSCREEN_WDT87XX_I2C=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_USE_PERCPU_NUMA_NODE_ID=
-!CONFIG_VFIO=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_WQ_WATCHDOG=
-!CONFIG_X86_64_ACPI_NUMA=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_FPU=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_INTEL_MID=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_VSMP=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/30-hyperv b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/30-hyperv
deleted file mode 100644
index b499ead54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/30-hyperv
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-CONFIG_FB_HYPERV=m
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_UTILS=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/30-usbip b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/30-usbip
deleted file mode 100644
index 48ff1587b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/30-usbip
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kernel name=.config
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VUDC=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/50-update-ipmi b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/50-update-ipmi
deleted file mode 100644
index 5b59230d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/50-update-ipmi
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=kernel name=.config
-# CONFIG_ACPI_IPMI is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-# CONFIG_USBIP_DEBUG is not set
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/90-server b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/90-server
deleted file mode 100644
index 1d1a4e7ba..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/90-server
+++ /dev/null
@@ -1,362 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-# CONFIG_CYPRESS_FIRMWARE is not set
-# CONFIG_DRM_I810 is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_HZ_300=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_PCI_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_USB_SUPPORT is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-CONFIG_TREE_RCU=y
-# CONFIG_TTPCI_EEPROM is not set
-!CONFIG_DVB_AF9013=
-!CONFIG_DVB_AF9033=
-!CONFIG_DVB_AS102=
-!CONFIG_DVB_AS102_FE=
-!CONFIG_DVB_AU8522=
-!CONFIG_DVB_AU8522_DTV=
-!CONFIG_DVB_AU8522_V4L=
-!CONFIG_DVB_AV7110=
-!CONFIG_DVB_AV7110_IR=
-!CONFIG_DVB_AV7110_OSD=
-!CONFIG_DVB_B2C2_FLEXCOP=
-!CONFIG_DVB_B2C2_FLEXCOP_PCI=
-!CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG=
-!CONFIG_DVB_B2C2_FLEXCOP_USB=
-!CONFIG_DVB_BCM3510=
-!CONFIG_DVB_BUDGET=
-!CONFIG_DVB_BUDGET_AV=
-!CONFIG_DVB_BUDGET_CORE=
-!CONFIG_DVB_BUDGET_PATCH=
-!CONFIG_DVB_CORE=
-!CONFIG_DVB_CX24116=
-!CONFIG_DVB_CX24120=
-!CONFIG_DVB_CX24123=
-!CONFIG_DVB_CXD2820R=
-!CONFIG_DVB_DDBRIDGE=
-!CONFIG_DVB_DRXK=
-!CONFIG_DVB_DYNAMIC_MINORS=
-!CONFIG_DVB_EC100=
-!CONFIG_DVB_FIREDTV=
-!CONFIG_DVB_ISL6405=
-!CONFIG_DVB_ISL6421=
-!CONFIG_DVB_ISL6423=
-!CONFIG_DVB_L64781=
-!CONFIG_DVB_LG2160=
-!CONFIG_DVB_LGDT3305=
-!CONFIG_DVB_LGDT330X=
-!CONFIG_DVB_LNBP21=
-!CONFIG_DVB_M88DS3103=
-!CONFIG_DVB_MAX_ADAPTERS=
-!CONFIG_DVB_MT312=
-!CONFIG_DVB_MT352=
-!CONFIG_DVB_NET=
-!CONFIG_DVB_NGENE=
-!CONFIG_DVB_NXT200X=
-!CONFIG_DVB_PLATFORM_DRIVERS=
-!CONFIG_DVB_PLL=
-!CONFIG_DVB_PLUTO2=
-!CONFIG_DVB_PT1=
-!CONFIG_DVB_PT3=
-!CONFIG_DVB_RTL2830=
-!CONFIG_DVB_RTL2832=
-!CONFIG_DVB_RTL2832_SDR=
-!CONFIG_DVB_S5H1409=
-!CONFIG_DVB_S5H1411=
-!CONFIG_DVB_S5H1420=
-!CONFIG_DVB_SI2168=
-!CONFIG_DVB_SP2=
-!CONFIG_DVB_SP8870=
-!CONFIG_DVB_STB0899=
-!CONFIG_DVB_STV0297=
-!CONFIG_DVB_STV0299=
-!CONFIG_DVB_STV0900=
-!CONFIG_DVB_STV090x=
-!CONFIG_DVB_STV6110=
-!CONFIG_DVB_STV6110x=
-!CONFIG_DVB_TC90522=
-!CONFIG_DVB_TDA10021=
-!CONFIG_DVB_TDA10023=
-!CONFIG_DVB_TDA10048=
-!CONFIG_DVB_TDA1004X=
-!CONFIG_DVB_TDA10086=
-!CONFIG_DVB_TDA18271C2DD=
-!CONFIG_DVB_TDA8083=
-!CONFIG_DVB_TDA8261=
-!CONFIG_DVB_TDA826X=
-!CONFIG_DVB_TS2020=
-!CONFIG_DVB_TTUSB_BUDGET=
-!CONFIG_DVB_TTUSB_DEC=
-!CONFIG_DVB_TUA6100=
-!CONFIG_DVB_TUNER_CX24113=
-!CONFIG_DVB_TUNER_ITD1000=
-!CONFIG_DVB_USB_AF9015=
-!CONFIG_DVB_USB_AF9035=
-!CONFIG_DVB_USB_ANYSEE=
-!CONFIG_DVB_USB_AU6610=
-!CONFIG_DVB_USB_AZ6007=
-!CONFIG_DVB_USB_CE6230=
-!CONFIG_DVB_USB_DVBSKY=
-!CONFIG_DVB_USB_EC168=
-!CONFIG_DVB_USB_GL861=
-!CONFIG_DVB_USB_MXL111SF=
-!CONFIG_DVB_USB_RTL28XXU=
-!CONFIG_DVB_USB_V2=
-!CONFIG_DVB_VES1820=
-!CONFIG_DVB_VES1X93=
-!CONFIG_DVB_ZL10036=
-!CONFIG_DVB_ZL10039=
-!CONFIG_DVB_ZL10353=
-!CONFIG_FRAME_VECTOR=
-!CONFIG_JOYSTICK_A3D=
-!CONFIG_JOYSTICK_ADI=
-!CONFIG_JOYSTICK_ANALOG=
-!CONFIG_JOYSTICK_AS5011=
-!CONFIG_JOYSTICK_COBRA=
-!CONFIG_JOYSTICK_DB9=
-!CONFIG_JOYSTICK_GAMECON=
-!CONFIG_JOYSTICK_GF2K=
-!CONFIG_JOYSTICK_GRIP=
-!CONFIG_JOYSTICK_GRIP_MP=
-!CONFIG_JOYSTICK_GUILLEMOT=
-!CONFIG_JOYSTICK_IFORCE=
-!CONFIG_JOYSTICK_IFORCE_232=
-!CONFIG_JOYSTICK_IFORCE_USB=
-!CONFIG_JOYSTICK_INTERACT=
-!CONFIG_JOYSTICK_JOYDUMP=
-!CONFIG_JOYSTICK_MAGELLAN=
-!CONFIG_JOYSTICK_SIDEWINDER=
-!CONFIG_JOYSTICK_SPACEBALL=
-!CONFIG_JOYSTICK_SPACEORB=
-!CONFIG_JOYSTICK_STINGER=
-!CONFIG_JOYSTICK_TMDC=
-!CONFIG_JOYSTICK_TURBOGRAFX=
-!CONFIG_JOYSTICK_TWIDJOY=
-!CONFIG_JOYSTICK_WALKERA0701=
-!CONFIG_JOYSTICK_WARRIOR=
-!CONFIG_JOYSTICK_XPAD=
-!CONFIG_JOYSTICK_XPAD_FF=
-!CONFIG_JOYSTICK_XPAD_LEDS=
-!CONFIG_JOYSTICK_ZHENHUA=
-!CONFIG_MAC_EMUMOUSEBTN=
-!CONFIG_MEDIA_ATTACH=
-!CONFIG_MEDIA_COMMON_OPTIONS=
-!CONFIG_MEDIA_CONTROLLER=
-!CONFIG_MEDIA_SUBDRV_AUTOSELECT=
-!CONFIG_MEDIA_TUNER=
-!CONFIG_MEDIA_TUNER_E4000=
-!CONFIG_MEDIA_TUNER_FC0011=
-!CONFIG_MEDIA_TUNER_FC0012=
-!CONFIG_MEDIA_TUNER_FC0013=
-!CONFIG_MEDIA_TUNER_FC2580=
-!CONFIG_MEDIA_TUNER_IT913X=
-!CONFIG_MEDIA_TUNER_MC44S803=
-!CONFIG_MEDIA_TUNER_MT2060=
-!CONFIG_MEDIA_TUNER_MT2063=
-!CONFIG_MEDIA_TUNER_MT20XX=
-!CONFIG_MEDIA_TUNER_MT2131=
-!CONFIG_MEDIA_TUNER_MXL301RF=
-!CONFIG_MEDIA_TUNER_MXL5005S=
-!CONFIG_MEDIA_TUNER_MXL5007T=
-!CONFIG_MEDIA_TUNER_QM1D1C0042=
-!CONFIG_MEDIA_TUNER_QT1010=
-!CONFIG_MEDIA_TUNER_R820T=
-!CONFIG_MEDIA_TUNER_SI2157=
-!CONFIG_MEDIA_TUNER_SIMPLE=
-!CONFIG_MEDIA_TUNER_TDA18212=
-!CONFIG_MEDIA_TUNER_TDA18218=
-!CONFIG_MEDIA_TUNER_TDA18271=
-!CONFIG_MEDIA_TUNER_TDA827X=
-!CONFIG_MEDIA_TUNER_TDA8290=
-!CONFIG_MEDIA_TUNER_TDA9887=
-!CONFIG_MEDIA_TUNER_TUA9001=
-!CONFIG_MEDIA_TUNER_XC2028=
-!CONFIG_MEDIA_TUNER_XC4000=
-!CONFIG_MEDIA_TUNER_XC5000=
-!CONFIG_PREEMPT_COUNT=
-!CONFIG_PREEMPT_RCU=
-!CONFIG_SMS_SDIO_DRV=
-!CONFIG_SMS_SIANO_MDTV=
-!CONFIG_SMS_USB_DRV=
-!CONFIG_TABLET_SERIAL_WACOM4=
-!CONFIG_TABLET_USB_ACECAD=
-!CONFIG_TABLET_USB_AIPTEK=
-!CONFIG_TABLET_USB_GTCO=
-!CONFIG_TABLET_USB_HANWANG=
-!CONFIG_TABLET_USB_KBTAB=
-!CONFIG_UNINLINE_SPIN_UNLOCK=
-!CONFIG_USB_AIRSPY=
-!CONFIG_USB_CONFIGFS_F_UVC=
-!CONFIG_USB_GL860=
-!CONFIG_USB_GSPCA=
-!CONFIG_USB_GSPCA_BENQ=
-!CONFIG_USB_GSPCA_CONEX=
-!CONFIG_USB_GSPCA_CPIA1=
-!CONFIG_USB_GSPCA_DTCS033=
-!CONFIG_USB_GSPCA_ETOMS=
-!CONFIG_USB_GSPCA_FINEPIX=
-!CONFIG_USB_GSPCA_JEILINJ=
-!CONFIG_USB_GSPCA_JL2005BCD=
-!CONFIG_USB_GSPCA_KINECT=
-!CONFIG_USB_GSPCA_KONICA=
-!CONFIG_USB_GSPCA_MARS=
-!CONFIG_USB_GSPCA_MR97310A=
-!CONFIG_USB_GSPCA_NW80X=
-!CONFIG_USB_GSPCA_OV519=
-!CONFIG_USB_GSPCA_OV534=
-!CONFIG_USB_GSPCA_OV534_9=
-!CONFIG_USB_GSPCA_PAC207=
-!CONFIG_USB_GSPCA_PAC7302=
-!CONFIG_USB_GSPCA_PAC7311=
-!CONFIG_USB_GSPCA_SE401=
-!CONFIG_USB_GSPCA_SN9C2028=
-!CONFIG_USB_GSPCA_SN9C20X=
-!CONFIG_USB_GSPCA_SONIXB=
-!CONFIG_USB_GSPCA_SONIXJ=
-!CONFIG_USB_GSPCA_SPCA1528=
-!CONFIG_USB_GSPCA_SPCA500=
-!CONFIG_USB_GSPCA_SPCA501=
-!CONFIG_USB_GSPCA_SPCA505=
-!CONFIG_USB_GSPCA_SPCA506=
-!CONFIG_USB_GSPCA_SPCA508=
-!CONFIG_USB_GSPCA_SPCA561=
-!CONFIG_USB_GSPCA_SQ905=
-!CONFIG_USB_GSPCA_SQ905C=
-!CONFIG_USB_GSPCA_SQ930X=
-!CONFIG_USB_GSPCA_STK014=
-!CONFIG_USB_GSPCA_STK1135=
-!CONFIG_USB_GSPCA_STV0680=
-!CONFIG_USB_GSPCA_SUNPLUS=
-!CONFIG_USB_GSPCA_T613=
-!CONFIG_USB_GSPCA_TOPRO=
-!CONFIG_USB_GSPCA_TOUPTEK=
-!CONFIG_USB_GSPCA_TV8532=
-!CONFIG_USB_GSPCA_VC032X=
-!CONFIG_USB_GSPCA_VICAM=
-!CONFIG_USB_GSPCA_XIRLINK_CIT=
-!CONFIG_USB_GSPCA_ZC3XX=
-!CONFIG_USB_HACKRF=
-!CONFIG_USB_M5602=
-!CONFIG_USB_PWC=
-!CONFIG_USB_PWC_DEBUG=
-!CONFIG_USB_PWC_INPUT_EVDEV=
-!CONFIG_USB_S2255=
-!CONFIG_USB_STKWEBCAM=
-!CONFIG_USB_STV06XX=
-!CONFIG_USB_VIDEO_CLASS=
-!CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=
-!CONFIG_USB_ZR364XX=
-!CONFIG_V4L_MEM2MEM_DRIVERS=
-!CONFIG_V4L_PLATFORM_DRIVERS=
-!CONFIG_V4L_TEST_DRIVERS=
-!CONFIG_VIDEO_ADV7170=
-!CONFIG_VIDEO_ADV7175=
-!CONFIG_VIDEO_AU0828=
-!CONFIG_VIDEO_AU0828_V4L2=
-!CONFIG_VIDEO_BT819=
-!CONFIG_VIDEO_BT856=
-!CONFIG_VIDEO_BT866=
-!CONFIG_VIDEOBUF2_CORE=
-!CONFIG_VIDEOBUF2_DMA_CONTIG=
-!CONFIG_VIDEOBUF2_DMA_SG=
-!CONFIG_VIDEOBUF2_DVB=
-!CONFIG_VIDEOBUF2_MEMOPS=
-!CONFIG_VIDEOBUF2_VMALLOC=
-!CONFIG_VIDEOBUF_DMA_SG=
-!CONFIG_VIDEOBUF_GEN=
-!CONFIG_VIDEOBUF_VMALLOC=
-!CONFIG_VIDEO_CPIA2=
-!CONFIG_VIDEO_CS53L32A=
-!CONFIG_VIDEO_CX2341X=
-!CONFIG_VIDEO_CX25821=
-!CONFIG_VIDEO_CX25821_ALSA=
-!CONFIG_VIDEO_CX25840=
-!CONFIG_VIDEO_DEV=
-!CONFIG_VIDEO_DT3155=
-!CONFIG_VIDEO_EM28XX=
-!CONFIG_VIDEO_EM28XX_ALSA=
-!CONFIG_VIDEO_EM28XX_DVB=
-!CONFIG_VIDEO_EM28XX_V4L2=
-!CONFIG_VIDEO_GO7007=
-!CONFIG_VIDEO_GO7007_LOADER=
-!CONFIG_VIDEO_GO7007_USB=
-!CONFIG_VIDEO_GO7007_USB_S2250_BOARD=
-!CONFIG_VIDEO_HDPVR=
-!CONFIG_VIDEO_HEXIUM_GEMINI=
-!CONFIG_VIDEO_HEXIUM_ORION=
-!CONFIG_VIDEO_KS0127=
-!CONFIG_VIDEO_MEYE=
-!CONFIG_VIDEO_MSP3400=
-!CONFIG_VIDEO_MT9V011=
-!CONFIG_VIDEO_MXB=
-!CONFIG_VIDEO_OV7640=
-!CONFIG_VIDEO_PVRUSB2=
-!CONFIG_VIDEO_PVRUSB2_DEBUGIFC=
-!CONFIG_VIDEO_PVRUSB2_DVB=
-!CONFIG_VIDEO_PVRUSB2_SYSFS=
-!CONFIG_VIDEO_SAA6588=
-!CONFIG_VIDEO_SAA6752HS=
-!CONFIG_VIDEO_SAA7110=
-!CONFIG_VIDEO_SAA711X=
-!CONFIG_VIDEO_SAA7134=
-!CONFIG_VIDEO_SAA7134_ALSA=
-!CONFIG_VIDEO_SAA7134_DVB=
-!CONFIG_VIDEO_SAA7134_GO7007=
-!CONFIG_VIDEO_SAA7146=
-!CONFIG_VIDEO_SAA7146_VV=
-!CONFIG_VIDEO_SAA7164=
-!CONFIG_VIDEO_SAA7185=
-!CONFIG_VIDEO_SOLO6X10=
-!CONFIG_VIDEO_SONY_BTF_MPX=
-!CONFIG_VIDEO_STK1160=
-!CONFIG_VIDEO_STK1160_AC97=
-!CONFIG_VIDEO_STK1160_COMMON=
-!CONFIG_VIDEO_TDA9840=
-!CONFIG_VIDEO_TEA6415C=
-!CONFIG_VIDEO_TEA6420=
-!CONFIG_VIDEO_TUNER=
-!CONFIG_VIDEO_TVEEPROM=
-!CONFIG_VIDEO_TVP5150=
-!CONFIG_VIDEO_TW2804=
-!CONFIG_VIDEO_TW68=
-!CONFIG_VIDEO_TW9903=
-!CONFIG_VIDEO_TW9906=
-!CONFIG_VIDEO_UDA1342=
-!CONFIG_VIDEO_USBTV=
-!CONFIG_VIDEO_USBVISION=
-!CONFIG_VIDEO_V4L2=
-!CONFIG_VIDEO_VPX3220=
-!CONFIG_VIDEO_WM8775=
-!CONFIG_VIDEO_ZORAN=
-!CONFIG_VIDEO_ZORAN_AVS6EYES=
-!CONFIG_VIDEO_ZORAN_BUZ=
-!CONFIG_VIDEO_ZORAN_DC10=
-!CONFIG_VIDEO_ZORAN_DC30=
-!CONFIG_VIDEO_ZORAN_LML33=
-!CONFIG_VIDEO_ZORAN_LML33R10=
-!CONFIG_VIDEO_ZORAN_ZR36060=
-!CONFIG_DVB_A8293=
-!CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=
-!CONFIG_DVB_CX22700=
-!CONFIG_DVB_DRX39XYJ=
-!CONFIG_DVB_DRXD=
-!CONFIG_DVB_MB86A20S=
-!CONFIG_DVB_S921=
-!CONFIG_DVB_TDA10071=
-!CONFIG_SMS_SIANO_DEBUGFS=
-!CONFIG_USB_G_WEBCAM=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
deleted file mode 100644
index b7ef63ce1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.8/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-# Calculate format=diff pkg(sys-devel/gcc)>=4.9
-WARNING - this version of the patch works with version 4.9+ of gcc and with
-kernel version 3.15.x+ and should NOT be applied when compiling on older
-versions due to name changes of the flags with the 4.9 release of gcc.
-Use the older version of this patch hosted on the same github for older
-versions of gcc. For example:
-
-corei7 --> nehalem
-corei7-avx --> sandybridge
-core-avx-i --> ivybridge
-core-avx2 --> haswell
-
-For more, see: https://gcc.gnu.org/gcc-4.9/changes.html
-
-It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes.
-Note that upstream is using the deprecated 'match=atom' flags when I believe it
-should use the newer 'march=bonnell' flag for atom processors.
-
-I have made that change to this patch set as well.  See the following kernel
-bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461
-
-This patch will expand the number of microarchitectures to include new
-processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family
-14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD
-Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core
-i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen
-Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th
-Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag.
-
-Small but real speed increases are measurable using a make endpoint comparing
-a generic kernel to one built with one of the respective microarchs.
-
-See the following experimental evidence supporting this statement:
-https://github.com/graysky2/kernel_gcc_patch
-
-REQUIREMENTS
-linux version >=3.15
-gcc version >=4.9
-
---- a/arch/x86/include/asm/module.h	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/include/asm/module.h	2014-09-13 09:37:16.721385247 -0400
-@@ -15,6 +15,20 @@
- #define MODULE_PROC_FAMILY "586MMX "
- #elif defined CONFIG_MCORE2
- #define MODULE_PROC_FAMILY "CORE2 "
-+#elif defined CONFIG_MNATIVE
-+#define MODULE_PROC_FAMILY "NATIVE "
-+#elif defined CONFIG_MNEHALEM
-+#define MODULE_PROC_FAMILY "NEHALEM "
-+#elif defined CONFIG_MWESTMERE
-+#define MODULE_PROC_FAMILY "WESTMERE "
-+#elif defined CONFIG_MSANDYBRIDGE
-+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
-+#elif defined CONFIG_MIVYBRIDGE
-+#define MODULE_PROC_FAMILY "IVYBRIDGE "
-+#elif defined CONFIG_MHASWELL
-+#define MODULE_PROC_FAMILY "HASWELL "
-+#elif defined CONFIG_MBROADWELL
-+#define MODULE_PROC_FAMILY "BROADWELL "
- #elif defined CONFIG_MATOM
- #define MODULE_PROC_FAMILY "ATOM "
- #elif defined CONFIG_M686
-@@ -33,6 +47,20 @@
- #define MODULE_PROC_FAMILY "K7 "
- #elif defined CONFIG_MK8
- #define MODULE_PROC_FAMILY "K8 "
-+#elif defined CONFIG_MK8SSE3
-+#define MODULE_PROC_FAMILY "K8SSE3 "
-+#elif defined CONFIG_MK10
-+#define MODULE_PROC_FAMILY "K10 "
-+#elif defined CONFIG_MBARCELONA
-+#define MODULE_PROC_FAMILY "BARCELONA "
-+#elif defined CONFIG_MBOBCAT
-+#define MODULE_PROC_FAMILY "BOBCAT "
-+#elif defined CONFIG_MBULLDOZER
-+#define MODULE_PROC_FAMILY "BULLDOZER "
-+#elif defined CONFIG_MPILEDRIVER
-+#define MODULE_PROC_FAMILY "PILEDRIVER "
-+#elif defined CONFIG_MJAGUAR
-+#define MODULE_PROC_FAMILY "JAGUAR "
- #elif defined CONFIG_MELAN
- #define MODULE_PROC_FAMILY "ELAN "
- #elif defined CONFIG_MCRUSOE
---- a/arch/x86/Kconfig.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Kconfig.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -137,9 +137,8 @@ config MPENTIUM4
- 		-Paxville
- 		-Dempsey
- 
--
- config MK6
--	bool "K6/K6-II/K6-III"
-+	bool "AMD K6/K6-II/K6-III"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD K6-family processor.  Enables use of
-@@ -147,7 +146,7 @@ config MK6
- 	  flags to GCC.
- 
- config MK7
--	bool "Athlon/Duron/K7"
-+	bool "AMD Athlon/Duron/K7"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD Athlon K7-family processor.  Enables use of
-@@ -155,12 +154,62 @@ config MK7
- 	  flags to GCC.
- 
- config MK8
--	bool "Opteron/Athlon64/Hammer/K8"
-+	bool "AMD Opteron/Athlon64/Hammer/K8"
- 	---help---
- 	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
- 	  Enables use of some extended instructions, and passes appropriate
- 	  optimization flags to GCC.
- 
-+config MK8SSE3
-+	bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
-+	---help---
-+	  Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MK10
-+	bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
-+	---help---
-+	  Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
-+		Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MBARCELONA
-+	bool "AMD Barcelona"
-+	---help---
-+	  Select this for AMD Barcelona and newer processors.
-+
-+	  Enables -march=barcelona
-+
-+config MBOBCAT
-+	bool "AMD Bobcat"
-+	---help---
-+	  Select this for AMD Bobcat processors.
-+
-+	  Enables -march=btver1
-+
-+config MBULLDOZER
-+	bool "AMD Bulldozer"
-+	---help---
-+	  Select this for AMD Bulldozer processors.
-+
-+	  Enables -march=bdver1
-+
-+config MPILEDRIVER
-+	bool "AMD Piledriver"
-+	---help---
-+	  Select this for AMD Piledriver processors.
-+
-+	  Enables -march=bdver2
-+
-+config MJAGUAR
-+	bool "AMD Jaguar"
-+	---help---
-+	  Select this for AMD Jaguar processors.
-+
-+	  Enables -march=btver2
-+
- config MCRUSOE
- 	bool "Crusoe"
- 	depends on X86_32
-@@ -251,8 +300,17 @@ config MPSC
- 	  using the cpu family field
- 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
- 
-+config MATOM
-+	bool "Intel Atom"
-+	---help---
-+
-+	  Select this for the Intel Atom platform. Intel Atom CPUs have an
-+	  in-order pipelining architecture and thus can benefit from
-+	  accordingly optimized code. Use a recent GCC with specific Atom
-+	  support in order to fully benefit from selecting this option.
-+
- config MCORE2
--	bool "Core 2/newer Xeon"
-+	bool "Intel Core 2"
- 	---help---
- 
- 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
-@@ -260,14 +318,55 @@ config MCORE2
- 	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
- 	  (not a typo)
- 
--config MATOM
--	bool "Intel Atom"
-+	  Enables -march=core2
-+
-+config MNEHALEM
-+	bool "Intel Nehalem"
- 	---help---
- 
--	  Select this for the Intel Atom platform. Intel Atom CPUs have an
--	  in-order pipelining architecture and thus can benefit from
--	  accordingly optimized code. Use a recent GCC with specific Atom
--	  support in order to fully benefit from selecting this option.
-+	  Select this for 1st Gen Core processors in the Nehalem family.
-+
-+	  Enables -march=nehalem
-+
-+config MWESTMERE
-+	bool "Intel Westmere"
-+	---help---
-+
-+	  Select this for the Intel Westmere formerly Nehalem-C family.
-+
-+	  Enables -march=westmere
-+
-+config MSANDYBRIDGE
-+	bool "Intel Sandy Bridge"
-+	---help---
-+
-+	  Select this for 2nd Gen Core processors in the Sandy Bridge family.
-+
-+	  Enables -march=sandybridge
-+
-+config MIVYBRIDGE
-+	bool "Intel Ivy Bridge"
-+	---help---
-+
-+	  Select this for 3rd Gen Core processors in the Ivy Bridge family.
-+
-+	  Enables -march=ivybridge
-+
-+config MHASWELL
-+	bool "Intel Haswell"
-+	---help---
-+
-+	  Select this for 4th Gen Core processors in the Haswell family.
-+
-+	  Enables -march=haswell
-+
-+config MBROADWELL
-+	bool "Intel Broadwell"
-+	---help---
-+
-+	  Select this for 5th Gen Core processors in the Broadwell family.
-+
-+	  Enables -march=broadwell
- 
- config GENERIC_CPU
- 	bool "Generic-x86-64"
-@@ -276,6 +375,19 @@ config GENERIC_CPU
- 	  Generic x86-64 CPU.
- 	  Run equally well on all x86-64 CPUs.
- 
-+config MNATIVE
-+ bool "Native optimizations autodetected by GCC"
-+ ---help---
-+
-+   GCC 4.2 and above support -march=native, which automatically detects
-+   the optimum settings to use based on your processor. -march=native 
-+   also detects and applies additional settings beyond -march specific
-+   to your CPU, (eg. -msse4). Unless you have a specific reason not to
-+   (e.g. distcc cross-compiling), you should probably be using
-+   -march=native rather than anything listed below.
-+
-+   Enables -march=native
-+
- endchoice
- 
- config X86_GENERIC
-@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT
- config X86_L1_CACHE_SHIFT
- 	int
- 	default "7" if MPENTIUM4 || MPSC
--	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
-+	default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
- 	default "4" if MELAN || M486 || MGEODEGX1
- 	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
- 
-@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16
- 
- config X86_INTEL_USERCOPY
- 	def_bool y
--	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
-+	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE
- 
- config X86_USE_PPRO_CHECKSUM
- 	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE
- 
- config X86_USE_3DNOW
- 	def_bool y
-@@ -359,17 +471,17 @@ config X86_P6_NOP
- 
- config X86_TSC
- 	def_bool y
--	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
-+	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64
- 
- config X86_CMPXCHG64
- 	def_bool y
--	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
-+	depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE
- 
- # this should be set for all -march=.. options where the compiler
- # generates cmov.
- config X86_CMOV
- 	def_bool y
--	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
-+	depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX)
- 
- config X86_MINIMUM_CPU_FAMILY
- 	int
---- a/arch/x86/Makefile	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile	2014-09-13 09:37:16.721385247 -0400
-@@ -92,13 +92,33 @@ else
- 	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
- 
-         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
-+        cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
-         cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
-+        cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8)
-+        cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
-+        cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
-+        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
-+        cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
-+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
-+        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
-         cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
- 
-         cflags-$(CONFIG_MCORE2) += \
--                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
--	cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
--		$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+                $(call cc-option,-march=core2,$(call cc-option,-mtune=core2))
-+        cflags-$(CONFIG_MNEHALEM) += \
-+                $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem))
-+        cflags-$(CONFIG_MWESTMERE) += \
-+                $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere))
-+        cflags-$(CONFIG_MSANDYBRIDGE) += \
-+                $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge))
-+        cflags-$(CONFIG_MIVYBRIDGE) += \
-+                $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge))
-+        cflags-$(CONFIG_MHASWELL) += \
-+                $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell))
-+        cflags-$(CONFIG_MBROADWELL) += \
-+                $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell))
-+        cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \
-+                $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
-         cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
-         KBUILD_CFLAGS += $(cflags-y)
- 
---- a/arch/x86/Makefile_32.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile_32.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6)		+= -march=k6
- # Please note, that patches that add -march=athlon-xp and friends are pointless.
- # They make zero difference whatsosever to performance at this time.
- cflags-$(CONFIG_MK7)		+= -march=athlon
-+cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
- cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)
-+cflags-$(CONFIG_MK8SSE3)		+= $(call cc-option,-march=k8-sse3,-march=athlon)
-+cflags-$(CONFIG_MK10)	+= $(call cc-option,-march=amdfam10,-march=athlon)
-+cflags-$(CONFIG_MBARCELONA)	+= $(call cc-option,-march=barcelona,-march=athlon)
-+cflags-$(CONFIG_MBOBCAT)	+= $(call cc-option,-march=btver1,-march=athlon)
-+cflags-$(CONFIG_MBULLDOZER)	+= $(call cc-option,-march=bdver1,-march=athlon)
-+cflags-$(CONFIG_MPILEDRIVER)	+= $(call cc-option,-march=bdver2,-march=athlon)
-+cflags-$(CONFIG_MJAGUAR)	+= $(call cc-option,-march=btver2,-march=athlon)
- cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)
-@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-
- cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)
- cflags-$(CONFIG_MVIAC7)		+= -march=i686
- cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)
--cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \
--	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+cflags-$(CONFIG_MNEHALEM)	+= -march=i686 $(call tune,nehalem)
-+cflags-$(CONFIG_MWESTMERE)	+= -march=i686 $(call tune,westmere)
-+cflags-$(CONFIG_MSANDYBRIDGE)	+= -march=i686 $(call tune,sandybridge)
-+cflags-$(CONFIG_MIVYBRIDGE)	+= -march=i686 $(call tune,ivybridge)
-+cflags-$(CONFIG_MHASWELL)	+= -march=i686 $(call tune,haswell)
-+cflags-$(CONFIG_MBROADWELL)	+= -march=i686 $(call tune,broadwell)
-+cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \
-+	$(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
- 
- # AMD Elan support
- cflags-$(CONFIG_MELAN)		+= -march=i486
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
deleted file mode 100644
index feae46169..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge(sys-kernel/calculate-sources)>=4.9&&merge(sys-kernel/calculate-sources)<4.10
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86-4.9 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86-4.9
deleted file mode 100644
index 1ebdd508d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86-4.9
+++ /dev/null
@@ -1,3609 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==i686
-CONFIG_3C515=m
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_ALS=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_IPMI is not set
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-# CONFIG_AFE4404 is not set
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-# CONFIG_ALIENWARE_WMI is not set
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AM2315=m
-CONFIG_AMD8111_ETH=m
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-CONFIG_APM_ALLOW_INTS=y
-CONFIG_APM_CPU_IDLE=y
-CONFIG_APM_DISPLAY_BLANK=y
-CONFIG_APM_DO_ENABLE=y
-CONFIG_APM_IGNORE_USER_SUSPEND=y
-CONFIG_APM=m
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASN1=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_HWRNG=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_COMMON=m
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-# CONFIG_ATLAS_PH_SENSOR is not set
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_AURORA_NB8800=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=m
-# CONFIG_AXP288_CHARGER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_B53=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUGFS is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATTERY_DA9150 is not set
-# CONFIG_BATTERY_RT5033 is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMGENET=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BINFMT_AOUT=y
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-# CONFIG_BLK_DEV_NVME_SCSI is not set
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_LEDS=y
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_RTL=m
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHARGER_ISP1704=m
-# CONFIG_CHARGER_MAX14577 is not set
-# CONFIG_CHARGER_MAX77693 is not set
-CONFIG_CHELSIO_LIB=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_SMB311=y
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_UPCALL=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CIO_DAC is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLZ_TAB=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_NXP is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CHELSIO=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DH=m
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_ECHAINIV=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_KPP=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CS89x0=m
-CONFIG_CS89x0_PLATFORM=y
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-# CONFIG_DA9062_WATCHDOG is not set
-# CONFIG_DA9063_WATCHDOG is not set
-# CONFIG_DA9150_GPADC is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-# CONFIG_DMARD09 is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_AMD_ACP=y
-CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_SI=y
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_DP_AUX_CHARDEV=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_LEGACY=y
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DS1803 is not set
-# CONFIG_DTLK is not set
-CONFIG_DUMMY=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_B2C2_FLEXCOP=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-# CONFIG_DVB_GP8PSK_FE is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_DVB_PLL=m
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_TC90522=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=y
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EBC_C384_WDT=m
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_FAKE_MEMMAP=y
-CONFIG_EFI_MAX_FAKE_MEM=8
-CONFIG_EFI_PGT_DUMP=y
-CONFIG_EFI_STUB=y
-# CONFIG_EFI_VARS is not set
-CONFIG_EISA_NAMES=y
-CONFIG_EISA_PCI_EISA=y
-CONFIG_EISA_VIRTUAL_ROOT=y
-# CONFIG_EISA_VLB_PRIMING is not set
-CONFIG_EISA=y
-CONFIG_EL3=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENA_ETHERNET=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_AXP288=m
-CONFIG_EXTCON=m
-CONFIG_EXTCON_MAX14577=m
-CONFIG_EXTCON_MAX77693=m
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-# CONFIG_FB_EFI is not set
-# CONFIG_FB_SM750 is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_ENCRYPTION=m
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FTRACE is not set
-CONFIG_FUJITSU_ES=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
-CONFIG_FW_CFG_SYSFS=m
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_GENERIC_PHY=y
-# CONFIG_GENEVE is not set
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GREYBUS is not set
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_GTP=m
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-# CONFIG_HDC100X is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CORSAIR=y
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GENERIC=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-# CONFIG_HIGHPTE is not set
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HP03 is not set
-CONFIG_HP100=m
-# CONFIG_HP206C is not set
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_EG20T=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-# CONFIG_I2C_PCA_ISA is not set
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_I82092=m
-# CONFIG_I82365 is not set
-CONFIG_I8K=m
-# CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_CONFIGFS=m
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_HRTIMER_TRIGGER is not set
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-CONFIG_IIO_SW_DEVICE=m
-CONFIG_IIO_SW_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-# CONFIG_INA2XX_ADC is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_88PM80X_ONKEY=m
-# CONFIG_INPUT_AXP20X_PEK is not set
-CONFIG_INPUT_BMA150=m
-# CONFIG_INPUT_DA9063_ONKEY is not set
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT3406_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_IDLE=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MEI_WDT=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_INTEL_PMC_CORE=y
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INTEL_VBTN=m
-CONFIG_INTEL_XWAY_PHY=m
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=y
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_ILA=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_IRQ_POLL=y
-CONFIG_ISA_BUS_API=y
-CONFIG_ISAPNP=y
-CONFIG_ISA=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-CONFIG_IWLWIFI_PCIE_RTPM=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_XZ=y
-CONFIG_KEYBOARD_ADC=m
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-# CONFIG_KS7010 is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_ASYNC_PF=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-# CONFIG_KXSD9 is not set
-CONFIG_LANCE=m
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-# CONFIG_LGUEST_GUEST is not set
-CONFIG_LGUEST=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_LLC=m
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-# CONFIG_LNET_SELFTEST is not set
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-# CONFIG_LTC2485 is not set
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-# CONFIG_M62332 is not set
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACSEC=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX517 is not set
-CONFIG_MAX63XX_WATCHDOG=m
-# CONFIG_MC3230 is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_88PM800=m
-CONFIG_MFD_88PM805=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DA9062=m
-CONFIG_MFD_DA9063=m
-CONFIG_MFD_DA9150=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_EXYNOS_LPASS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_MAX14577=m
-CONFIG_MFD_MAX77693=m
-CONFIG_MFD_MAX8907=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RT5033=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_LP873X=m
-CONFIG_MFD_TPS65086=m
-CONFIG_MFD_TPS65912_I2C=m
-CONFIG_MFD_TPS65912=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MICROSEMI_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIXCOMWD is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-# CONFIG_MLX90614 is not set
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SWITCHX2=m
-# CONFIG_MMA7455_I2C is not set
-CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC35240=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_MTK=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MOST is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_MPILIB=m
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MT7601U=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_QCA8K=m
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_QCA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_NET_VRF=m
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_SCSILAYOUT is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_SET_HASH=m
-CONFIG_NFT_SET_RBTREE=m
-CONFIG_NI65=m
-CONFIG_NI903X_WDT=m
-CONFIG_NILFS2_FS=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-CONFIG_NVM_DEBUG=y
-CONFIG_NVME_CORE=y
-# CONFIG_NVME_TARGET is not set
-CONFIG_NVM_GENNVM=m
-CONFIG_NVM_RRPC=m
-CONFIG_NVM=y
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-# CONFIG_OPT3001 is not set
-CONFIG_ORANGEFS_FS=m
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-# CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
-CONFIG_PACKET=m
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_ISAPNP is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_QDI is not set
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-# CONFIG_PATA_WINBOND_VLB is not set
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCH_DMA=m
-CONFIG_PCH_GBE=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCI_ATS=y
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-CONFIG_PCI_IOV=y
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-# CONFIG_PCWATCHDOG is not set
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_PHY_TUSB1210=m
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_PM_TRACE_RTC is not set
-# CONFIG_PNPBIOS is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PVPANIC=m
-CONFIG_QCOM_EMAC=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-CONFIG_QEDE=m
-CONFIG_QED=m
-CONFIG_QED_SRIOV=y
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUEUED_LOCK_STAT is not set
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_BERLIN is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
-# CONFIG_RESET_ZYNQ is not set
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPR0521 is not set
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_DRV_88PM80X=m
-# CONFIG_RTC_DRV_DA9063 is not set
-CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_I2C_AND_SPI=m
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-# CONFIG_SATA_DWC_DEBUG is not set
-CONFIG_SATA_DWC=m
-# CONFIG_SATA_DWC_OLD_DMA is not set
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC7240_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_NSP32=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-# CONFIG_SCSI_SIM710 is not set
-CONFIG_SCSI_SMARTPQI=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_SNIC=m
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-# CONFIG_SCSI_SYM53C416 is not set
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_UFS_DWC_TC_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SCx200_ACB=m
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI1145 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMC9194=m
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_AD1889=m
-CONFIG_SND_ADLIB=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_MSND_PINNACLE=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SC6000=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_SSCAPE=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STK3310=m
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-# CONFIG_STX104 is not set
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SWPHY=y
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
-CONFIG_TAHVO_USB=m
-CONFIG_TC1100_WMI=m
-# CONFIG_TCIC is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADS1015 is not set
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TI_SYSCON_RESET=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA=m
-CONFIG_TOSHIBA_WMI=m
-# CONFIG_TPL0102 is not set
-CONFIG_TRIM_UNUSED_KSYMS=y
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-CONFIG_TTPCI_EEPROM=m
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TUN_VNET_CROSS_LE=y
-CONFIG_TYPHOON=m
-CONFIG_UCSI=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_ULTRA=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_US5182D is not set
-CONFIG_USB_ACM=m
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-CONFIG_USB_FUSB300=m
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-CONFIG_USB_HACKRF=m
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSIC_USB4604=m
-CONFIG_USB_HSO=m
-CONFIG_USBIP_CORE=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_IPHETH=m
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_VUDC=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USERIO=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VEML6070 is not set
-CONFIG_VETH=m
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_PCI_SKELETON=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW5864=m
-CONFIG_VIDEO_TW686X=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-# CONFIG_VZ89X is not set
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WD80x3=m
-# CONFIG_WDT is not set
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-# CONFIG_WILC1000_HW_OOB_INTR is not set
-CONFIG_WILC1000=m
-CONFIG_WILC1000_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_X86_APM_BOOT=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_CPUID=m
-CONFIG_X86_E_POWERSAVER=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_PTDUMP_CORE=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_Z3FOLD=y
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_ZLIB_DEFLATE=m
-# CONFIG_ZPA2326 is not set
-CONFIG_ZPOOL=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BIG_KEYS=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_CPU_HOTPLUG_STATE_CONTROL=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_ENTRY=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_HIGHMEM=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PAGE_REF=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_TEST_DRIVER_REMOVE=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WQ_FORCE_RR_CPU=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EFI_BOOTLOADER_CONTROL=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT2=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HIST_TRIGGERS=
-!CONFIG_HPET_MMAP=
-!CONFIG_HWLAT_TRACER=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MCE_AMD_INJ=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MMIOTRACE=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_EQS_DEBUG=
-!CONFIG_RCU_PERF_TEST=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_LOADPIN=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_FSL=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_STATIC_KEYS_SELFTEST=
-!CONFIG_TCP_CONG_BBR=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_CDG=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_NV=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_EGALAX_SERIAL=
-!CONFIG_TOUCHSCREEN_EKTF2127=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MELFAS_MIP4=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_PROPERTIES=
-!CONFIG_TOUCHSCREEN_ROHM_BU21023=
-!CONFIG_TOUCHSCREEN_SILEAD=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2004=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TOUCHSCREEN_WDT87XX_I2C=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_WQ_WATCHDOG=
-!CONFIG_X86_32_NON_STANDARD=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_FPU=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_INTEL_MID=
-!CONFIG_X86_INTEL_QUARK=
-!CONFIG_X86_INTEL_USERCOPY=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_RDC321X=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64-4.9 b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64-4.9
deleted file mode 100644
index 5672b1907..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64-4.9
+++ /dev/null
@@ -1,3514 +0,0 @@
-# Calculate format=kernel name=.config os_install_arch_machine==x86_64
-CONFIG_60XX_WDT=m
-CONFIG_8139CP=m
-CONFIG_8139_OLD_RX_RESET=y
-CONFIG_8139TOO_8129=y
-CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_AC97_BUS=m
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_ACERHDF=m
-CONFIG_ACER_WMI=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_ALS=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_CMPC=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_IPMI is not set
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACQUIRE_WDT=m
-# CONFIG_AD5064 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5933 is not set
-# CONFIG_AD7150 is not set
-# CONFIG_AD7152 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7746 is not set
-# CONFIG_AD799X is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADE7854 is not set
-# CONFIG_ADJD_S311 is not set
-CONFIG_ADM8211=m
-CONFIG_ADVANTECH_WDT=m
-# CONFIG_AFE4404 is not set
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_AIRO_CS=m
-CONFIG_AIRO=m
-# CONFIG_AL3320A is not set
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_ALTERA_STAPL=m
-CONFIG_ALTERA_TSE=m
-CONFIG_ALX=m
-CONFIG_AM2315=m
-CONFIG_AMD8111_ETH=m
-# CONFIG_AMD_IOMMU is not set
-CONFIG_AMD_PHY=m
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_AMILO_RFKILL=m
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-CONFIG_APPLE_GMUX=m
-CONFIG_AR5523=m
-CONFIG_ASN1=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
-CONFIG_ASYNC_XOR=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AT803X_PHY=m
-CONFIG_ATA_GENERIC=m
-CONFIG_ATA_PIIX=m
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_COMMON=m
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_DYNACK=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_HWRNG=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH_COMMON=m
-CONFIG_ATL1C=m
-CONFIG_ATL1E=m
-CONFIG_ATL1=m
-CONFIG_ATL2=m
-# CONFIG_ATLAS_PH_SENSOR is not set
-CONFIG_ATMEL=m
-CONFIG_ATP=m
-CONFIG_AURORA_NB8800=m
-# CONFIG_AXP20X_POWER is not set
-CONFIG_AXP288_ADC=m
-# CONFIG_AXP288_CHARGER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_BCMA=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43_HWRNG=y
-CONFIG_B43_LEDS=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PIO=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_SSB=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_B53=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BATMAN_ADV_BATMAN_V=y
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-# CONFIG_BATMAN_ADV_DEBUGFS is not set
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_MCAST is not set
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATTERY_DA9150 is not set
-# CONFIG_BATTERY_RT5033 is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_BCACHE_DEBUG is not set
-CONFIG_BCACHE=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
-CONFIG_BCMA=m
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMGENET=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BE2ISCSI=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET=m
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_MD=m
-# CONFIG_BLK_DEV_NVME_SCSI is not set
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMG160 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMP280 is not set
-CONFIG_BNA=m
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BONDING=m
-# CONFIG_BRCMDBG is not set
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCM_TRACING is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_BROADCOM_PHY=m
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBT3C=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_LEDS=y
-CONFIG_BT_LE=y
-CONFIG_BT=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_RTL=m
-CONFIG_BTT=y
-CONFIG_BUILD_BIN2C=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-CONFIG_CACHEFILES=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_CASSINI=m
-CONFIG_CB710_CORE=m
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-CONFIG_CDROM_PKTCDVD=m
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHARGER_ISP1704=m
-# CONFIG_CHARGER_MAX14577 is not set
-# CONFIG_CHARGER_MAX77693 is not set
-CONFIG_CHELSIO_LIB=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_DEBUG is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_FSCACHE is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_SMB311=y
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_UPCALL=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_CLEANCACHE=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLZ_TAB=y
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-CONFIG_CNIC=m
-# CONFIG_COMEDI is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_NXP is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK=y
-# CONFIG_COMPACTION is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_CORDIC=m
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_CPU5_WDT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_CRC16=m
-CONFIG_CRC7=m
-CONFIG_CRC8=m
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_ABLK_HELPER=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CHELSIO=m
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DH=m
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_ECHAINIV=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_KPP=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA1_MB=m
-CONFIG_CRYPTO_SHA256_MB=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_SHA512_MB=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-# CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_XTS=m
-# CONFIG_CUSE is not set
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CX_ECAT=m
-CONFIG_CYPRESS_FIRMWARE=m
-# CONFIG_DA9062_WATCHDOG is not set
-# CONFIG_DA9063_WATCHDOG is not set
-# CONFIG_DA9150_GPADC is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DCA=m
-CONFIG_DCDBAS=m
-CONFIG_DE2104X_DSL=0
-CONFIG_DE2104X=m
-CONFIG_DE4X5=m
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEFAULT_HOSTNAME="calculate"
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI=m
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-# CONFIG_DEVFREQ_GOV_USERSPACE is not set
-# CONFIG_DGNC is not set
-CONFIG_DL2K=m
-# CONFIG_DLM_DEBUG is not set
-CONFIG_DLM=m
-CONFIG_DM9102=m
-CONFIG_DMA_ENGINE_RAID=y
-# CONFIG_DMARD09 is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_BUFIO=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CRYPT=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_MQ_DEFAULT=y
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_RAID=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_ZERO is not set
-CONFIG_DNET=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_DRM_AMD_ACP=y
-CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-CONFIG_DRM_AMDGPU=m
-CONFIG_DRM_AMDGPU_SI=y
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_DP_AUX_CHARDEV=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_LEGACY=y
-CONFIG_DRM=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DS1803 is not set
-CONFIG_DUMMY=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_AS102=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_B2C2_FLEXCOP=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_DRXK=m
-# CONFIG_DVB_DUMMY_FE is not set
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_FIREDTV is not set
-# CONFIG_DVB_GP8PSK_FE is not set
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_M88DS3103=m
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_MB86A20S=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_NET=y
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_DVB_PLL=m
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_RTL2832_SDR=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_S921=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_TC90522=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_TDA10071=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=y
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_E1000E=m
-CONFIG_E1000=m
-CONFIG_E100=m
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EFI_FAKE_MEMMAP=y
-CONFIG_EFI_MAX_FAKE_MEM=8
-CONFIG_EFI_MIXED=y
-CONFIG_EFI_PGT_DUMP=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_VARS=m
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENA_ETHERNET=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_ENIC=m
-CONFIG_EPIC100=m
-CONFIG_ETHOC=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
-CONFIG_EXT4_FS=m
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_AXP288=m
-CONFIG_EXTCON=m
-CONFIG_EXTCON_MAX14577=m
-CONFIG_EXTCON_MAX77693=m
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_FAT_DEFAULT_CODEPAGE=866
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_FAT_FS=m
-CONFIG_FB_BACKLIGHT=y
-# CONFIG_FB_SM750 is not set
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_UVESA=m
-# CONFIG_FB_XGI is not set
-CONFIG_FCOE_FNIC=m
-CONFIG_FCOE=m
-# CONFIG_FDDI is not set
-CONFIG_FEALNX=m
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_NET is not set
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-# CONFIG_FIREWIRE_SERIAL is not set
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FIXED_PHY=m
-CONFIG_FM10K=m
-CONFIG_FORCEDETH=m
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_FRAME_WARN=1024
-CONFIG_FRONTSWAP=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_FSCACHE_STATS=y
-CONFIG_FS_ENCRYPTION=m
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=m
-# CONFIG_FTRACE is not set
-CONFIG_FUJITSU_ES=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_FUSE_FS=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_FC=m
-# CONFIG_FUSION_LOGGING is not set
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION=y
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
-CONFIG_FW_CFG_SYSFS=m
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_GACT_PROB=y
-CONFIG_GAMEPORT_EMU10K1=m
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_L4 is not set
-CONFIG_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-CONFIG_GART_IOMMU=y
-# CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_GENERIC_PHY=y
-CONFIG_GENEVE=m
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GFS2_FS=m
-# CONFIG_GP2AP020A00F is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_GREENASIA_FF=y
-# CONFIG_GREYBUS is not set
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_GTP=m
-CONFIG_HAMACHI=m
-# CONFIG_HAMRADIO is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_MSI=y
-# CONFIG_HDC100X is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_ASUS=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CORSAIR=y
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PLANTRONICS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_HID_SENSOR_ALS is not set
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HOSTAP_CS=m
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HP03 is not set
-CONFIG_HP100=m
-# CONFIG_HP206C is not set
-CONFIG_HP_ACCEL=m
-# CONFIG_HPET is not set
-CONFIG_HP_WATCHDOG=m
-# CONFIG_HPWDT_NMI_DECODING is not set
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_HSR=m
-# CONFIG_HTU21 is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_VIA=m
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HYPERV is not set
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_HID=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C=m
-CONFIG_I2C_MUX=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_SCMI=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_XILINX=m
-CONFIG_I40E=m
-CONFIG_I40EVF=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-CONFIG_I82092=m
-CONFIG_I8K=m
-# CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBM_ASM=m
-CONFIG_IBMASR=m
-CONFIG_IBM_RTL=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_IE6XX_WDT=m
-CONFIG_IFB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGB_HWMON=y
-CONFIG_IGB=m
-CONFIG_IGBVF=m
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_CONFIGFS=m
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_HRTIMER_TRIGGER is not set
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_IIO_ST_PRESS is not set
-CONFIG_IIO_SW_DEVICE=m
-CONFIG_IIO_SW_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-CONFIG_IIO_TIGHTLOOP_TRIGGER=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-# CONFIG_INA2XX_ADC is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET_AH=m
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_SOURCE="/usr/share/v86d/initramfs "
-CONFIG_INPUT_88PM80X_ONKEY=m
-# CONFIG_INPUT_AXP20X_PEK is not set
-CONFIG_INPUT_BMA150=m
-# CONFIG_INPUT_DA9063_ONKEY is not set
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_RETU_PWRBUTTON is not set
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INT3406_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_INTEL_GTT=m
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_IDLE=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IOATDMA=m
-# CONFIG_INTEL_IOMMU is not set
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_ISH_HID=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_INTEL_MEI_WDT=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_INTEL_MIC_BUS=m
-# CONFIG_INTEL_MIC_X100_DMA is not set
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_INTEL_PMC_CORE=y
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INTEL_TELEMETRY=m
-CONFIG_INTEL_VBTN=m
-CONFIG_INTEL_XWAY_PHY=m
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_IOSF_MBI=y
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SSIF is not set
-# CONFIG_IPMI_WATCHDOG is not set
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_SCTP=m
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IPV6_ILA=m
-CONFIG_IPV6=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPVLAN=m
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_IRQ_POLL=y
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISL29125 is not set
-CONFIG_ISO9660_FS=m
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_ITCO_WDT=m
-# CONFIG_ITG3200 is not set
-CONFIG_IWL3945=m
-CONFIG_IWL4965=m
-CONFIG_IWLDVM=m
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_BCAST_FILTERING=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-CONFIG_IWLWIFI_PCIE_RTPM=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_JBD2=m
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
-CONFIG_JME=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_TWIDJOY=m
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_ZHENHUA=m
-# CONFIG_JSA1212 is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_XZ=y
-CONFIG_KEYBOARD_ADC=m
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KMX61 is not set
-# CONFIG_KPROBES is not set
-# CONFIG_KS7010 is not set
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSM=y
-CONFIG_KSZ884X_PCI=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_KVM_COMPAT=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_GUEST=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM=m
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_VFIO=y
-# CONFIG_KXCJK1013 is not set
-# CONFIG_KXSD9 is not set
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-CONFIG_LIB80211_CRYPT_WEP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
-CONFIG_LIBERTAS_CS=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBIPW=m
-CONFIG_LIBNVDIMM=y
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_LIQUIDIO=m
-CONFIG_LLC=m
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-# CONFIG_LNET_SELFTEST is not set
-CONFIG_LOCKD=m
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGO is not set
-CONFIG_LPC_ICH=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LSI_ET1011C_PHY=m
-# CONFIG_LTC2485 is not set
-CONFIG_LTE_GDM724X=m
-# CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LXT_PHY=m
-CONFIG_LZ4_COMPRESS=y
-CONFIG_LZ4HC_COMPRESS=y
-# CONFIG_M62332 is not set
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
-CONFIG_MACB=m
-CONFIG_MACHZ_WDT=m
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MACSEC=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
-CONFIG_MARVELL_PHY=m
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX517 is not set
-CONFIG_MAX63XX_WATCHDOG=m
-# CONFIG_MC3230 is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MD_CLUSTER is not set
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID456=m
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG=y
-CONFIG_MEMORY_BALLOON=y
-# CONFIG_MEMSTICK_DEBUG is not set
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_MEMSTICK_TIFM_MS=m
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MFD_88PM800=m
-CONFIG_MFD_88PM805=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=m
-CONFIG_MFD_DA9062=m
-CONFIG_MFD_DA9063=m
-CONFIG_MFD_DA9150=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_EXYNOS_LPASS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_MFD_MAX14577=m
-CONFIG_MFD_MAX77693=m
-CONFIG_MFD_MAX8907=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_RT5033=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_LP873X=m
-CONFIG_MFD_TPS65086=m
-CONFIG_MFD_TPS65912_I2C=m
-CONFIG_MFD_TPS65912=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MICROSEMI_PHY=m
-CONFIG_MII=m
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_EN=m
-# CONFIG_MLX90614 is not set
-CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_MLXSW_SWITCHX2=m
-# CONFIG_MMA7455_I2C is not set
-CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-CONFIG_MMC35240=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_CB710=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC=m
-CONFIG_MMC_MTK=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDRICOH_CS=m
-# CONFIG_MMC_TEST is not set
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_TOSHIBA_PCI is not set
-CONFIG_MMC_USDHI6ROL0=m
-# CONFIG_MMC_USHC is not set
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MOST is not set
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_MPILIB=m
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL3115 is not set
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS=y
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-CONFIG_MS_BLOCK=m
-CONFIG_MSDOS_FS=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_MSI_WMI=m
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MT7601U=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_MVMDIO=m
-CONFIG_MWAVE=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-CONFIG_MXM_WMI=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_MYRI10GE=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_NATSEMI=m
-# CONFIG_NAU7802 is not set
-CONFIG_ND_BLK=m
-CONFIG_ND_BTT=m
-CONFIG_ND_CLAIM=y
-CONFIG_NE2K_PCI=m
-CONFIG_NET_ACT_CONNMARK=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_NETCONSOLE is not set
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_QCA8K=m
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_QCA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_NET_EGRESS=y
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_SET=m
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_IP_TUNNEL=m
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_PLUG=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_NET_VRF=m
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETXEN_NIC=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NFS_ACL_SUPPORT=m
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD=m
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_SCSILAYOUT is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_META=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_SET_HASH=m
-CONFIG_NFT_SET_RBTREE=m
-CONFIG_NI903X_WDT=m
-CONFIG_NILFS2_FS=m
-CONFIG_NIU=m
-CONFIG_NLMON=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-# CONFIG_NO_HZ is not set
-CONFIG_NORTEL_HERMES=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_NS83820=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-# CONFIG_NUMA is not set
-CONFIG_NVM_DEBUG=y
-CONFIG_NVME_CORE=y
-# CONFIG_NVME_TARGET is not set
-CONFIG_NVM_GENNVM=m
-CONFIG_NVM_RRPC=m
-CONFIG_NVM=y
-CONFIG_NVRAM=m
-CONFIG_NV_TCO=m
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OID_REGISTRY=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_VXLAN=m
-# CONFIG_OPT3001 is not set
-CONFIG_ORANGEFS_FS=m
-CONFIG_ORINOCO_USB=m
-# CONFIG_OSF_PARTITION is not set
-CONFIG_OVERLAY_FS=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
-CONFIG_P54_PCI=m
-CONFIG_P54_USB=m
-# CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
-CONFIG_PAGE_COUNTER=y
-CONFIG_PANASONIC_LAPTOP=m
-# CONFIG_PANEL is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT=y
-# CONFIG_PARIDE is not set
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_SERIAL is not set
-CONFIG_PARPORT=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-CONFIG_PC87413_WDT=m
-CONFIG_PCCARD=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCIE_ECRC=y
-CONFIG_PCI_HERMES=m
-CONFIG_PCI_IOV=y
-# CONFIG_PCI_PASID is not set
-CONFIG_PCIPCWATCHDOG=m
-# CONFIG_PCI_PRI is not set
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCNET32=m
-CONFIG_PD6729=m
-CONFIG_PDC_ADMA=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
-# CONFIG_PGTABLE_MAPPING is not set
-CONFIG_PHANTOM=m
-CONFIG_PHYLIB=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_PHY_TUSB1210=m
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CHERRYVIEW is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
-CONFIG_PINCTRL=y
-# CONFIG_PLIP is not set
-CONFIG_PLX_HERMES=m
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PMBUS=m
-CONFIG_PM_CLK=y
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_PM_DEVFREQ=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_PPDEV=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP=y
-# CONFIG_PPS_CLIENT_PARPORT is not set
-CONFIG_PPS=m
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PRINTER=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_PRISM2_USB is not set
-CONFIG_PRISM54=m
-# CONFIG_PROFILING is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_PVPANIC=m
-CONFIG_QCOM_EMAC=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-CONFIG_QEDE=m
-CONFIG_QED=m
-CONFIG_QED_SRIOV=y
-# CONFIG_QFMT_V2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_QSEMI_PHY=m
-# CONFIG_QUEUED_LOCK_STAT is not set
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_R6040=m
-CONFIG_R8169=m
-CONFIG_R8188EU=m
-CONFIG_R8712U=m
-CONFIG_RAID6_PQ=m
-CONFIG_RAID_ATTRS=m
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RDS_DEBUG is not set
-CONFIG_RDS=m
-CONFIG_RDS_TCP=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_MMIO=y
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_PROC_INFO=y
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_BERLIN is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
-# CONFIG_RESET_ZYNQ is not set
-CONFIG_RETU_WATCHDOG=m
-CONFIG_RFKILL=m
-CONFIG_ROCKER=m
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPR0521 is not set
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00=m
-CONFIG_RT61PCI=m
-CONFIG_RT73USB=m
-CONFIG_RTC_DRV_88PM80X=m
-# CONFIG_RTC_DRV_DA9063 is not set
-CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_I2C_AND_SPI=m
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL8187=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8192E=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTL8821AE=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTLLIB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTS5208=m
-CONFIG_S2IO=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_SAMSUNG_Q10=m
-# CONFIG_SATA_DWC_DEBUG is not set
-CONFIG_SATA_DWC=m
-# CONFIG_SATA_DWC_OLD_DMA is not set
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_SC92031=m
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-# CONFIG_SCSI_ENCLOSURE is not set
-CONFIG_SCSI_ESAS2R=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IMM=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_IZIP_EPP16=y
-CONFIG_SCSI_IZIP_SLOW_CTR=y
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_QLOGIC_1280=m
-# CONFIG_SCSI_SAS_ATA is not set
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SMARTPQI=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_SNIC=m
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_UFS_DWC_TC_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-CONFIG_SDIO_UART=m
-# CONFIG_SECURITY is not set
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_HIH6130=m
-# CONFIG_SENSORS_HMC5843_I2C is not set
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_I5K_AMB=m
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TSL2563 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_SERPORT=m
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_LOGGING=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFI=y
-CONFIG_SGI_IOC4=m
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SI1145 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-CONFIG_SIS190=m
-CONFIG_SIS900=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLHC=y
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLIP=m
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SLIP_SMART is not set
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_SMSC_PHY=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMS_SDIO_DRV=m
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_DICE=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_FM801=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_HWDEP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_MIA=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MPU401_UART=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_NM256=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCXHR=m
-# CONFIG_SND_PORTMAN2X4 is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_RME96=m
-CONFIG_SND_SB_COMMON=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SONICVIBES=m
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_TIMER=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SOLARIS_X86_PARTITION is not set
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SP5100_TCO=m
-# CONFIG_SPEAKUP is not set
-CONFIG_SPMI=m
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_BLOCKIO=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB=m
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_SPROM=y
-# CONFIG_STACKTRACE is not set
-# CONFIG_STAGING_MEDIA is not set
-CONFIG_STAGING=y
-CONFIG_STE10XP=m
-CONFIG_STK3310=m
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PCI=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STP=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_SUNGEM=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_SUN_PARTITION is not set
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SWPHY=y
-# CONFIG_SX9500 is not set
-CONFIG_SXGBE_ETH=m
-# CONFIG_T5403 is not set
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_PEGASUS=m
-CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
-CONFIG_TAHVO_USB=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-CONFIG_TEHUTI=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_RGX=m
-CONFIG_THUNDER_NIC_VF=m
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADS1015 is not set
-CONFIG_TIFM_7XX1=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIGON3=m
-CONFIG_TI_SYSCON_RESET=m
-CONFIG_TLAN=m
-CONFIG_TMD_HERMES=m
-# CONFIG_TMP006 is not set
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-# CONFIG_TPL0102 is not set
-CONFIG_TRIM_UNUSED_KSYMS=y
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2x7x is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-CONFIG_TTPCI_EEPROM=m
-CONFIG_TULIP=m
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TUN=m
-CONFIG_TUN_VNET_CROSS_LE=y
-CONFIG_TYPHOON=m
-CONFIG_UCSI=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-CONFIG_UHID=m
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO=m
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_NETX is not set
-CONFIG_UIO_PCI_GENERIC=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_SERCOS3 is not set
-CONFIG_ULI526X=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_UNISYSSPAR is not set
-CONFIG_UNIX_DIAG=m
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_US5182D is not set
-CONFIG_USB_ACM=m
-CONFIG_USB_AIRSPY=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_AN2720=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_BDC_PCI=m
-CONFIG_USB_BDC_UDC=m
-CONFIG_USB_BELKIN=y
-CONFIG_USB_CATC=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-CONFIG_USB_CONFIGFS=m
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=m
-CONFIG_USB_F_NCM=m
-# CONFIG_USB_FOTG210_UDC is not set
-CONFIG_USB_F_PRINTER=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_SUBSET=m
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGETFS is not set
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_VBUS_DRAW=2
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
-CONFIG_USB_GL860=m
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GOKU=m
-# CONFIG_USB_G_PRINTER is not set
-CONFIG_USB_GR_UDC=m
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_G_WEBCAM is not set
-CONFIG_USB_HACKRF=m
-CONFIG_USB_HCD_BCMA=m
-CONFIG_USB_HCD_SSB=m
-CONFIG_USB_HSIC_USB4604=m
-CONFIG_USB_HSO=m
-CONFIG_USBIP_CORE=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_IPHETH=m
-CONFIG_USBIP_HOST=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_VUDC=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_M5602=m
-CONFIG_USB_M66592=m
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2280=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_OTG_FSM=m
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG=y
-CONFIG_USBPCWATCHDOG=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_PHY=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_USBNET=m
-# CONFIG_USB_USS720 is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VL600=m
-CONFIG_USB_WDM=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USERIO=m
-CONFIG_USER_NS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VEML6070 is not set
-CONFIG_VETH=m
-CONFIG_VFAT_FS=m
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_VHOST=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_VIA_WDT=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_PCI_SKELETON=m
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_PVRUSB2_DVB=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_SAA6752HS=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_GO7007=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW5864=m
-CONFIG_VIDEO_TW686X=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_USBTV=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-# CONFIG_VIPERBOARD_ADC is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_VMD=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_VMXNET3=m
-CONFIG_VORTEX=m
-CONFIG_VSOCKETS=m
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_VXGE=m
-CONFIG_VXLAN=m
-# CONFIG_VZ89X is not set
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_WAFER_WDT=m
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_WCN36XX=m
-CONFIG_WDTPCI=m
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210=m
-# CONFIG_WILC1000_HW_OOB_INTR is not set
-CONFIG_WILC1000=m
-CONFIG_WILC1000_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX=m
-CONFIG_WINBOND_840=m
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_CPUID=m
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_PTDUMP_CORE=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_X2APIC=y
-CONFIG_X86_X32=y
-# CONFIG_XEN is not set
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_IPCOMP=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_XILINX_WATCHDOG=m
-CONFIG_XOR_BLOCKS=m
-CONFIG_YELLOWFIN=m
-CONFIG_YENTA=m
-CONFIG_Z3FOLD=y
-CONFIG_ZBUD=y
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_ZD1211RW=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_ZLIB_DEFLATE=m
-# CONFIG_ZPA2326 is not set
-CONFIG_ZPOOL=y
-CONFIG_ZRAM=m
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_ZSMALLOC=y
-CONFIG_ZSWAP=y
-!CONFIG_ACPI_I2C_OPREGION=
-!CONFIG_ACPI_NUMA=
-!CONFIG_AMD_IOMMU_V2=
-!CONFIG_AMD_NUMA=
-!CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=
-!CONFIG_AX25=
-!CONFIG_BACKTRACE_SELF_TEST=
-!CONFIG_BLK_DEV_IO_TRACE=
-!CONFIG_BOOT_PRINTK_DELAY=
-!CONFIG_BRANCH_PROFILE_NONE=
-!CONFIG_BSD_PROCESS_ACCT_V3=
-!CONFIG_CGROUP_HUGETLB=
-!CONFIG_CONTEXT_SWITCH_TRACER=
-!CONFIG_CPA_DEBUG=
-!CONFIG_CPU_HOTPLUG_STATE_CONTROL=
-!CONFIG_DEBUG_ATOMIC_SLEEP=
-!CONFIG_DEBUG_BLOCK_EXT_DEVT=
-!CONFIG_DEBUG_BOOT_PARAMS=
-!CONFIG_DEBUG_CREDENTIALS=
-!CONFIG_DEBUG_DEVRES=
-!CONFIG_DEBUG_DRIVER=
-!CONFIG_DEBUG_ENTRY=
-!CONFIG_DEBUG_FORCE_WEAK_PER_CPU=
-!CONFIG_DEBUG_INFO=
-!CONFIG_DEBUG_KMEMLEAK=
-!CONFIG_DEBUG_KOBJECT=
-!CONFIG_DEBUG_LIST=
-!CONFIG_DEBUG_LOCK_ALLOC=
-!CONFIG_DEBUG_LOCKING_API_SELFTESTS=
-!CONFIG_DEBUG_MUTEXES=
-!CONFIG_DEBUG_NMI_SELFTEST=
-!CONFIG_DEBUG_NOTIFIERS=
-!CONFIG_DEBUG_NX_TEST=
-!CONFIG_DEBUG_OBJECTS=
-!CONFIG_DEBUG_PAGEALLOC=
-!CONFIG_DEBUG_PAGE_REF=
-!CONFIG_DEBUG_PER_CPU_MAPS=
-!CONFIG_DEBUG_PERF_USE_VMALLOC=
-!CONFIG_DEBUG_PI_LIST=
-!CONFIG_DEBUG_RT_MUTEXES=
-!CONFIG_DEBUG_SG=
-!CONFIG_DEBUG_SHIRQ=
-!CONFIG_DEBUG_SPINLOCK=
-!CONFIG_DEBUG_STACKOVERFLOW=
-!CONFIG_DEBUG_STACK_USAGE=
-!CONFIG_DEBUG_TEST_DRIVER_REMOVE=
-!CONFIG_DEBUG_TLBFLUSH=
-!CONFIG_DEBUG_VIRTUAL=
-!CONFIG_DEBUG_VM=
-!CONFIG_DEBUG_WQ_FORCE_RR_CPU=
-!CONFIG_DEBUG_WW_MUTEX_SLOWPATH=
-!CONFIG_DEFAULT_CUBIC=
-!CONFIG_DEFAULT_RENO=
-!CONFIG_DEFAULT_SECURITY_SELINUX=
-!CONFIG_DEFXX=
-!CONFIG_DETECT_HUNG_TASK=
-!CONFIG_DMAR_TABLE=
-!CONFIG_EDAC_DEBUG=
-!CONFIG_EDAC_DECODE_MCE=
-!CONFIG_EDAC_LEGACY_SYSFS=
-!CONFIG_EDAC_MM_EDAC=
-!CONFIG_EVENT_TRACING=
-!CONFIG_EVM=
-!CONFIG_EXT4_USE_FOR_EXT2=
-!CONFIG_FAULT_INJECTION=
-!CONFIG_FTRACE_STARTUP_TEST=
-!CONFIG_FTRACE_SYSCALLS=
-!CONFIG_FUNCTION_TRACER=
-!CONFIG_GENERIC_TRACER=
-!CONFIG_HAVE_INTEL_TXT=
-!CONFIG_HIST_TRIGGERS=
-!CONFIG_HPET_MMAP=
-!CONFIG_HWLAT_TRACER=
-!CONFIG_IMA=
-!CONFIG_INLINE_READ_UNLOCK=
-!CONFIG_INLINE_READ_UNLOCK_IRQ=
-!CONFIG_INLINE_SPIN_UNLOCK_IRQ=
-!CONFIG_INLINE_WRITE_UNLOCK=
-!CONFIG_INLINE_WRITE_UNLOCK_IRQ=
-!CONFIG_INTEGRITY=
-!CONFIG_INTEGRITY_AUDIT=
-!CONFIG_INTEGRITY_SIGNATURE=
-!CONFIG_INTEL_IOMMU_DEFAULT_ON=
-!CONFIG_INTEL_IOMMU_FLOPPY_WA=
-!CONFIG_INTEL_IOMMU_SVM=
-!CONFIG_INTEL_TXT=
-!CONFIG_INTERVAL_TREE_TEST=
-!CONFIG_IOMMU_API=
-!CONFIG_IOMMU_IOVA=
-!CONFIG_IP_PNP_BOOTP=
-!CONFIG_IP_PNP_DHCP=
-!CONFIG_IP_PNP_RARP=
-!CONFIG_IRQSOFF_TRACER=
-!CONFIG_KALLSYMS_ALL=
-!CONFIG_KGDB=
-!CONFIG_KMEMCHECK=
-!CONFIG_KPROBE_EVENT=
-!CONFIG_KPROBES_SANITY_TEST=
-!CONFIG_KRETPROBES=
-!CONFIG_LATENCYTOP=
-!CONFIG_LOCK_STAT=
-!CONFIG_LOCK_TORTURE_TEST=
-!CONFIG_LOCKUP_DETECTOR=
-!CONFIG_LOGO_LINUX_CLUT224=
-!CONFIG_LOGO_LINUX_MONO=
-!CONFIG_LOGO_LINUX_VGA16=
-!CONFIG_LSM_MMAP_MIN_ADDR=
-!CONFIG_MAXSMP=
-!CONFIG_MCE_AMD_INJ=
-!CONFIG_MD_AUTODETECT=
-!CONFIG_MFD_88PM860X=
-!CONFIG_MFD_AS3711=
-!CONFIG_MFD_DA9052_I2C=
-!CONFIG_MFD_DA9055=
-!CONFIG_MFD_LP8788=
-!CONFIG_MFD_MAX77843=
-!CONFIG_MFD_MAX8925=
-!CONFIG_MFD_MAX8997=
-!CONFIG_MFD_MAX8998=
-!CONFIG_MFD_PALMAS=
-!CONFIG_MFD_RC5T583=
-!CONFIG_MFD_SEC_CORE=
-!CONFIG_MFD_SMSC=
-!CONFIG_MFD_TPS65090=
-!CONFIG_MFD_TPS6586X=
-!CONFIG_MFD_TPS80031=
-!CONFIG_MFD_WM831X_I2C=
-!CONFIG_MFD_WM8350_I2C=
-!CONFIG_MFD_WM8400=
-!CONFIG_MIGRATION=
-!CONFIG_MLX_PLATFORM=
-!CONFIG_MMIOTRACE=
-!CONFIG_MOVABLE_NODE=
-!CONFIG_NEED_MULTIPLE_NODES=
-!CONFIG_NET_DROP_MONITOR=
-!CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=
-!CONFIG_NETFILTER_XT_TARGET_SECMARK=
-!CONFIG_NETLABEL=
-!CONFIG_NET_TCPPROBE=
-!CONFIG_NF_CONNTRACK_SECMARK=
-!CONFIG_NODES_SHIFT=
-!CONFIG_NODES_SPAN_OTHER_NODES=
-!CONFIG_NOP_TRACER=
-!CONFIG_NOTIFIER_ERROR_INJECTION=
-!CONFIG_NUMA_BALANCING=
-!CONFIG_NUMA_EMU=
-!CONFIG_OPROFILE=
-!CONFIG_OPTPROBES=
-!CONFIG_PAGE_OWNER=
-!CONFIG_PCI_DEBUG=
-!CONFIG_PERCPU_TEST=
-!CONFIG_PMIC_ADP5520=
-!CONFIG_PMIC_DA903X=
-!CONFIG_PM_TRACE=
-!CONFIG_PROBE_EVENTS=
-!CONFIG_PROC_VMCORE=
-!CONFIG_PROFILE_ALL_BRANCHES=
-!CONFIG_PROFILE_ANNOTATED_BRANCHES=
-!CONFIG_PROVE_LOCKING=
-!CONFIG_RBTREE_TEST=
-!CONFIG_RCU_EQS_DEBUG=
-!CONFIG_RCU_PERF_TEST=
-!CONFIG_RCU_TORTURE_TEST=
-!CONFIG_RCU_TRACE=
-!CONFIG_READABLE_ASM=
-!CONFIG_RING_BUFFER=
-!CONFIG_RING_BUFFER_BENCHMARK=
-!CONFIG_RING_BUFFER_STARTUP_TEST=
-!CONFIG_ROOT_NFS=
-!CONFIG_SCHED_DEBUG=
-!CONFIG_SCHED_STACK_END_CHECK=
-!CONFIG_SCHEDSTATS=
-!CONFIG_SCHED_TRACER=
-!CONFIG_SECURITY_APPARMOR=
-!CONFIG_SECURITY_LOADPIN=
-!CONFIG_SECURITY_NETWORK=
-!CONFIG_SECURITY_NETWORK_XFRM=
-!CONFIG_SECURITY_PATH=
-!CONFIG_SECURITY_SELINUX=
-!CONFIG_SECURITY_SELINUX_AVC_STATS=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM=
-!CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=
-!CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=
-!CONFIG_SECURITY_SELINUX_DEVELOP=
-!CONFIG_SECURITY_SELINUX_DISABLE=
-!CONFIG_SECURITY_SMACK=
-!CONFIG_SECURITY_TOMOYO=
-!CONFIG_SECURITY_YAMA=
-!CONFIG_SERIAL_8250_DETECT_IRQ=
-!CONFIG_SERIAL_8250_FSL=
-!CONFIG_SERIAL_8250_MANY_PORTS=
-!CONFIG_SERIAL_8250_RSA=
-!CONFIG_SERIAL_8250_SHARE_IRQ=
-!CONFIG_SERIAL_CORE_CONSOLE=
-!CONFIG_SERIAL_EARLYCON=
-!CONFIG_SKFP=
-!CONFIG_SND_SE6X=
-!CONFIG_SND_SEQ_HRTIMER_DEFAULT=
-!CONFIG_STACK_TRACER=
-!CONFIG_STATIC_KEYS_SELFTEST=
-!CONFIG_TCP_CONG_BBR=
-!CONFIG_TCP_CONG_BIC=
-!CONFIG_TCP_CONG_CDG=
-!CONFIG_TCP_CONG_DCTCP=
-!CONFIG_TCP_CONG_HSTCP=
-!CONFIG_TCP_CONG_HTCP=
-!CONFIG_TCP_CONG_HYBLA=
-!CONFIG_TCP_CONG_ILLINOIS=
-!CONFIG_TCP_CONG_LP=
-!CONFIG_TCP_CONG_NV=
-!CONFIG_TCP_CONG_SCALABLE=
-!CONFIG_TCP_CONG_VEGAS=
-!CONFIG_TCP_CONG_VENO=
-!CONFIG_TCP_CONG_WESTWOOD=
-!CONFIG_TCP_CONG_YEAH=
-!CONFIG_TEST_LIST_SORT=
-!CONFIG_THERMAL_HWMON=
-!CONFIG_TIMER_STATS=
-!CONFIG_TOUCHSCREEN_AD7879=
-!CONFIG_TOUCHSCREEN_ATMEL_MXT=
-!CONFIG_TOUCHSCREEN_BU21013=
-!CONFIG_TOUCHSCREEN_CYTTSP4_CORE=
-!CONFIG_TOUCHSCREEN_CYTTSP_CORE=
-!CONFIG_TOUCHSCREEN_DYNAPRO=
-!CONFIG_TOUCHSCREEN_EDT_FT5X06=
-!CONFIG_TOUCHSCREEN_EETI=
-!CONFIG_TOUCHSCREEN_EGALAX_SERIAL=
-!CONFIG_TOUCHSCREEN_EKTF2127=
-!CONFIG_TOUCHSCREEN_ELAN=
-!CONFIG_TOUCHSCREEN_ELO=
-!CONFIG_TOUCHSCREEN_FUJITSU=
-!CONFIG_TOUCHSCREEN_GUNZE=
-!CONFIG_TOUCHSCREEN_HAMPSHIRE=
-!CONFIG_TOUCHSCREEN_ILI210X=
-!CONFIG_TOUCHSCREEN_INEXIO=
-!CONFIG_TOUCHSCREEN_MAX11801=
-!CONFIG_TOUCHSCREEN_MCS5000=
-!CONFIG_TOUCHSCREEN_MELFAS_MIP4=
-!CONFIG_TOUCHSCREEN_MK712=
-!CONFIG_TOUCHSCREEN_MMS114=
-!CONFIG_TOUCHSCREEN_MTOUCH=
-!CONFIG_TOUCHSCREEN_PENMOUNT=
-!CONFIG_TOUCHSCREEN_PIXCIR=
-!CONFIG_TOUCHSCREEN_PROPERTIES=
-!CONFIG_TOUCHSCREEN_ROHM_BU21023=
-!CONFIG_TOUCHSCREEN_SILEAD=
-!CONFIG_TOUCHSCREEN_ST1232=
-!CONFIG_TOUCHSCREEN_SX8654=
-!CONFIG_TOUCHSCREEN_TOUCHIT213=
-!CONFIG_TOUCHSCREEN_TOUCHRIGHT=
-!CONFIG_TOUCHSCREEN_TOUCHWIN=
-!CONFIG_TOUCHSCREEN_TPS6507X=
-!CONFIG_TOUCHSCREEN_TSC2004=
-!CONFIG_TOUCHSCREEN_TSC2007=
-!CONFIG_TOUCHSCREEN_TSC_SERIO=
-!CONFIG_TOUCHSCREEN_USB_COMPOSITE=
-!CONFIG_TOUCHSCREEN_WACOM_I2C=
-!CONFIG_TOUCHSCREEN_WACOM_W8001=
-!CONFIG_TOUCHSCREEN_WDT87XX_I2C=
-!CONFIG_TRACE_CLOCK=
-!CONFIG_TRACE_ENUM_MAP_FILE=
-!CONFIG_TRACEPOINT_BENCHMARK=
-!CONFIG_TRACEPOINTS=
-!CONFIG_TRACER_SNAPSHOT=
-!CONFIG_TRACING=
-!CONFIG_TREE_RCU=
-!CONFIG_TWL4030_CORE=
-!CONFIG_TWL6040_CORE=
-!CONFIG_UPROBE_EVENT=
-!CONFIG_USE_PERCPU_NUMA_NODE_ID=
-!CONFIG_VFIO=
-!CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=
-!CONFIG_WQ_WATCHDOG=
-!CONFIG_X86_64_ACPI_NUMA=
-!CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=
-!CONFIG_X86_DEBUG_FPU=
-!CONFIG_X86_DECODER_SELFTEST=
-!CONFIG_X86_GOLDFISH=
-!CONFIG_X86_INTEL_MID=
-!CONFIG_X86_PTDUMP=
-!CONFIG_X86_VSMP=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/30-hyperv b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/30-hyperv
deleted file mode 100644
index b499ead54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/30-hyperv
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-CONFIG_FB_HYPERV=m
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_UTILS=m
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
deleted file mode 100644
index 1d1a4e7ba..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
+++ /dev/null
@@ -1,362 +0,0 @@
-# Calculate format=kernel name=.config os_linux_system==server
-# CONFIG_CYPRESS_FIRMWARE is not set
-# CONFIG_DRM_I810 is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_HZ_300=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_PCI_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_USB_SUPPORT is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-CONFIG_TREE_RCU=y
-# CONFIG_TTPCI_EEPROM is not set
-!CONFIG_DVB_AF9013=
-!CONFIG_DVB_AF9033=
-!CONFIG_DVB_AS102=
-!CONFIG_DVB_AS102_FE=
-!CONFIG_DVB_AU8522=
-!CONFIG_DVB_AU8522_DTV=
-!CONFIG_DVB_AU8522_V4L=
-!CONFIG_DVB_AV7110=
-!CONFIG_DVB_AV7110_IR=
-!CONFIG_DVB_AV7110_OSD=
-!CONFIG_DVB_B2C2_FLEXCOP=
-!CONFIG_DVB_B2C2_FLEXCOP_PCI=
-!CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG=
-!CONFIG_DVB_B2C2_FLEXCOP_USB=
-!CONFIG_DVB_BCM3510=
-!CONFIG_DVB_BUDGET=
-!CONFIG_DVB_BUDGET_AV=
-!CONFIG_DVB_BUDGET_CORE=
-!CONFIG_DVB_BUDGET_PATCH=
-!CONFIG_DVB_CORE=
-!CONFIG_DVB_CX24116=
-!CONFIG_DVB_CX24120=
-!CONFIG_DVB_CX24123=
-!CONFIG_DVB_CXD2820R=
-!CONFIG_DVB_DDBRIDGE=
-!CONFIG_DVB_DRXK=
-!CONFIG_DVB_DYNAMIC_MINORS=
-!CONFIG_DVB_EC100=
-!CONFIG_DVB_FIREDTV=
-!CONFIG_DVB_ISL6405=
-!CONFIG_DVB_ISL6421=
-!CONFIG_DVB_ISL6423=
-!CONFIG_DVB_L64781=
-!CONFIG_DVB_LG2160=
-!CONFIG_DVB_LGDT3305=
-!CONFIG_DVB_LGDT330X=
-!CONFIG_DVB_LNBP21=
-!CONFIG_DVB_M88DS3103=
-!CONFIG_DVB_MAX_ADAPTERS=
-!CONFIG_DVB_MT312=
-!CONFIG_DVB_MT352=
-!CONFIG_DVB_NET=
-!CONFIG_DVB_NGENE=
-!CONFIG_DVB_NXT200X=
-!CONFIG_DVB_PLATFORM_DRIVERS=
-!CONFIG_DVB_PLL=
-!CONFIG_DVB_PLUTO2=
-!CONFIG_DVB_PT1=
-!CONFIG_DVB_PT3=
-!CONFIG_DVB_RTL2830=
-!CONFIG_DVB_RTL2832=
-!CONFIG_DVB_RTL2832_SDR=
-!CONFIG_DVB_S5H1409=
-!CONFIG_DVB_S5H1411=
-!CONFIG_DVB_S5H1420=
-!CONFIG_DVB_SI2168=
-!CONFIG_DVB_SP2=
-!CONFIG_DVB_SP8870=
-!CONFIG_DVB_STB0899=
-!CONFIG_DVB_STV0297=
-!CONFIG_DVB_STV0299=
-!CONFIG_DVB_STV0900=
-!CONFIG_DVB_STV090x=
-!CONFIG_DVB_STV6110=
-!CONFIG_DVB_STV6110x=
-!CONFIG_DVB_TC90522=
-!CONFIG_DVB_TDA10021=
-!CONFIG_DVB_TDA10023=
-!CONFIG_DVB_TDA10048=
-!CONFIG_DVB_TDA1004X=
-!CONFIG_DVB_TDA10086=
-!CONFIG_DVB_TDA18271C2DD=
-!CONFIG_DVB_TDA8083=
-!CONFIG_DVB_TDA8261=
-!CONFIG_DVB_TDA826X=
-!CONFIG_DVB_TS2020=
-!CONFIG_DVB_TTUSB_BUDGET=
-!CONFIG_DVB_TTUSB_DEC=
-!CONFIG_DVB_TUA6100=
-!CONFIG_DVB_TUNER_CX24113=
-!CONFIG_DVB_TUNER_ITD1000=
-!CONFIG_DVB_USB_AF9015=
-!CONFIG_DVB_USB_AF9035=
-!CONFIG_DVB_USB_ANYSEE=
-!CONFIG_DVB_USB_AU6610=
-!CONFIG_DVB_USB_AZ6007=
-!CONFIG_DVB_USB_CE6230=
-!CONFIG_DVB_USB_DVBSKY=
-!CONFIG_DVB_USB_EC168=
-!CONFIG_DVB_USB_GL861=
-!CONFIG_DVB_USB_MXL111SF=
-!CONFIG_DVB_USB_RTL28XXU=
-!CONFIG_DVB_USB_V2=
-!CONFIG_DVB_VES1820=
-!CONFIG_DVB_VES1X93=
-!CONFIG_DVB_ZL10036=
-!CONFIG_DVB_ZL10039=
-!CONFIG_DVB_ZL10353=
-!CONFIG_FRAME_VECTOR=
-!CONFIG_JOYSTICK_A3D=
-!CONFIG_JOYSTICK_ADI=
-!CONFIG_JOYSTICK_ANALOG=
-!CONFIG_JOYSTICK_AS5011=
-!CONFIG_JOYSTICK_COBRA=
-!CONFIG_JOYSTICK_DB9=
-!CONFIG_JOYSTICK_GAMECON=
-!CONFIG_JOYSTICK_GF2K=
-!CONFIG_JOYSTICK_GRIP=
-!CONFIG_JOYSTICK_GRIP_MP=
-!CONFIG_JOYSTICK_GUILLEMOT=
-!CONFIG_JOYSTICK_IFORCE=
-!CONFIG_JOYSTICK_IFORCE_232=
-!CONFIG_JOYSTICK_IFORCE_USB=
-!CONFIG_JOYSTICK_INTERACT=
-!CONFIG_JOYSTICK_JOYDUMP=
-!CONFIG_JOYSTICK_MAGELLAN=
-!CONFIG_JOYSTICK_SIDEWINDER=
-!CONFIG_JOYSTICK_SPACEBALL=
-!CONFIG_JOYSTICK_SPACEORB=
-!CONFIG_JOYSTICK_STINGER=
-!CONFIG_JOYSTICK_TMDC=
-!CONFIG_JOYSTICK_TURBOGRAFX=
-!CONFIG_JOYSTICK_TWIDJOY=
-!CONFIG_JOYSTICK_WALKERA0701=
-!CONFIG_JOYSTICK_WARRIOR=
-!CONFIG_JOYSTICK_XPAD=
-!CONFIG_JOYSTICK_XPAD_FF=
-!CONFIG_JOYSTICK_XPAD_LEDS=
-!CONFIG_JOYSTICK_ZHENHUA=
-!CONFIG_MAC_EMUMOUSEBTN=
-!CONFIG_MEDIA_ATTACH=
-!CONFIG_MEDIA_COMMON_OPTIONS=
-!CONFIG_MEDIA_CONTROLLER=
-!CONFIG_MEDIA_SUBDRV_AUTOSELECT=
-!CONFIG_MEDIA_TUNER=
-!CONFIG_MEDIA_TUNER_E4000=
-!CONFIG_MEDIA_TUNER_FC0011=
-!CONFIG_MEDIA_TUNER_FC0012=
-!CONFIG_MEDIA_TUNER_FC0013=
-!CONFIG_MEDIA_TUNER_FC2580=
-!CONFIG_MEDIA_TUNER_IT913X=
-!CONFIG_MEDIA_TUNER_MC44S803=
-!CONFIG_MEDIA_TUNER_MT2060=
-!CONFIG_MEDIA_TUNER_MT2063=
-!CONFIG_MEDIA_TUNER_MT20XX=
-!CONFIG_MEDIA_TUNER_MT2131=
-!CONFIG_MEDIA_TUNER_MXL301RF=
-!CONFIG_MEDIA_TUNER_MXL5005S=
-!CONFIG_MEDIA_TUNER_MXL5007T=
-!CONFIG_MEDIA_TUNER_QM1D1C0042=
-!CONFIG_MEDIA_TUNER_QT1010=
-!CONFIG_MEDIA_TUNER_R820T=
-!CONFIG_MEDIA_TUNER_SI2157=
-!CONFIG_MEDIA_TUNER_SIMPLE=
-!CONFIG_MEDIA_TUNER_TDA18212=
-!CONFIG_MEDIA_TUNER_TDA18218=
-!CONFIG_MEDIA_TUNER_TDA18271=
-!CONFIG_MEDIA_TUNER_TDA827X=
-!CONFIG_MEDIA_TUNER_TDA8290=
-!CONFIG_MEDIA_TUNER_TDA9887=
-!CONFIG_MEDIA_TUNER_TUA9001=
-!CONFIG_MEDIA_TUNER_XC2028=
-!CONFIG_MEDIA_TUNER_XC4000=
-!CONFIG_MEDIA_TUNER_XC5000=
-!CONFIG_PREEMPT_COUNT=
-!CONFIG_PREEMPT_RCU=
-!CONFIG_SMS_SDIO_DRV=
-!CONFIG_SMS_SIANO_MDTV=
-!CONFIG_SMS_USB_DRV=
-!CONFIG_TABLET_SERIAL_WACOM4=
-!CONFIG_TABLET_USB_ACECAD=
-!CONFIG_TABLET_USB_AIPTEK=
-!CONFIG_TABLET_USB_GTCO=
-!CONFIG_TABLET_USB_HANWANG=
-!CONFIG_TABLET_USB_KBTAB=
-!CONFIG_UNINLINE_SPIN_UNLOCK=
-!CONFIG_USB_AIRSPY=
-!CONFIG_USB_CONFIGFS_F_UVC=
-!CONFIG_USB_GL860=
-!CONFIG_USB_GSPCA=
-!CONFIG_USB_GSPCA_BENQ=
-!CONFIG_USB_GSPCA_CONEX=
-!CONFIG_USB_GSPCA_CPIA1=
-!CONFIG_USB_GSPCA_DTCS033=
-!CONFIG_USB_GSPCA_ETOMS=
-!CONFIG_USB_GSPCA_FINEPIX=
-!CONFIG_USB_GSPCA_JEILINJ=
-!CONFIG_USB_GSPCA_JL2005BCD=
-!CONFIG_USB_GSPCA_KINECT=
-!CONFIG_USB_GSPCA_KONICA=
-!CONFIG_USB_GSPCA_MARS=
-!CONFIG_USB_GSPCA_MR97310A=
-!CONFIG_USB_GSPCA_NW80X=
-!CONFIG_USB_GSPCA_OV519=
-!CONFIG_USB_GSPCA_OV534=
-!CONFIG_USB_GSPCA_OV534_9=
-!CONFIG_USB_GSPCA_PAC207=
-!CONFIG_USB_GSPCA_PAC7302=
-!CONFIG_USB_GSPCA_PAC7311=
-!CONFIG_USB_GSPCA_SE401=
-!CONFIG_USB_GSPCA_SN9C2028=
-!CONFIG_USB_GSPCA_SN9C20X=
-!CONFIG_USB_GSPCA_SONIXB=
-!CONFIG_USB_GSPCA_SONIXJ=
-!CONFIG_USB_GSPCA_SPCA1528=
-!CONFIG_USB_GSPCA_SPCA500=
-!CONFIG_USB_GSPCA_SPCA501=
-!CONFIG_USB_GSPCA_SPCA505=
-!CONFIG_USB_GSPCA_SPCA506=
-!CONFIG_USB_GSPCA_SPCA508=
-!CONFIG_USB_GSPCA_SPCA561=
-!CONFIG_USB_GSPCA_SQ905=
-!CONFIG_USB_GSPCA_SQ905C=
-!CONFIG_USB_GSPCA_SQ930X=
-!CONFIG_USB_GSPCA_STK014=
-!CONFIG_USB_GSPCA_STK1135=
-!CONFIG_USB_GSPCA_STV0680=
-!CONFIG_USB_GSPCA_SUNPLUS=
-!CONFIG_USB_GSPCA_T613=
-!CONFIG_USB_GSPCA_TOPRO=
-!CONFIG_USB_GSPCA_TOUPTEK=
-!CONFIG_USB_GSPCA_TV8532=
-!CONFIG_USB_GSPCA_VC032X=
-!CONFIG_USB_GSPCA_VICAM=
-!CONFIG_USB_GSPCA_XIRLINK_CIT=
-!CONFIG_USB_GSPCA_ZC3XX=
-!CONFIG_USB_HACKRF=
-!CONFIG_USB_M5602=
-!CONFIG_USB_PWC=
-!CONFIG_USB_PWC_DEBUG=
-!CONFIG_USB_PWC_INPUT_EVDEV=
-!CONFIG_USB_S2255=
-!CONFIG_USB_STKWEBCAM=
-!CONFIG_USB_STV06XX=
-!CONFIG_USB_VIDEO_CLASS=
-!CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=
-!CONFIG_USB_ZR364XX=
-!CONFIG_V4L_MEM2MEM_DRIVERS=
-!CONFIG_V4L_PLATFORM_DRIVERS=
-!CONFIG_V4L_TEST_DRIVERS=
-!CONFIG_VIDEO_ADV7170=
-!CONFIG_VIDEO_ADV7175=
-!CONFIG_VIDEO_AU0828=
-!CONFIG_VIDEO_AU0828_V4L2=
-!CONFIG_VIDEO_BT819=
-!CONFIG_VIDEO_BT856=
-!CONFIG_VIDEO_BT866=
-!CONFIG_VIDEOBUF2_CORE=
-!CONFIG_VIDEOBUF2_DMA_CONTIG=
-!CONFIG_VIDEOBUF2_DMA_SG=
-!CONFIG_VIDEOBUF2_DVB=
-!CONFIG_VIDEOBUF2_MEMOPS=
-!CONFIG_VIDEOBUF2_VMALLOC=
-!CONFIG_VIDEOBUF_DMA_SG=
-!CONFIG_VIDEOBUF_GEN=
-!CONFIG_VIDEOBUF_VMALLOC=
-!CONFIG_VIDEO_CPIA2=
-!CONFIG_VIDEO_CS53L32A=
-!CONFIG_VIDEO_CX2341X=
-!CONFIG_VIDEO_CX25821=
-!CONFIG_VIDEO_CX25821_ALSA=
-!CONFIG_VIDEO_CX25840=
-!CONFIG_VIDEO_DEV=
-!CONFIG_VIDEO_DT3155=
-!CONFIG_VIDEO_EM28XX=
-!CONFIG_VIDEO_EM28XX_ALSA=
-!CONFIG_VIDEO_EM28XX_DVB=
-!CONFIG_VIDEO_EM28XX_V4L2=
-!CONFIG_VIDEO_GO7007=
-!CONFIG_VIDEO_GO7007_LOADER=
-!CONFIG_VIDEO_GO7007_USB=
-!CONFIG_VIDEO_GO7007_USB_S2250_BOARD=
-!CONFIG_VIDEO_HDPVR=
-!CONFIG_VIDEO_HEXIUM_GEMINI=
-!CONFIG_VIDEO_HEXIUM_ORION=
-!CONFIG_VIDEO_KS0127=
-!CONFIG_VIDEO_MEYE=
-!CONFIG_VIDEO_MSP3400=
-!CONFIG_VIDEO_MT9V011=
-!CONFIG_VIDEO_MXB=
-!CONFIG_VIDEO_OV7640=
-!CONFIG_VIDEO_PVRUSB2=
-!CONFIG_VIDEO_PVRUSB2_DEBUGIFC=
-!CONFIG_VIDEO_PVRUSB2_DVB=
-!CONFIG_VIDEO_PVRUSB2_SYSFS=
-!CONFIG_VIDEO_SAA6588=
-!CONFIG_VIDEO_SAA6752HS=
-!CONFIG_VIDEO_SAA7110=
-!CONFIG_VIDEO_SAA711X=
-!CONFIG_VIDEO_SAA7134=
-!CONFIG_VIDEO_SAA7134_ALSA=
-!CONFIG_VIDEO_SAA7134_DVB=
-!CONFIG_VIDEO_SAA7134_GO7007=
-!CONFIG_VIDEO_SAA7146=
-!CONFIG_VIDEO_SAA7146_VV=
-!CONFIG_VIDEO_SAA7164=
-!CONFIG_VIDEO_SAA7185=
-!CONFIG_VIDEO_SOLO6X10=
-!CONFIG_VIDEO_SONY_BTF_MPX=
-!CONFIG_VIDEO_STK1160=
-!CONFIG_VIDEO_STK1160_AC97=
-!CONFIG_VIDEO_STK1160_COMMON=
-!CONFIG_VIDEO_TDA9840=
-!CONFIG_VIDEO_TEA6415C=
-!CONFIG_VIDEO_TEA6420=
-!CONFIG_VIDEO_TUNER=
-!CONFIG_VIDEO_TVEEPROM=
-!CONFIG_VIDEO_TVP5150=
-!CONFIG_VIDEO_TW2804=
-!CONFIG_VIDEO_TW68=
-!CONFIG_VIDEO_TW9903=
-!CONFIG_VIDEO_TW9906=
-!CONFIG_VIDEO_UDA1342=
-!CONFIG_VIDEO_USBTV=
-!CONFIG_VIDEO_USBVISION=
-!CONFIG_VIDEO_V4L2=
-!CONFIG_VIDEO_VPX3220=
-!CONFIG_VIDEO_WM8775=
-!CONFIG_VIDEO_ZORAN=
-!CONFIG_VIDEO_ZORAN_AVS6EYES=
-!CONFIG_VIDEO_ZORAN_BUZ=
-!CONFIG_VIDEO_ZORAN_DC10=
-!CONFIG_VIDEO_ZORAN_DC30=
-!CONFIG_VIDEO_ZORAN_LML33=
-!CONFIG_VIDEO_ZORAN_LML33R10=
-!CONFIG_VIDEO_ZORAN_ZR36060=
-!CONFIG_DVB_A8293=
-!CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=
-!CONFIG_DVB_CX22700=
-!CONFIG_DVB_DRX39XYJ=
-!CONFIG_DVB_DRXD=
-!CONFIG_DVB_MB86A20S=
-!CONFIG_DVB_S921=
-!CONFIG_DVB_TDA10071=
-!CONFIG_SMS_SIANO_DEBUGFS=
-!CONFIG_USB_G_WEBCAM=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
deleted file mode 100644
index b7ef63ce1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-# Calculate format=diff pkg(sys-devel/gcc)>=4.9
-WARNING - this version of the patch works with version 4.9+ of gcc and with
-kernel version 3.15.x+ and should NOT be applied when compiling on older
-versions due to name changes of the flags with the 4.9 release of gcc.
-Use the older version of this patch hosted on the same github for older
-versions of gcc. For example:
-
-corei7 --> nehalem
-corei7-avx --> sandybridge
-core-avx-i --> ivybridge
-core-avx2 --> haswell
-
-For more, see: https://gcc.gnu.org/gcc-4.9/changes.html
-
-It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes.
-Note that upstream is using the deprecated 'match=atom' flags when I believe it
-should use the newer 'march=bonnell' flag for atom processors.
-
-I have made that change to this patch set as well.  See the following kernel
-bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461
-
-This patch will expand the number of microarchitectures to include new
-processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family
-14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD
-Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core
-i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen
-Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th
-Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag.
-
-Small but real speed increases are measurable using a make endpoint comparing
-a generic kernel to one built with one of the respective microarchs.
-
-See the following experimental evidence supporting this statement:
-https://github.com/graysky2/kernel_gcc_patch
-
-REQUIREMENTS
-linux version >=3.15
-gcc version >=4.9
-
---- a/arch/x86/include/asm/module.h	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/include/asm/module.h	2014-09-13 09:37:16.721385247 -0400
-@@ -15,6 +15,20 @@
- #define MODULE_PROC_FAMILY "586MMX "
- #elif defined CONFIG_MCORE2
- #define MODULE_PROC_FAMILY "CORE2 "
-+#elif defined CONFIG_MNATIVE
-+#define MODULE_PROC_FAMILY "NATIVE "
-+#elif defined CONFIG_MNEHALEM
-+#define MODULE_PROC_FAMILY "NEHALEM "
-+#elif defined CONFIG_MWESTMERE
-+#define MODULE_PROC_FAMILY "WESTMERE "
-+#elif defined CONFIG_MSANDYBRIDGE
-+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
-+#elif defined CONFIG_MIVYBRIDGE
-+#define MODULE_PROC_FAMILY "IVYBRIDGE "
-+#elif defined CONFIG_MHASWELL
-+#define MODULE_PROC_FAMILY "HASWELL "
-+#elif defined CONFIG_MBROADWELL
-+#define MODULE_PROC_FAMILY "BROADWELL "
- #elif defined CONFIG_MATOM
- #define MODULE_PROC_FAMILY "ATOM "
- #elif defined CONFIG_M686
-@@ -33,6 +47,20 @@
- #define MODULE_PROC_FAMILY "K7 "
- #elif defined CONFIG_MK8
- #define MODULE_PROC_FAMILY "K8 "
-+#elif defined CONFIG_MK8SSE3
-+#define MODULE_PROC_FAMILY "K8SSE3 "
-+#elif defined CONFIG_MK10
-+#define MODULE_PROC_FAMILY "K10 "
-+#elif defined CONFIG_MBARCELONA
-+#define MODULE_PROC_FAMILY "BARCELONA "
-+#elif defined CONFIG_MBOBCAT
-+#define MODULE_PROC_FAMILY "BOBCAT "
-+#elif defined CONFIG_MBULLDOZER
-+#define MODULE_PROC_FAMILY "BULLDOZER "
-+#elif defined CONFIG_MPILEDRIVER
-+#define MODULE_PROC_FAMILY "PILEDRIVER "
-+#elif defined CONFIG_MJAGUAR
-+#define MODULE_PROC_FAMILY "JAGUAR "
- #elif defined CONFIG_MELAN
- #define MODULE_PROC_FAMILY "ELAN "
- #elif defined CONFIG_MCRUSOE
---- a/arch/x86/Kconfig.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Kconfig.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -137,9 +137,8 @@ config MPENTIUM4
- 		-Paxville
- 		-Dempsey
- 
--
- config MK6
--	bool "K6/K6-II/K6-III"
-+	bool "AMD K6/K6-II/K6-III"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD K6-family processor.  Enables use of
-@@ -147,7 +146,7 @@ config MK6
- 	  flags to GCC.
- 
- config MK7
--	bool "Athlon/Duron/K7"
-+	bool "AMD Athlon/Duron/K7"
- 	depends on X86_32
- 	---help---
- 	  Select this for an AMD Athlon K7-family processor.  Enables use of
-@@ -155,12 +154,62 @@ config MK7
- 	  flags to GCC.
- 
- config MK8
--	bool "Opteron/Athlon64/Hammer/K8"
-+	bool "AMD Opteron/Athlon64/Hammer/K8"
- 	---help---
- 	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.
- 	  Enables use of some extended instructions, and passes appropriate
- 	  optimization flags to GCC.
- 
-+config MK8SSE3
-+	bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
-+	---help---
-+	  Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MK10
-+	bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
-+	---help---
-+	  Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
-+		Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
-+	  Enables use of some extended instructions, and passes appropriate
-+	  optimization flags to GCC.
-+
-+config MBARCELONA
-+	bool "AMD Barcelona"
-+	---help---
-+	  Select this for AMD Barcelona and newer processors.
-+
-+	  Enables -march=barcelona
-+
-+config MBOBCAT
-+	bool "AMD Bobcat"
-+	---help---
-+	  Select this for AMD Bobcat processors.
-+
-+	  Enables -march=btver1
-+
-+config MBULLDOZER
-+	bool "AMD Bulldozer"
-+	---help---
-+	  Select this for AMD Bulldozer processors.
-+
-+	  Enables -march=bdver1
-+
-+config MPILEDRIVER
-+	bool "AMD Piledriver"
-+	---help---
-+	  Select this for AMD Piledriver processors.
-+
-+	  Enables -march=bdver2
-+
-+config MJAGUAR
-+	bool "AMD Jaguar"
-+	---help---
-+	  Select this for AMD Jaguar processors.
-+
-+	  Enables -march=btver2
-+
- config MCRUSOE
- 	bool "Crusoe"
- 	depends on X86_32
-@@ -251,8 +300,17 @@ config MPSC
- 	  using the cpu family field
- 	  in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
- 
-+config MATOM
-+	bool "Intel Atom"
-+	---help---
-+
-+	  Select this for the Intel Atom platform. Intel Atom CPUs have an
-+	  in-order pipelining architecture and thus can benefit from
-+	  accordingly optimized code. Use a recent GCC with specific Atom
-+	  support in order to fully benefit from selecting this option.
-+
- config MCORE2
--	bool "Core 2/newer Xeon"
-+	bool "Intel Core 2"
- 	---help---
- 
- 	  Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
-@@ -260,14 +318,55 @@ config MCORE2
- 	  family in /proc/cpuinfo. Newer ones have 6 and older ones 15
- 	  (not a typo)
- 
--config MATOM
--	bool "Intel Atom"
-+	  Enables -march=core2
-+
-+config MNEHALEM
-+	bool "Intel Nehalem"
- 	---help---
- 
--	  Select this for the Intel Atom platform. Intel Atom CPUs have an
--	  in-order pipelining architecture and thus can benefit from
--	  accordingly optimized code. Use a recent GCC with specific Atom
--	  support in order to fully benefit from selecting this option.
-+	  Select this for 1st Gen Core processors in the Nehalem family.
-+
-+	  Enables -march=nehalem
-+
-+config MWESTMERE
-+	bool "Intel Westmere"
-+	---help---
-+
-+	  Select this for the Intel Westmere formerly Nehalem-C family.
-+
-+	  Enables -march=westmere
-+
-+config MSANDYBRIDGE
-+	bool "Intel Sandy Bridge"
-+	---help---
-+
-+	  Select this for 2nd Gen Core processors in the Sandy Bridge family.
-+
-+	  Enables -march=sandybridge
-+
-+config MIVYBRIDGE
-+	bool "Intel Ivy Bridge"
-+	---help---
-+
-+	  Select this for 3rd Gen Core processors in the Ivy Bridge family.
-+
-+	  Enables -march=ivybridge
-+
-+config MHASWELL
-+	bool "Intel Haswell"
-+	---help---
-+
-+	  Select this for 4th Gen Core processors in the Haswell family.
-+
-+	  Enables -march=haswell
-+
-+config MBROADWELL
-+	bool "Intel Broadwell"
-+	---help---
-+
-+	  Select this for 5th Gen Core processors in the Broadwell family.
-+
-+	  Enables -march=broadwell
- 
- config GENERIC_CPU
- 	bool "Generic-x86-64"
-@@ -276,6 +375,19 @@ config GENERIC_CPU
- 	  Generic x86-64 CPU.
- 	  Run equally well on all x86-64 CPUs.
- 
-+config MNATIVE
-+ bool "Native optimizations autodetected by GCC"
-+ ---help---
-+
-+   GCC 4.2 and above support -march=native, which automatically detects
-+   the optimum settings to use based on your processor. -march=native 
-+   also detects and applies additional settings beyond -march specific
-+   to your CPU, (eg. -msse4). Unless you have a specific reason not to
-+   (e.g. distcc cross-compiling), you should probably be using
-+   -march=native rather than anything listed below.
-+
-+   Enables -march=native
-+
- endchoice
- 
- config X86_GENERIC
-@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT
- config X86_L1_CACHE_SHIFT
- 	int
- 	default "7" if MPENTIUM4 || MPSC
--	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
-+	default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
- 	default "4" if MELAN || M486 || MGEODEGX1
- 	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
- 
-@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16
- 
- config X86_INTEL_USERCOPY
- 	def_bool y
--	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
-+	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE
- 
- config X86_USE_PPRO_CHECKSUM
- 	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE
- 
- config X86_USE_3DNOW
- 	def_bool y
-@@ -359,17 +471,17 @@ config X86_P6_NOP
- 
- config X86_TSC
- 	def_bool y
--	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
-+	depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64
- 
- config X86_CMPXCHG64
- 	def_bool y
--	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
-+	depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE
- 
- # this should be set for all -march=.. options where the compiler
- # generates cmov.
- config X86_CMOV
- 	def_bool y
--	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
-+	depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX)
- 
- config X86_MINIMUM_CPU_FAMILY
- 	int
---- a/arch/x86/Makefile	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile	2014-09-13 09:37:16.721385247 -0400
-@@ -92,13 +92,33 @@ else
- 	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
- 
-         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
-+        cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
-         cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
-+        cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8)
-+        cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
-+        cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
-+        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
-+        cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
-+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
-+        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
-         cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
- 
-         cflags-$(CONFIG_MCORE2) += \
--                $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
--	cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
--		$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+                $(call cc-option,-march=core2,$(call cc-option,-mtune=core2))
-+        cflags-$(CONFIG_MNEHALEM) += \
-+                $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem))
-+        cflags-$(CONFIG_MWESTMERE) += \
-+                $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere))
-+        cflags-$(CONFIG_MSANDYBRIDGE) += \
-+                $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge))
-+        cflags-$(CONFIG_MIVYBRIDGE) += \
-+                $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge))
-+        cflags-$(CONFIG_MHASWELL) += \
-+                $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell))
-+        cflags-$(CONFIG_MBROADWELL) += \
-+                $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell))
-+        cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \
-+                $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
-         cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
-         KBUILD_CFLAGS += $(cflags-y)
- 
---- a/arch/x86/Makefile_32.cpu	2014-08-03 18:25:02.000000000 -0400
-+++ b/arch/x86/Makefile_32.cpu	2014-09-13 09:37:16.721385247 -0400
-@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6)		+= -march=k6
- # Please note, that patches that add -march=athlon-xp and friends are pointless.
- # They make zero difference whatsosever to performance at this time.
- cflags-$(CONFIG_MK7)		+= -march=athlon
-+cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native)
- cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)
-+cflags-$(CONFIG_MK8SSE3)		+= $(call cc-option,-march=k8-sse3,-march=athlon)
-+cflags-$(CONFIG_MK10)	+= $(call cc-option,-march=amdfam10,-march=athlon)
-+cflags-$(CONFIG_MBARCELONA)	+= $(call cc-option,-march=barcelona,-march=athlon)
-+cflags-$(CONFIG_MBOBCAT)	+= $(call cc-option,-march=btver1,-march=athlon)
-+cflags-$(CONFIG_MBULLDOZER)	+= $(call cc-option,-march=bdver1,-march=athlon)
-+cflags-$(CONFIG_MPILEDRIVER)	+= $(call cc-option,-march=bdver2,-march=athlon)
-+cflags-$(CONFIG_MJAGUAR)	+= $(call cc-option,-march=btver2,-march=athlon)
- cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0
- cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)
-@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-
- cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)
- cflags-$(CONFIG_MVIAC7)		+= -march=i686
- cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)
--cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \
--	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
-+cflags-$(CONFIG_MNEHALEM)	+= -march=i686 $(call tune,nehalem)
-+cflags-$(CONFIG_MWESTMERE)	+= -march=i686 $(call tune,westmere)
-+cflags-$(CONFIG_MSANDYBRIDGE)	+= -march=i686 $(call tune,sandybridge)
-+cflags-$(CONFIG_MIVYBRIDGE)	+= -march=i686 $(call tune,ivybridge)
-+cflags-$(CONFIG_MHASWELL)	+= -march=i686 $(call tune,haswell)
-+cflags-$(CONFIG_MBROADWELL)	+= -march=i686 $(call tune,broadwell)
-+cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \
-+	$(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic))
- 
- # AMD Elan support
- cflags-$(CONFIG_MELAN)		+= -march=i486
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
deleted file mode 100644
index 06d675ea2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate merge(sys-kernel/dracut)>=37&&merge(sys-kernel/dracut)<39 format=diff
-diff --git modules.d/95resume/parse-resume.sh modules.d/95resume/parse-resume.sh
-index d7b2d7f..6ab59c3 100755
---- modules.d/95resume/parse-resume.sh
-+++ modules.d/95resume/parse-resume.sh
-@@ -70,9 +70,10 @@ if ! getarg noresume; then
-         printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
-             "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
- 
--        printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'
--        printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' \
--            "$hookdir" >> $hookdir/initqueue/timeout/resume.sh
-+        {
-+            printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'
-+            printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' "$hookdir"
-+        } >> $hookdir/initqueue/timeout/resume.sh
- 
-         mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh
-     else
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
deleted file mode 100644
index 650098a75..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate merge(sys-kernel/dracut)>=40 format=diff
-diff --git dracut.sh dracut.sh
-index 1c7e208..6327201 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1485,7 +1485,10 @@ if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
-     elif [[ $do_prelink == yes ]]; then
-         dinfo "*** Pre-linking files ***"
-         inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-+        [[ -d $initdir/proc ]] || mkdir $initdir/proc
-+        mount -n -t proc none $initdir/proc
-         chroot "$initdir" "$PRELINK_BIN" -a
-+        umount -n $initdir/proc
-         rm -f -- "$initdir/$PRELINK_BIN"
-         rm -fr -- "$initdir"/etc/prelink.*
-         dinfo "*** Pre-linking files done ***"
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
deleted file mode 100644
index 0045f1618..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate merge(sys-kernel/dracut)<40 format=diff
-# Calculate format=diff
-diff -ruN dracut-034.orig/dracut.sh dracut-034/dracut.sh
---- dracut-034.orig/dracut.sh	2013-12-27 17:19:20.082554927 +0400
-+++ dracut-034/dracut.sh	2014-01-09 14:42:53.235039034 +0400
-@@ -1270,7 +1270,10 @@
-         else
-             dinfo "*** Pre-linking files ***"
-             inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-+            [[ -d $initdir/proc ]] || mkdir $initdir/proc
-+            mount -n -t proc none $initdir/proc
-             chroot "$initdir" "$PRELINK_BIN" -a
-+            umount -n $initdir/proc
-             rm -f -- "$initdir/$PRELINK_BIN"
-             rm -fr -- "$initdir"/etc/prelink.*
-             dinfo "*** Pre-linking files done ***"
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
deleted file mode 100644
index dbbbd0ab8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate format=diff
-diff --git modules.d/90mdraid/parse-md.sh modules.d/90mdraid/parse-md.sh
-index dd7bda2..3c88b6f 100755
---- modules.d/90mdraid/parse-md.sh
-+++ modules.d/90mdraid/parse-md.sh
-@@ -8,6 +8,7 @@ if ( ! [ -n "$MD_UUID" ] && ! getargbool 0 rd.auto ) || ! getargbool 1 rd.md -d
-     info "rd.md=0: removing MD RAID activation"
-     udevproperty rd_NO_MD=1
- else
-+    /sbin/initqueue --timeout --name 50-mdraid_start --onetime --unique /sbin/mdraid_start
-     # rewrite the md rules to only process the specified raid array
-     if [ -n "$MD_UUID" ]; then
-         for f in /etc/udev/rules.d/65-md-incremental*.rules; do
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel3.18.20_15.1.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel3.18.20_15.1.patch
deleted file mode 100644
index 9f05115c4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel3.18.20_15.1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.18.20&&pkg(sys-kernel/calculate-sources)<3.19&&merge(x11-drivers/ati-drivers)>=15.1&&merge(x11-drivers/ati-drivers)<15.8
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index a8961ad..1287e80 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -4498,8 +4498,8 @@ static void kcl_mem_pat_setup (void *info)
- 
-     if (cpu_has_pge)
-     {
--        cr4 = read_cr4();
--        write_cr4(cr4 & ~X86_CR4_PGE);
-+        cr4 = __read_cr4();
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
-     }
-      __flush_tlb();
- 
-@@ -4512,7 +4512,7 @@ static void kcl_mem_pat_setup (void *info)
-     write_cr0(cr0 & 0xbfffffff);
-     if (cpu_has_pge)
-     {
--        write_cr4(cr4);
-+        __write_cr4(cr4);
-     }
-     local_irq_restore(flags);
- 
-@@ -4539,8 +4539,8 @@ static void kcl_mem_pat_restore (void *info)
- 
-     if (cpu_has_pge)
-     {
--        cr4 = read_cr4();
--        write_cr4(cr4 & ~X86_CR4_PGE);
-+        cr4 = __read_cr4();
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
-     }
-      __flush_tlb();
-   
-@@ -4552,7 +4552,7 @@ static void kcl_mem_pat_restore (void *info)
-     write_cr0(cr0 & 0xbfffffff);
-     if (cpu_has_pge)
-     {
--        write_cr4(cr4);
-+        __write_cr4(cr4);
-     }
-     local_irq_restore(flags);
- 
-diff --git a/common/lib/modules/fglrx/build_mod/kcl_acpi.c b/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-index 3a80984..679cfbf 100755
---- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -861,7 +861,13 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(void* dev)
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-     if(pdev)
-     {
--       pci_ignore_hotplug(pdev);
-+       //pci_ignore_hotplug(pdev);
-+       struct pci_dev *bridge = pdev->bus->self;
-+
-+       pdev->ignore_hotplug = 1;
-+       /* Propagate the "ignore hotplug" setting to the parent bridge. */
-+       if (bridge)
-+           bridge->ignore_hotplug = 1;
-     }
- #endif
- }
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.1_15.9-r1_x86.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.1_15.9-r1_x86.patch
deleted file mode 100644
index 9035f553d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.1_15.9-r1_x86.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=4.1.10&&pkg(sys-kernel/calculate-sources)<4.2&&merge(x11-drivers/ati-drivers)==15.9-r1&&os_arch_machine==i686
-diff --git common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
-index 31a9dd2..e9909d7 100755
---- common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -258,23 +258,6 @@
- #define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory")
- #define __flush_tlb() native_write_cr3(native_read_cr3())
- 
--static inline void __flush_tlb_all(void)
--{
--        if (cpu_has_pge)
--        {
--                unsigned long flags, cr4;
--                raw_local_irq_save(flags);
--                cr4 = native_read_cr4();
--                native_write_cr4(cr4 & ~X86_CR4_PGE);
--                native_write_cr4(cr4);
--                raw_local_irq_restore(flags);
--        }
--        else
--        {
--                __flush_tlb();
--        }
--}
--
- // ============================================================
- /* globals */
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.2_15.9-r1_x86.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.2_15.9-r1_x86.patch
deleted file mode 100644
index b13e9d743..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.2_15.9-r1_x86.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=4.2&&pkg(sys-kernel/calculate-sources)<4.3&&merge(x11-drivers/ati-drivers)==15.9-r1&&os_arch_machine==i686
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index 677565d..5189bd4 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -258,23 +258,6 @@
- #define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory")
- #define __flush_tlb() native_write_cr3(native_read_cr3())
- 
--static inline void __flush_tlb_all(void)
--{
--        if (cpu_has_pge)
--        {
--                unsigned long flags, cr4;
--                raw_local_irq_save(flags);
--                cr4 = native_read_cr4();
--                native_write_cr4(cr4 & ~X86_CR4_PGE);
--                native_write_cr4(cr4);
--                raw_local_irq_restore(flags);
--        }
--        else
--        {
--                __flush_tlb();
--        }
--}
--
- // ============================================================
- /* globals */
- 
-@@ -6436,21 +6436,17 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
-    struct fpu *fpu = &tsk->thread.fpu;
- 
-    if(static_cpu_has(X86_FEATURE_XSAVE)) {
--      fpu_xsave(fpu);
--      if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
-+      copy_xregs_to_kernel(&fpu->state.xsave);
-+      if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
- 	 return 1;
-    } else if (static_cpu_has(X86_FEATURE_FXSR)) {
--	 fpu_fxsave(fpu);
-+	 copy_fxregs_to_kernel(fpu);
-    } else {
- 	 asm volatile("fnsave %[fx]; fwait"
--                  : [fx] "=m" (fpu->state->fsave));
-+                  : [fx] "=m" (fpu->state.fsave));
- 	 return 0;
-    }
- 
--   if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) {
--	asm volatile("fnclex");
--	return 0;
--   }
-    return 1;
- }
- #endif
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.4_15.12-r1_x86.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.4_15.12-r1_x86.patch
deleted file mode 100644
index 781266040..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/ati-drivers/kernel4.4_15.12-r1_x86.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-# Calculate format=diff grep(/usr/src/linux/Makefile,VERSION\s=\s(\d+))==4&&grep(/usr/src/linux/Makefile,PATCHLEVEL\s=\s(\d+))==4&&merge(x11-drivers/ati-drivers)==15.12-r1&&os_arch_machine==i686
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index 1958cc7..c85d25f 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -261,23 +261,6 @@
- #define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory")
- #define __flush_tlb() native_write_cr3(native_read_cr3())
- 
--static inline void __flush_tlb_all(void)
--{
--        if (cpu_has_pge)
--        {
--                unsigned long flags, cr4;
--                raw_local_irq_save(flags);
--                cr4 = native_read_cr4();
--                native_write_cr4(cr4 & ~X86_CR4_PGE);
--                native_write_cr4(cr4);
--                raw_local_irq_restore(flags);
--        }
--        else
--        {
--                __flush_tlb();
--        }
--}
--
- // ============================================================
- /* globals */
- 
-@@ -1737,46 +1720,12 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state)
-     current->state = KCL_MAP_ProcessState[state];
- }
- 
--#if defined(__i386__) 
--#ifndef __HAVE_ARCH_CMPXCHG
--static inline 
--unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,            
--                        unsigned long new, int size)                      
--{                                                                                       
--    unsigned long prev;                                                             
--    switch (size) {                                                                 
--    case 1:                                                                         
--        __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2"
--                             : "=a"(prev)
--                             : "q"(new), "m"(*__xg(ptr)), "0"(old)
--                             : "memory");
--        return prev;
--    case 2:
--        __asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2"
--                             : "=a"(prev)
--                             : "q"(new), "m"(*__xg(ptr)), "0"(old)
--                             : "memory");
--        return prev;
--    case 4:
--        __asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2"
--                             : "=a"(prev)
--                             : "q"(new), "m"(*__xg(ptr)), "0"(old)
--                             : "memory");
--        return prev;
--    }
--    return old;
--}
--#endif /* cmpxchg */
--#elif defined(__alpha__)
--todo !!!
--#endif
--
- unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old,
-          unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
- #if defined(__i386__)
--    return __fgl_cmpxchg(ptr,old,new,size);
-+    return cmpxchg((unsigned long*)ptr,old,new);
- #elif defined(__x86_64__)
-     return cmpxchg((unsigned long*)ptr,old,new);
- #endif
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.10_319.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.10_319.patch
deleted file mode 100644
index 49b70845d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.10_319.patch
+++ /dev/null
@@ -1,604 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.10&&pkg(sys-kernel/calculate-sources)<3.11&&merge(x11-drivers/nvidia-drivers)>=319&&merge(x11-drivers/nvidia-drivers)<320
-diff -ur -X - NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-i2c.c NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-i2c.c
---- NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-i2c.c	2013-04-26 00:22:30.000000000 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-i2c.c	2013-05-13 05:20:55.571981365 -0400
-@@ -311,8 +311,6 @@
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -324,15 +322,10 @@
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
--
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -ur -X - NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c
---- NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c	2013-04-26 00:22:30.000000000 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c	2013-05-22 04:52:45.229495748 -0400
-@@ -60,60 +60,41 @@
-         __entry;                                          \
-     })
- 
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc,           \
--    __write_proc,__fops,__data)                                \
--   ({                                                          \
--        struct proc_dir_entry *__entry;                        \
--        int __mode = (S_IFREG | S_IRUGO);                      \
--        if ((NvUPtr)(__write_proc) != 0)                       \
--            __mode |= S_IWUSR;                                 \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
--        if (__entry != NULL)                                   \
--        {                                                      \
--            if ((NvUPtr)(__read_proc) != 0)                    \
--                __entry->read_proc = (__read_proc);            \
--            if ((NvUPtr)(__write_proc) != 0)                   \
--            {                                                  \
--                __entry->write_proc = (__write_proc);          \
--                __entry->proc_fops = (__fops);                 \
--            }                                                  \
--            __entry->data = (__data);                          \
--        }                                                      \
--        __entry;                                               \
--    })
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
- 
- #define NV_CREATE_PROC_DIR(name,parent)                        \
-    ({                                                          \
-         struct proc_dir_entry *__entry;                        \
-         int __mode = (S_IFDIR | S_IRUGO | S_IXUGO);            \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
-+        __entry = proc_mkdir_mode(name, __mode, parent);       \
-         __entry;                                               \
-     })
- 
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+static inline void *PDE_DATA(const struct inode *inode) {
-+	return PDE(inode)->data;
-+}
-+#endif
-+
- #define NV_PROC_WRITE_BUFFER_SIZE   (64 * RM_PAGE_SIZE)
- 
- static int
--nv_procfs_read_gpu_info(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_gpu_info(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    nv_state_t *nv = data;
-+    nv_state_t *nv = m->private;
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     struct pci_dev *dev = nvl->dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     NvU8 *uuid;
-     NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
-     nv_stack_t *sp = NULL;
- 
--    *eof = 1;
--
-     NV_KMEM_CACHE_ALLOC_STACK(sp);
-     if (sp == NULL)
-     {
-@@ -134,31 +115,31 @@
-         if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
-                     dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
-                     tmpstr) != RM_OK)
--        {
-+ 		       {
-             strcpy (tmpstr, "Unknown");
-         }
-     }
- 
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     if (NV_IS_GVI_DEVICE(nv))
-     {
-         status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
-                                              &fpga_rev3);
-         if (status != RM_OK)
--            len += sprintf(page+len, "Firmware: \t ????.??.??\n");
-+            seq_printf(m, "Firmware: \t ????.??.??\n");
-         else
-         {
-             fmt = "Firmware: \t %x.%x.%x\n";
--            len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-+            seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-         }
-     }
-     else
-     {
-         if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
-         {
--            len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
-+            seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
-             os_free_mem(uuid);
-         }
- 
-@@ -166,12 +147,12 @@
-                     &vbios_rev3, &vbios_rev4,
-                     &vbios_rev5) != RM_OK)
-         {
--            len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+            seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-         }
-         else
-         {
-             fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--            len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+            seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                            vbios_rev4, vbios_rev5);
-         }
-     }
-@@ -180,12 +161,12 @@
-         type = "PCI-E";
-     else
-         type = "PCI";
--    len += sprintf(page+len, "Bus Type: \t %s\n", type);
-+    seq_printf(m, "Bus Type: \t %s\n", type);
- 
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
-                    nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #if defined(DEBUG)
-     do
-@@ -193,7 +174,7 @@
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
-         {
--            len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-+            seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-                            j, nv->bars[j].address, (nv->bars[j].size >> 20));
-         }
-     } while (0);
-@@ -201,26 +182,120 @@
- 
-     NV_KMEM_CACHE_FREE_STACK(sp);
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_version(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_gpu_info(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_gpu_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_gpu_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
-+}
-+
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    nv_state_t *nv = m->private;
-+    nv_linux_state_t *nvl = NULL;
-+    char *registry_keys;
-+
-+    if (nv != NULL)
-+        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    registry_keys = ((nvl != NULL) ?
-+            nvl->registry_keys : nv_registry_keys);
-+
-+    seq_printf(m, "Binary: \"%s\"\n", registry_keys);
-+
-+    return 0;
-+}
-+
-+static ssize_t
-+nv_procfs_write_registry(
-+    struct file       *file,
-+    const char __user *buffer,
-+    size_t             count,
-+    loff_t            *pos
- )
- {
--    int len = 0;
--    *eof = 1;
-+    int status = 0;
-+    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-+    char *proc_buffer;
-+    unsigned long bytes_left;
-+
-+    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+
-+    if (count == 0)
-+    {
-+        status = -EINVAL;
-+        goto done;
-+    }
-+    else if ((bytes_left == 0) || (count > bytes_left))
-+    {
-+        status = -ENOSPC;
-+        goto done;
-+    }
-+
-+    proc_buffer = &((char *)nvfp->data)[nvfp->off];
-+
-+    if (copy_from_user(proc_buffer, buffer, count))
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-+        status = -EFAULT;
-+    }
-+    else
-+    {
-+        nvfp->proc_data = PDE_DATA(file->f_inode);
-+        nvfp->off += count;
-+    }
- 
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
-+done:
-+    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
- 
--    return len;
-+    return ((status < 0) ? status : count);
- }
- 
- static int
-@@ -233,7 +308,7 @@
-     nv_stack_t *sp = NULL;
- 
-     if (0 == (file->f_mode & FMODE_WRITE))
--        return 0;
-+        return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
- 
-     nvfp = nv_alloc_file_private();
-     if (nvfp == NULL)
-@@ -282,6 +357,9 @@
-     RM_STATUS rm_status;
-     int rc = 0;
- 
-+    if (0 == (file->f_mode & FMODE_WRITE))
-+        return single_release(inode, file);
-+
-     nvfp = NV_GET_FILE_PRIVATE(file);
-     if (nvfp == NULL)
-         return 0;
-@@ -346,122 +424,81 @@
-     return rc;
- }
- 
--static struct file_operations nv_procfs_registry_fops = {
-+static const struct file_operations nv_procfs_registry_fops = {
-     .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .write   = nv_procfs_write_registry,
-     .release = nv_procfs_close_registry,
- };
- 
- static int
--nv_procfs_read_params(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_params(
-+    struct seq_file *m,
-+    void *v
- )
- {
-     unsigned int i;
--    int len = 0;
-     nv_parm_t *entry;
- 
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
--    len += sprintf(page+len, "RmMsg: \"%s\"\n",
-+    seq_printf(m, "RmMsg: \"%s\"\n",
-                 (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_registry(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
--)
-+nv_procfs_open_params(
-+    struct inode *inode,
-+    struct file *file
-+)    
- {
--    nv_state_t *nv = data;
--    nv_linux_state_t *nvl = NULL;
--    char *registry_keys;
-+    return single_open(file, nv_procfs_show_params, NULL);
-+}
- 
--    if (nv != NULL)
--        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    registry_keys = ((nvl != NULL) ?
--            nvl->registry_keys : nv_registry_keys);
-+static const struct file_operations nv_procfs_params_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_params,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    *eof = 1;
--    return sprintf(page, "Binary: \"%s\"\n", registry_keys);
--}
- 
- static int
--nv_procfs_write_registry(
--    struct file   *file,
--    const char    *buffer,
--    unsigned long  count,
--    void          *data
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    int status = 0;
--    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
--    char *proc_buffer;
--    unsigned long bytes_left;
--
--    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+    seq_printf(m, "%s", (char *)m->private);
- 
--    if (count == 0)
--    {
--        status = -EINVAL;
--        goto done;
--    }
--    else if ((bytes_left == 0) || (count > bytes_left))
--    {
--        status = -ENOSPC;
--        goto done;
--    }
--
--    proc_buffer = &((char *)nvfp->data)[nvfp->off];
--
--    if (copy_from_user(proc_buffer, buffer, count))
--    {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
--        status = -EFAULT;
--    }
--    else
--    {
--        nvfp->proc_data = data;
--        nvfp->off += count;
--    }
--
--done:
--    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    return ((status < 0) ? status : (int)count);
-+    return 0;
- }
- 
- static int
--nv_procfs_read_text_file(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nv_procfs_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -469,22 +506,7 @@
-     const char *text
- )
- {
--    NV_CREATE_PROC_FILE(filename, parent,
--            nv_procfs_read_text_file, NULL, NULL, (void *)text);
--}
--
--static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
--{
--    while (entry)
--    {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nv_procfs_unregister_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
-+    proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
- }
- #endif
- 
-@@ -513,26 +535,11 @@
-     if (!proc_nvidia)
-         goto failed;
- 
--    entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
--        nv_procfs_read_params, NULL, NULL, NULL);
-+    entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
-     if (!entry)
-         goto failed;
- 
--    /*
--     * entry->proc_fops originally points to a constant
--     * structure, so to add more methods for the
--     * binary registry write path, we need to replace the
--     * said entry->proc_fops with a new fops structure.
--     * However, in preparation for this, we need to preserve
--     * the procfs read() and write() operations.
--     */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
--
--    entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
--        nv_procfs_read_registry,
--        nv_procfs_write_registry,
--        &nv_procfs_registry_fops, NULL);
-+    entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -553,8 +560,7 @@
- 
-     nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- 
--    entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
--        nv_procfs_read_version, NULL, NULL, NULL);
-+    entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -571,15 +577,11 @@
-         if (!proc_nvidia_gpu)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
--            nv_procfs_read_gpu_info, NULL, NULL, nv);
-+	entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
-         if (!entry)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
--            nv_procfs_read_registry,
--            nv_procfs_write_registry,
--            &nv_procfs_registry_fops, nv);
-+	entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
-         if (!entry)
-             goto failed;
-     }
-@@ -587,7 +589,7 @@
-     return 0;
- #if defined(CONFIG_PROC_FS)
- failed:
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
-     return -1;
- #endif
- }
-@@ -595,6 +597,6 @@
- void nv_unregister_procfs(void)
- {
- #if defined(CONFIG_PROC_FS)
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.10_325.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.10_325.patch
deleted file mode 100644
index f015e2789..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.10_325.patch
+++ /dev/null
@@ -1,600 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.10&&pkg(sys-kernel/calculate-sources)<3.11&&merge(x11-drivers/nvidia-drivers)>=325.08&&merge(x11-drivers/nvidia-drivers)<325.15
-diff -U 3 -H -d -r -N -- nv-i2c.c.orig nv-i2c.c
---- kernel/nv-i2c.c.orig	2013-07-01 21:45:45.241886356 -0400
-+++ kernel/nv-i2c.c	2013-07-01 21:38:49.532484245 -0400
-@@ -243,21 +243,14 @@
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
--
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -U 3 -H -d -r -N -- nv-procfs.c.orig nv-procfs.c
---- kernel/nv-procfs.c.orig	2013-07-01 21:45:41.035242479 -0400
-+++ kernel/nv-procfs.c	2013-07-01 21:38:49.532484245 -0400
-@@ -60,60 +60,41 @@
-         __entry;                                          \
-     })
- 
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc,           \
--    __write_proc,__fops,__data)                                \
--   ({                                                          \
--        struct proc_dir_entry *__entry;                        \
--        int __mode = (S_IFREG | S_IRUGO);                      \
--        if ((NvUPtr)(__write_proc) != 0)                       \
--            __mode |= S_IWUSR;                                 \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
--        if (__entry != NULL)                                   \
--        {                                                      \
--            if ((NvUPtr)(__read_proc) != 0)                    \
--                __entry->read_proc = (__read_proc);            \
--            if ((NvUPtr)(__write_proc) != 0)                   \
--            {                                                  \
--                __entry->write_proc = (__write_proc);          \
--                __entry->proc_fops = (__fops);                 \
--            }                                                  \
--            __entry->data = (__data);                          \
--        }                                                      \
--        __entry;                                               \
--    })
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
- 
- #define NV_CREATE_PROC_DIR(name,parent)                        \
-    ({                                                          \
-         struct proc_dir_entry *__entry;                        \
-         int __mode = (S_IFDIR | S_IRUGO | S_IXUGO);            \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
-+        __entry = proc_mkdir_mode(name, __mode, parent);       \
-         __entry;                                               \
-     })
- 
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+static inline void *PDE_DATA(const struct inode *inode) {
-+	return PDE(inode)->data;
-+}
-+#endif
-+
- #define NV_PROC_WRITE_BUFFER_SIZE   (64 * RM_PAGE_SIZE)
- 
- static int
--nv_procfs_read_gpu_info(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_gpu_info(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    nv_state_t *nv = data;
-+    nv_state_t *nv = m->private;
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     struct pci_dev *dev = nvl->dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     NvU8 *uuid;
-     NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
-     nv_stack_t *sp = NULL;
- 
--    *eof = 1;
--
-     NV_KMEM_CACHE_ALLOC_STACK(sp);
-     if (sp == NULL)
-     {
-@@ -134,31 +115,31 @@
-         if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
-                     dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
-                     tmpstr) != RM_OK)
--        {
-+ 		       {
-             strcpy (tmpstr, "Unknown");
-         }
-     }
- 
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     if (NV_IS_GVI_DEVICE(nv))
-     {
-         status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
-                                              &fpga_rev3);
-         if (status != RM_OK)
--            len += sprintf(page+len, "Firmware: \t ????.??.??\n");
-+            seq_printf(m, "Firmware: \t ????.??.??\n");
-         else
-         {
-             fmt = "Firmware: \t %x.%x.%x\n";
--            len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-+            seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-         }
-     }
-     else
-     {
-         if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
-         {
--            len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
-+            seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
-             os_free_mem(uuid);
-         }
- 
-@@ -166,12 +147,12 @@
-                     &vbios_rev3, &vbios_rev4,
-                     &vbios_rev5) != RM_OK)
-         {
--            len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+            seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-         }
-         else
-         {
-             fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--            len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+            seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                            vbios_rev4, vbios_rev5);
-         }
-     }
-@@ -180,12 +161,12 @@
-         type = "PCIe";
-     else
-         type = "PCI";
--    len += sprintf(page+len, "Bus Type: \t %s\n", type);
-+    seq_printf(m, "Bus Type: \t %s\n", type);
- 
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
-                    nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #if defined(DEBUG)
-     do
-@@ -193,7 +174,7 @@
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
-         {
--            len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-+            seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-                            j, nv->bars[j].address, (nv->bars[j].size >> 20));
-         }
-     } while (0);
-@@ -201,26 +182,120 @@
- 
-     NV_KMEM_CACHE_FREE_STACK(sp);
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_version(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_gpu_info(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    int len = 0;
--    *eof = 1;
-+    return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
-+}
- 
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
-+static const struct file_operations nv_procfs_gpu_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_gpu_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    return len;
-+static int
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
-+}
-+
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    nv_state_t *nv = m->private;
-+    nv_linux_state_t *nvl = NULL;
-+    char *registry_keys;
-+
-+    if (nv != NULL)
-+        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    registry_keys = ((nvl != NULL) ?
-+            nvl->registry_keys : nv_registry_keys);
-+
-+    seq_printf(m, "Binary: \"%s\"\n", registry_keys);
-+
-+    return 0;
-+}
-+
-+static ssize_t
-+nv_procfs_write_registry(
-+    struct file       *file,
-+    const char __user *buffer,
-+    size_t             count,
-+    loff_t            *pos
-+)
-+{
-+    int status = 0;
-+    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-+    char *proc_buffer;
-+    unsigned long bytes_left;
-+
-+    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+
-+    if (count == 0)
-+    {
-+        status = -EINVAL;
-+        goto done;
-+    }
-+    else if ((bytes_left == 0) || (count > bytes_left))
-+    {
-+        status = -ENOSPC;
-+        goto done;
-+    }
-+
-+    proc_buffer = &((char *)nvfp->data)[nvfp->off];
-+
-+    if (copy_from_user(proc_buffer, buffer, count))
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-+        status = -EFAULT;
-+    }
-+    else
-+    {
-+        nvfp->proc_data = PDE_DATA(file->f_inode);
-+        nvfp->off += count;
-+    }
-+
-+done:
-+    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    return ((status < 0) ? status : count);
- }
- 
- static int
-@@ -233,7 +308,7 @@
-     nv_stack_t *sp = NULL;
- 
-     if (0 == (file->f_mode & FMODE_WRITE))
--        return 0;
-+        return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
- 
-     nvfp = nv_alloc_file_private();
-     if (nvfp == NULL)
-@@ -282,6 +357,9 @@
-     RM_STATUS rm_status;
-     int rc = 0;
- 
-+    if (0 == (file->f_mode & FMODE_WRITE))
-+        return single_release(inode, file);
-+
-     nvfp = NV_GET_FILE_PRIVATE(file);
-     if (nvfp == NULL)
-         return 0;
-@@ -346,121 +424,80 @@
-     return rc;
- }
- 
--static struct file_operations nv_procfs_registry_fops = {
-+static const struct file_operations nv_procfs_registry_fops = {
-     .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .write   = nv_procfs_write_registry,
-     .release = nv_procfs_close_registry,
- };
- 
- static int
--nv_procfs_read_params(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_params(
-+    struct seq_file *m,
-+    void *v
- )
- {
-     unsigned int i;
--    int len = 0;
-     nv_parm_t *entry;
- 
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
--    len += sprintf(page+len, "RmMsg: \"%s\"\n",
-+    seq_printf(m, "RmMsg: \"%s\"\n",
-                 (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_registry(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
--)
-+nv_procfs_open_params(
-+    struct inode *inode,
-+    struct file *file
-+)    
- {
--    nv_state_t *nv = data;
--    nv_linux_state_t *nvl = NULL;
--    char *registry_keys;
-+    return single_open(file, nv_procfs_show_params, NULL);
-+}
- 
--    if (nv != NULL)
--        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    registry_keys = ((nvl != NULL) ?
--            nvl->registry_keys : nv_registry_keys);
-+static const struct file_operations nv_procfs_params_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_params,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    *eof = 1;
--    return sprintf(page, "Binary: \"%s\"\n", registry_keys);
--}
- 
- static int
--nv_procfs_write_registry(
--    struct file   *file,
--    const char    *buffer,
--    unsigned long  count,
--    void          *data
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    int status = 0;
--    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
--    char *proc_buffer;
--    unsigned long bytes_left;
--
--    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
--
--    if (count == 0)
--    {
--        status = -EINVAL;
--        goto done;
--    }
--    else if ((bytes_left == 0) || (count > bytes_left))
--    {
--        status = -ENOSPC;
--        goto done;
--    }
--
--    proc_buffer = &((char *)nvfp->data)[nvfp->off];
--
--    if (copy_from_user(proc_buffer, buffer, count))
--    {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
--        status = -EFAULT;
--    }
--    else
--    {
--        nvfp->proc_data = data;
--        nvfp->off += count;
--    }
--
--done:
--    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+    seq_printf(m, "%s", (char *)m->private);
- 
--    return ((status < 0) ? status : (int)count);
-+    return 0;
- }
- 
- static int
--nv_procfs_read_text_file(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nv_procfs_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -468,22 +505,7 @@
-     const char *text
- )
- {
--    NV_CREATE_PROC_FILE(filename, parent,
--            nv_procfs_read_text_file, NULL, NULL, (void *)text);
--}
--
--static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
--{
--    while (entry)
--    {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nv_procfs_unregister_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
-+    proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
- }
- #endif
- 
-@@ -512,26 +534,11 @@
-     if (!proc_nvidia)
-         goto failed;
- 
--    entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
--        nv_procfs_read_params, NULL, NULL, NULL);
-+    entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
-     if (!entry)
-         goto failed;
- 
--    /*
--     * entry->proc_fops originally points to a constant
--     * structure, so to add more methods for the
--     * binary registry write path, we need to replace the
--     * said entry->proc_fops with a new fops structure.
--     * However, in preparation for this, we need to preserve
--     * the procfs read() and write() operations.
--     */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
--
--    entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
--        nv_procfs_read_registry,
--        nv_procfs_write_registry,
--        &nv_procfs_registry_fops, NULL);
-+    entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -552,8 +559,7 @@
- 
-     nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- 
--    entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
--        nv_procfs_read_version, NULL, NULL, NULL);
-+    entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -570,15 +576,11 @@
-         if (!proc_nvidia_gpu)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
--            nv_procfs_read_gpu_info, NULL, NULL, nv);
-+	entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
-         if (!entry)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
--            nv_procfs_read_registry,
--            nv_procfs_write_registry,
--            &nv_procfs_registry_fops, nv);
-+	entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
-         if (!entry)
-             goto failed;
-     }
-@@ -586,7 +588,7 @@
-     return 0;
- #if defined(CONFIG_PROC_FS)
- failed:
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
-     return -1;
- #endif
- }
-@@ -594,6 +596,6 @@
- void nv_unregister_procfs(void)
- {
- #if defined(CONFIG_PROC_FS)
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.11_325.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.11_325.patch
deleted file mode 100644
index 73ec9b195..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.11_325.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.11&&pkg(sys-kernel/calculate-sources)<3.12&&merge(x11-drivers/nvidia-drivers)>=325.15
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus
- #endif
- 
- #if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+#define NV_NUM_PHYSPAGES                get_num_physpages()
-+#else
- #define NV_NUM_PHYSPAGES                num_physpages
-+#endif
- #define NV_GET_CURRENT_PROCESS()        current->tgid
- #define NV_IN_ATOMIC()                  in_atomic()
- #define NV_LOCAL_BH_DISABLE()           local_bh_disable()
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.18.20_340.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.18.20_340.patch
deleted file mode 100644
index 9488f843e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.18.20_340.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.18.20&&pkg(sys-kernel/calculate-sources)<3.19&&merge(x11-drivers/nvidia-drivers)>=340&&merge(x11-drivers/nvidia-drivers)<341
-diff --git a/kernel/nv-pat.c b/kernel/nv-pat.c
-index d536b89..e685956 100644
---- a/kernel/nv-pat.c
-+++ b/kernel/nv-pat.c
-@@ -35,8 +35,8 @@ static inline void nv_disable_caches(unsigned long *cr4)
-     unsigned long cr0 = read_cr0();
-     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
-     wbinvd();
--    *cr4 = read_cr4();
--    if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
-+    *cr4 = __read_cr4();
-+    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
-     __flush_tlb();
- }
- 
-@@ -46,7 +46,7 @@ static inline void nv_enable_caches(unsigned long cr4)
-     wbinvd();
-     __flush_tlb();
-     write_cr0((cr0 & 0x9fffffff));
--    if (cr4 & 0x80) write_cr4(cr4);
-+    if (cr4 & 0x80) __write_cr4(cr4);
- }
- 
- static int nv_determine_pat_mode(void)
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.18_346.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.18_346.patch
deleted file mode 100644
index 776dbca0f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.18_346.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.18&&pkg(sys-kernel/calculate-sources)<3.19&&merge(x11-drivers/nvidia-drivers)>=346.35&&merge(x11-drivers/nvidia-drivers)<346.47
-
-diff -Naur work/kernel/nv-drm.c work2/kernel/nv-drm.c
---- work/kernel/nv-drm.c	2015-01-11 07:30:46.000000000 +0300
-+++ work2/kernel/nv-drm.c	2015-03-02 16:42:55.746457079 +0300
-@@ -127,6 +127,9 @@
-     .gem_prime_get_sg_table = nv_gem_prime_get_sg_table,
-     .gem_prime_vmap = nv_gem_prime_vmap,
-     .gem_prime_vunmap = nv_gem_prime_vunmap,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
-+    .set_busid = drm_pci_set_busid,
-+#endif
- 
-     .name = "nvidia-drm",
-     .desc = "NVIDIA DRM driver",
-diff -Naur work/kernel/nv-linux.h work2/kernel/nv-linux.h
---- work/kernel/nv-linux.h	2015-01-11 07:30:46.000000000 +0300
-+++ work2/kernel/nv-linux.h	2015-03-02 16:43:54.602457850 +0300
-@@ -2000,7 +2000,7 @@
- #if defined(NV_FILE_HAS_INODE)
- #define NV_FILE_INODE(file) (file)->f_inode
- #else
--#define NV_FILE_INODE(file) (file)->f_dentry->d_inode
-+#define NV_FILE_INODE(file) (file)->f_path.f_dentry->d_inode
- #endif
- 
- /* Stub out UVM in multi-RM builds */
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.6_295.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.6_295.patch
deleted file mode 100644
index a60709523..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.6_295.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.6&&pkg(sys-kernel/calculate-sources)<3.7&&merge(x11-drivers/nvidia-drivers)>=295&&merge(x11-drivers/nvidia-drivers)<296
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-         // no status returned for this function
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
-+        acpi_os_wait_events_complete();
-+#else
-         acpi_os_wait_events_complete(NULL);
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_173.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_173.patch
deleted file mode 100644
index 235036fa0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_173.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=173&&merge(x11-drivers/nvidia-drivers)<174
-the nvidia drivers are trying to test for version 2.6.6, but fail to take into
-account the first digit.  so 3.7.0+ ends up failing the test.
-
-https://bugs.gentoo.org/447566
-
---- a/usr/src/nv/conftest.sh
-+++ b/usr/src/nv/conftest.sh
-@@ -1697,13 +1697,15 @@
-                 # kernel older than 2.6.6, that's all we require to
-                 # build the module.
-                 #
-+                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
--                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-+                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
-+                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi
-             fi
-         fi
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_304.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_304.patch
deleted file mode 100644
index 320957a07..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_304.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=304&&merge(x11-drivers/nvidia-drivers)<305
-the nvidia drivers are trying to test for version 2.6.6, but fail to take into
-account the first digit.  so 3.7.0+ ends up failing the test.
-
-https://bugs.gentoo.org/447566
-
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1697,13 +1697,15 @@
-                 # kernel older than 2.6.6, that's all we require to
-                 # build the module.
-                 #
-+                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
--                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-+                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
-+                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi
-             fi
-         fi
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_173.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_173.patch
deleted file mode 100644
index 64550afda..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_173.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=173&&merge(x11-drivers/nvidia-drivers)<174
-diff --git a/usr/src/nv/conftest.sh b/usr/src/nv/conftest.sh
-index 29012dd..4474130 100644
---- a/usr/src/nv/conftest.sh
-+++ b/usr/src/nv/conftest.sh
-@@ -20,6 +20,7 @@ ARCH=$3
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
- 
-@@ -118,7 +119,7 @@ build_cflags() {
-         fi
-     fi
- 
--    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     test_xen
- 
-@@ -142,10 +143,10 @@ build_cflags() {
-         fi
-     fi
- 
--    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
-         CFLAGS="$CFLAGS -D$BUILD_PARAMS"
-diff --git a/usr/src/nv/nv.c b/usr/src/nv/nv.c
-index 538217e..73c7234 100644
---- a/usr/src/nv/nv.c
-+++ b/usr/src/nv/nv.c
-@@ -2609,7 +2609,7 @@ int nv_kern_mmap(
- 
-         /* prevent the swapper from swapping it out */
-         /* mark the memory i/o so the buffers aren't dumped on core dumps */
--        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+        vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
-     }
- 
-     NV_VMA_FILE(vma) = file;
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_304.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_304.patch
deleted file mode 100644
index 37d796a31..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_304.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=304&&merge(x11-drivers/nvidia-drivers)<305
---- kernel/conftest.sh	2012-10-11 19:18:22.704848496 -0400
-+++ kernel/conftest.sh	2012-10-12 20:35:55.707213868 -0400
-@@ -20,6 +20,7 @@
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
- 
-@@ -118,7 +119,7 @@
-         fi
-     fi
- 
--    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     test_xen
- 
-@@ -146,10 +147,10 @@
-         fi
-     fi
- 
--    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
-     elif [ "$ARCH" = "arm" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
-     fi
---- kernel/nv-mmap.c 2012-08-08 22:52:53.000000000 -0400
-+++ kernel/nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
-@@ -450,7 +450,7 @@
-         NV_PRINT_AT(NV_DBG_MEMINFO, at);
-         nv_vm_list_page_count(&at->page_table[i], pages);
- 
--        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+	 vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
- 
- #if defined(VM_DRIVER_PAGES)
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
deleted file mode 100644
index 8de33dd94..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate merge(x11-misc/light-locker)==1.4.0 format=diff
-diff --git a/po/ru.po b/po/ru.po
-index c49c4b0..bb129d5 100644
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -39,19 +39,19 @@ msgstr "Заблокировать �кран через S �екунд по�л
- 
- #: ../src/light-locker.c:73
- msgid "Lock the screen on screensaver deactivation"
--msgstr ""
-+msgstr "Заблокировать �кран при выключении хранител� �крана"
- 
- #: ../src/light-locker.c:74
- msgid "Lock the screen on screensaver activation"
--msgstr ""
-+msgstr "Заблокировать �кран при включении хранител� �крана"
- 
- #: ../src/light-locker.c:78
- msgid "Lock the screen on suspend/resume"
--msgstr ""
-+msgstr "Заблокировать �кран при �п�щем/ждущем режимах"
- 
- #: ../src/light-locker.c:79
- msgid "Do not lock the screen on suspend/resume"
--msgstr ""
-+msgstr "�е блокировать �кран при �п�щем/ждущем режимах"
- 
- #: ../src/light-locker.desktop.in.in.h:1
- msgid "Screen Locker"
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
deleted file mode 100644
index 0bd6073ee..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff
-diff --git src/gs-manager.c src/gs-manager.c
-index 32eeb52..a0cb142 100644
---- src/gs-manager.c
-+++ src/gs-manager.c
-@@ -480,7 +480,7 @@ gs_manager_timed_switch (GSManager *manager)
- 
-         gs_debug ("Start switch to greeter timer");
- 
--        manager->priv->greeter_timeout_id = g_timeout_add_seconds (10,
-+        manager->priv->greeter_timeout_id = g_timeout_add_seconds (3,
-                                                                    (GSourceFunc)switch_greeter_timeout,
-                                                                    manager);
- }
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
deleted file mode 100644
index 446832325..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=1.6.1
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
deleted file mode 100644
index ee2dd9a52..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# Calculate format=diff merge(x11-misc/lightdm-gtk-greeter)<2
-diff -ruN lightdm-gtk-greeter-1.6.1.orig/po/ru.po lightdm-gtk-greeter-1.6.1/po/ru.po
---- lightdm-gtk-greeter-1.6.1.orig/po/ru.po	2013-12-16 16:18:57.832013404 +0400
-+++ lightdm-gtk-greeter-1.6.1/po/ru.po	2013-12-16 16:19:51.597016178 +0400
-@@ -20,12 +20,15 @@
- 
- #: ../src/lightdm-gtk-greeter.c:355
- msgid "Unlock"
--msgstr ""
-+msgstr "Разблокировать"
- 
- #: ../src/lightdm-gtk-greeter.c:357 ../src/lightdm-gtk-greeter.glade.h:1
- msgid "Login"
- msgstr "Войти"
- 
-+msgid "Log In"
-+msgstr "Войти"
-+
- #: ../src/lightdm-gtk-greeter.c:515
- msgid "Failed to start session"
- msgstr "�е удало�ь запу�тить �еан�"
-@@ -61,6 +64,9 @@
- msgid "Shutdown"
- msgstr "Выключить"
- 
-+msgid "Shut Down"
-+msgstr "Выключить"
-+
- #: ../src/lightdm-gtk-greeter.c:862
- msgid "Guest Account"
- msgstr "Го�ть"
-@@ -89,6 +95,9 @@
- msgid "Shutdown..."
- msgstr "Выключить..."
- 
-+msgid "Shut Down..."
-+msgstr "Выключить..."
-+
- #: ../src/lightdm-gtk-greeter.glade.h:7
- msgid "Large Font"
- msgstr "Крупный шрифт"
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
deleted file mode 100644
index f2116ff31..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff merge(x11-misc/lightdm-gtk-greeter)==2.0.1
-diff --git a/configure b/configure
-index 374d6bc..56b0dfc 100755
---- a/configure
-+++ b/configure
-@@ -12833,7 +12833,7 @@ fi
- if test "${enable_kill_on_sigterm+set}" = set; then :
-   enableval=$enable_kill_on_sigterm;
- else
--  enable_kill_on_sigterm=no
-+  enable_kill_on_sigterm=yes
- fi
- 
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-no_libindicator.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-no_libindicator.patch
deleted file mode 100644
index c522576c4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-no_libindicator.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff merge(x11-misc/lightdm-gtk-greeter)==2.0.1
-diff --git a/configure b/configure
-index 374d6bc..c99eefc 100755
---- a/configure
-+++ b/configure
-@@ -12415,7 +12415,7 @@ IDO_PKG=libido3-0.1
- if test "${enable_libindicator+set}" = set; then :
-   enableval=$enable_libindicator;
- else
--  enable_libindicator=yes
-+  enable_libindicator=no
- fi
- 
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
deleted file mode 100644
index 8aa58258b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=1.8.5
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
deleted file mode 100644
index 946be7090..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=diff
-diff -ruN lightdm-1.9.5.orig/src/seat.c lightdm-1.9.5/src/seat.c
---- lightdm-1.9.5.orig/src/seat.c	2013-12-16 14:04:28.475005084 +0400
-+++ lightdm-1.9.5/src/seat.c	2013-12-16 14:07:36.934014806 +0400
-@@ -617,7 +617,10 @@
-     }
- 
-     /* Cleanup */
--    if (!IS_GREETER (session))
-+    // don't launch cleanup script for non-authenticated session and on switch
-+    // sessions
-+    if (!IS_GREETER (session) && session_get_is_authenticated(session) &&
-+        !find_user_session (seat, session_get_username (session), session))
-     {
-         const gchar *script;
-         script = seat_get_string_property (seat, "session-cleanup-script");
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/.calculate_directory
deleted file mode 100644
index 24d05ec60..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=0.11.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
deleted file mode 100644
index 94953c40b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-# Calculate format=diff  merge(x11-misc/sddm)>=0.11.0&&merge(x11-misc/sddm)<0.12
-commit caeb5f5b5b3c0f2b14a3db8cdca502cfd3afea76
-Author: Mike Khiretskiy <mh@calculate.ru>
-Date:   Fri Oct 2 13:24:08 2015 +0300
-
-    Add LoginCommand and LogoutCommand.
-    
-    LoginCommand is script which execute before user login
-    Logout is script which execute after user logout
-
-diff --git data/CMakeLists.txt data/CMakeLists.txt
-index ded0dbf..82904c2 100644
---- data/CMakeLists.txt
-+++ data/CMakeLists.txt
-@@ -3,7 +3,12 @@ install(DIRECTORY   "flags"                             DESTINATION "${DATA_INST
- 
- install(FILES "org.freedesktop.DisplayManager.conf"       DESTINATION "${DBUS_CONFIG_DIR}")
- 
--install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts"
-+install(FILES 
-+    "scripts/Xsession"
-+    "scripts/Xsetup"
-+    "scripts/Xlogin"
-+    "scripts/Xlogout"
-+    DESTINATION "${DATA_INSTALL_DIR}/scripts"
-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-         GROUP_READ GROUP_EXECUTE
-         WORLD_READ WORLD_EXECUTE)
-diff --git data/man/sddm.conf.rst.in data/man/sddm.conf.rst.in
-index 6a28224..849dd6d 100644
---- data/man/sddm.conf.rst.in
-+++ data/man/sddm.conf.rst.in
-@@ -81,6 +81,14 @@ OPTIONS
- 	Path of script to execute when starting the display server.
- 	Default value is "@DATA_INSTALL_DIR@/scripts/Xsetup".
- 
-+`LoginCommand=`
-+	Path of script to execute before user login.
-+	Default value is "@DATA_INSTALL_DIR@/scripts/Xlogin".
-+
-+`LogoutCommand=`
-+	Path of script to execute after user logout.
-+	Default value is "@DATA_INSTALL_DIR@/scripts/Xlogout".
-+
- `MinimumVT=`
- 	Minimum virtual terminal number that will be used
- 	by the first display. Virtual terminal number will
-diff --git data/scripts/Xlogin data/scripts/Xlogin
-new file mode 100755
-index 0000000..a3784ce
---- /dev/null
-+++ data/scripts/Xlogin
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+# Xlogin - run as root before user login
-diff --git data/scripts/Xlogout data/scripts/Xlogout
-new file mode 100755
-index 0000000..f10f56c
---- /dev/null
-+++ data/scripts/Xlogout
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+# Xlogout - run as root after user logout
-diff --git src/common/Configuration.h src/common/Configuration.h
-index 72aa6f4..acab9b8 100644
---- src/common/Configuration.h
-+++ src/common/Configuration.h
-@@ -60,6 +60,10 @@ namespace SDDM {
-                                                                                                    "A script to execute when starting the desktop session"));
-             Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Xsetup script path\n"
-                                                                                                    "A script to execute when starting the display server"));
-+            Entry(LoginCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xlogin"),      _S("Xlogin script path\n"
-+                                                                                                   "A script to execute before user login"));
-+            Entry(LogoutCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xlogout"),      _S("Xlogout script path\n"
-+                                                                                                   "A script to execute before user logout"));
-             Entry(MinimumVT,           int,         MINIMUM_VT,                                 _S("Minimum VT\n"
-                                                                                                    "The lowest virtual terminal number that will be used."));
-         );
-diff --git src/helper/HelperApp.cpp src/helper/HelperApp.cpp
-index 360d62d..ef2918d 100644
---- src/helper/HelperApp.cpp
-+++ src/helper/HelperApp.cpp
-@@ -18,6 +18,7 @@
-  *
-  */
- 
-+#include "Configuration.h"
- #include "HelperApp.h"
- #include "Backend.h"
- #include "UserSession.h"
-@@ -127,6 +128,11 @@ namespace SDDM {
-         m_user = m_backend->userName();
-         QProcessEnvironment env = authenticated(m_user);
- 
-+        if(!runExternalScript(mainConfig.XDisplay.LoginCommand.get())) {
-+            exit(Auth::HELPER_SESSION_ERROR);
-+            return;
-+        }
-+
-         if (!m_session->path().isEmpty()) {
-             env.insert(m_session->processEnvironment());
-             m_session->setProcessEnvironment(env);
-@@ -144,7 +150,30 @@ namespace SDDM {
-         return;
-     }
- 
-+    bool HelperApp::runExternalScript(const QString &command) {
-+        bool ret = true;
-+        QProcessEnvironment env = authenticated(m_user);
-+        env.insert(m_session->processEnvironment());
-+        if (!command.isEmpty() &&
-+            env.value(QStringLiteral("XDG_SESSION_CLASS")) == QStringLiteral("user")) {
-+            QProcess *displayStopScript = new QProcess();
-+            env.insert(QStringLiteral("USER"), m_user);
-+            env.insert(QStringLiteral("HOME"), QStringLiteral("/root"));
-+            displayStopScript->setProcessEnvironment(env);
-+            // start script
-+            displayStopScript->start(command);
-+            if(!displayStopScript->waitForFinished(-1) || 
-+                displayStopScript->exitCode() != 0) {
-+                ret = false;
-+            }
-+            displayStopScript->deleteLater();
-+        }
-+        return ret;
-+    }
-+
-     void HelperApp::sessionFinished(int status) {
-+        // create logout script process
-+        runExternalScript(mainConfig.XDisplay.LogoutCommand.get());
-         exit(status);
-     }
- 
-diff --git src/helper/HelperApp.h src/helper/HelperApp.h
-index b83eade..fa08776 100644
---- src/helper/HelperApp.h
-+++ src/helper/HelperApp.h
-@@ -61,6 +61,7 @@ namespace SDDM {
-         UserSession *m_session { nullptr };
-         QLocalSocket *m_socket { nullptr };
-         QString m_user { };
-+        bool runExternalScript(const QString &command);
-         // TODO: get rid of this in a nice clean way along the way with moving to user session X server
-         QString m_cookie { };
-     };
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
deleted file mode 100644
index b00b952be..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-# Calculate format=diff  merge(x11-misc/sddm)>=0.12.0&&merge(x11-misc/sddm)<0.14
-commit b89c317d40d7ce78c811b4ef463c0dcf47f61003
-Author: Mike Khiretskiy <mh@calculate.ru>
-Date:   Fri Oct 2 13:24:08 2015 +0300
-
-    Add LoginCommand and LogoutCommand.
-    
-    LoginCommand is script which execute before user login
-    Logout is script which execute after user logout
-
-diff --git data/CMakeLists.txt data/CMakeLists.txt
-index 51f37ab..dabe094 100644
---- data/CMakeLists.txt
-+++ data/CMakeLists.txt
-@@ -11,6 +11,8 @@ install(FILES
-     "scripts/Xsession"
-     "scripts/Xsetup"
-     "scripts/Xstop"
-+    "scripts/Xlogin"
-+    "scripts/Xlogout"
-     "scripts/wayland-session"
-     DESTINATION "${DATA_INSTALL_DIR}/scripts"
-     PERMISSIONS
-diff --git data/man/sddm.conf.rst.in data/man/sddm.conf.rst.in
-index a916e27..db682ae 100644
---- data/man/sddm.conf.rst.in
-+++ data/man/sddm.conf.rst.in
-@@ -94,6 +94,14 @@ OPTIONS
- 	Path of script to execute when stopping the display server.
- 	Default value is "@DATA_INSTALL_DIR@/scripts/Xstop".
- 
-+`LoginCommand=`
-+	Path of script to execute before user login.
-+	Default value is "@DATA_INSTALL_DIR@/scripts/Xlogin".
-+
-+`LogoutCommand=`
-+	Path of script to execute after user logout.
-+	Default value is "@DATA_INSTALL_DIR@/scripts/Xlogout".
-+
- `MinimumVT=`
- 	Minimum virtual terminal number that will be used
- 	by the first display. Virtual terminal number will
-diff --git data/scripts/Xlogin data/scripts/Xlogin
-new file mode 100755
-index 0000000..a3784ce
---- /dev/null
-+++ data/scripts/Xlogin
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+# Xlogin - run as root before user login
-diff --git data/scripts/Xlogout data/scripts/Xlogout
-new file mode 100755
-index 0000000..f10f56c
---- /dev/null
-+++ data/scripts/Xlogout
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+# Xlogout - run as root after user logout
-diff --git src/common/Configuration.h src/common/Configuration.h
-index 584f26b..ef433be 100644
---- src/common/Configuration.h
-+++ src/common/Configuration.h
-@@ -64,6 +64,10 @@ namespace SDDM {
-                                                                                                    "A script to execute when starting the display server"));
-             Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Xstop script path\n"
-                                                                                                    "A script to execute when stopping the display server"));
-+            Entry(LoginCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xlogin"),      _S("Xlogin script path\n"
-+                                                                                                   "A script to execute before user login"));
-+            Entry(LogoutCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xlogout"),      _S("Xlogout script path\n"
-+                                                                                                   "A script to execute before user logout"));
-             Entry(MinimumVT,           int,         MINIMUM_VT,                                 _S("Minimum VT\n"
-                                                                                                    "The lowest virtual terminal number that will be used."));
-         );
-diff --git src/helper/HelperApp.cpp src/helper/HelperApp.cpp
-index a3f9430..94308e6 100644
---- src/helper/HelperApp.cpp
-+++ src/helper/HelperApp.cpp
-@@ -18,6 +18,7 @@
-  *
-  */
- 
-+#include "Configuration.h"
- #include "HelperApp.h"
- #include "Backend.h"
- #include "UserSession.h"
-@@ -127,6 +128,11 @@ namespace SDDM {
-         m_user = m_backend->userName();
-         QProcessEnvironment env = authenticated(m_user);
- 
-+        if(!runExternalScript(mainConfig.XDisplay.LoginCommand.get())) {
-+            exit(Auth::HELPER_SESSION_ERROR);
-+            return;
-+        }
-+
-         if (!m_session->path().isEmpty()) {
-             env.insert(m_session->processEnvironment());
-             m_session->setProcessEnvironment(env);
-@@ -144,7 +150,30 @@ namespace SDDM {
-         return;
-     }
- 
-+    bool HelperApp::runExternalScript(const QString &command) {
-+        bool ret = true;
-+        QProcessEnvironment env = authenticated(m_user);
-+        env.insert(m_session->processEnvironment());
-+        if (!command.isEmpty() &&
-+            env.value(QStringLiteral("XDG_SESSION_CLASS")) == QStringLiteral("user")) {
-+            QProcess *displayStopScript = new QProcess();
-+            env.insert(QStringLiteral("USER"), m_user);
-+            env.insert(QStringLiteral("HOME"), QStringLiteral("/root"));
-+            displayStopScript->setProcessEnvironment(env);
-+            // start script
-+            displayStopScript->start(command);
-+            if(!displayStopScript->waitForFinished(-1) || 
-+                displayStopScript->exitCode() != 0) {
-+                ret = false;
-+            }
-+            displayStopScript->deleteLater();
-+        }
-+        return ret;
-+    }
-+
-     void HelperApp::sessionFinished(int status) {
-+        // create logout script process
-+        runExternalScript(mainConfig.XDisplay.LogoutCommand.get());
-         exit(status);
-     }
- 
-diff --git src/helper/HelperApp.h src/helper/HelperApp.h
-index b83eade..fa08776 100644
---- src/helper/HelperApp.h
-+++ src/helper/HelperApp.h
-@@ -61,6 +61,7 @@ namespace SDDM {
-         UserSession *m_session { nullptr };
-         QLocalSocket *m_socket { nullptr };
-         QString m_user { };
-+        bool runExternalScript(const QString &command);
-         // TODO: get rid of this in a nice clean way along the way with moving to user session X server
-         QString m_cookie { };
-     };
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
deleted file mode 100644
index 49a2d9e22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-# Calculate format=diff  merge(x11-misc/sddm)>=0.14.0
-diff --git data/CMakeLists.txt data/CMakeLists.txt
-index f3b5781..fb1047a 100644
---- data/CMakeLists.txt
-+++ data/CMakeLists.txt
-@@ -22,6 +22,8 @@ install(FILES
-     "scripts/Xsession"
-     "scripts/Xsetup"
-     "scripts/Xstop"
-+    "scripts/Xlogin"
-+    "scripts/Xlogout"
-     "scripts/wayland-session"
-     DESTINATION "${DATA_INSTALL_DIR}/scripts"
-     PERMISSIONS
-diff --git data/man/sddm.conf.rst.in data/man/sddm.conf.rst.in
-index 3238af5..1074934 100644
---- data/man/sddm.conf.rst.in
-+++ data/man/sddm.conf.rst.in
-@@ -119,6 +119,14 @@ OPTIONS
- 	Path of script to execute when stopping the display server.
- 	Default value is "@DATA_INSTALL_DIR@/scripts/Xstop".
- 
-+`LoginCommand=`
-+	Path of script to execute before user login.
-+	Default value is "@DATA_INSTALL_DIR@/scripts/Xlogin".
-+
-+`LogoutCommand=`
-+	Path of script to execute after user logout.
-+	Default value is "@DATA_INSTALL_DIR@/scripts/Xlogout".
-+
- `MinimumVT=`
- 	Minimum virtual terminal number that will be used
- 	by the first display. Virtual terminal number will
-diff --git data/scripts/Xlogin data/scripts/Xlogin
-new file mode 100644
-index 0000000..a3784ce
---- /dev/null
-+++ data/scripts/Xlogin
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+# Xlogin - run as root before user login
-diff --git data/scripts/Xlogout data/scripts/Xlogout
-new file mode 100644
-index 0000000..f10f56c
---- /dev/null
-+++ data/scripts/Xlogout
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+# Xlogout - run as root after user logout
-diff --git src/common/Configuration.h src/common/Configuration.h
-index f790343..7e32285 100644
---- src/common/Configuration.h
-+++ src/common/Configuration.h
-@@ -68,6 +68,10 @@ namespace SDDM {
- 	    Entry(UserAuthFile,        QString,     _S(".Xauthority"),                          _S("Path to the Xauthority file"));
-             Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
-             Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
-+            Entry(LoginCommand,        QString,     _S(DATA_INSTALL_DIR "/scripts/Xlogin"),      _S("Xlogin script path\n"
-+                                                                                                   "A script to execute before user login"));
-+            Entry(LogoutCommand,       QString,     _S(DATA_INSTALL_DIR "/scripts/Xlogout"),      _S("Xlogout script path\n"
-+                                                                                                   "A script to execute before user logout"));
-             Entry(MinimumVT,           int,         MINIMUM_VT,                                 _S("The lowest virtual terminal number that will be used."));
-         );
- 
-diff --git src/helper/HelperApp.cpp src/helper/HelperApp.cpp
-index becf54b..f61e19d 100644
---- src/helper/HelperApp.cpp
-+++ src/helper/HelperApp.cpp
-@@ -18,6 +18,7 @@
-  *
-  */
- 
-+#include "Configuration.h"
- #include "HelperApp.h"
- #include "Backend.h"
- #include "UserSession.h"
-@@ -127,6 +128,11 @@ namespace SDDM {
-         m_user = m_backend->userName();
-         QProcessEnvironment env = authenticated(m_user);
- 
-+        if(!runExternalScript(mainConfig.X11.LoginCommand.get())) {
-+            exit(Auth::HELPER_SESSION_ERROR);
-+            return;
-+        }
-+
-         if (!m_session->path().isEmpty()) {
-             env.insert(m_session->processEnvironment());
-             m_session->setProcessEnvironment(env);
-@@ -144,7 +150,30 @@ namespace SDDM {
-         return;
-     }
- 
-+    bool HelperApp::runExternalScript(const QString &command) {
-+        bool ret = true;
-+        QProcessEnvironment env = authenticated(m_user);
-+        env.insert(m_session->processEnvironment());
-+        if (!command.isEmpty() &&
-+            env.value(QStringLiteral("XDG_SESSION_CLASS")) == QStringLiteral("user")) {
-+            QProcess *displayStopScript = new QProcess();
-+            env.insert(QStringLiteral("USER"), m_user);
-+            env.insert(QStringLiteral("HOME"), QStringLiteral("/root"));
-+            displayStopScript->setProcessEnvironment(env);
-+            // start script
-+            displayStopScript->start(command);
-+            if(!displayStopScript->waitForFinished(-1) || 
-+                displayStopScript->exitCode() != 0) {
-+                ret = false;
-+            }
-+            displayStopScript->deleteLater();
-+        }
-+        return ret;
-+    }
-+
-     void HelperApp::sessionFinished(int status) {
-+        // create logout script process
-+        runExternalScript(mainConfig.X11.LogoutCommand.get());
-         m_backend->closeSession();
-         exit(status);
-     }
-diff --git src/helper/HelperApp.h src/helper/HelperApp.h
-index b83eade..fa08776 100644
---- src/helper/HelperApp.h
-+++ src/helper/HelperApp.h
-@@ -61,6 +61,7 @@ namespace SDDM {
-         UserSession *m_session { nullptr };
-         QLocalSocket *m_socket { nullptr };
-         QString m_user { };
-+        bool runExternalScript(const QString &command);
-         // TODO: get rid of this in a nice clean way along the way with moving to user session X server
-         QString m_cookie { };
-     };
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
deleted file mode 100644
index 2d6e8920e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()>=5.10&&merge()<5.21
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/xscreensaver/branding.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
deleted file mode 100644
index 2a5862562..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
+++ /dev/null
@@ -1,401 +0,0 @@
-# Calculate format=diff
-diff --git a/utils/images/logo-180.xpm b/utils/images/logo-180.xpm
-index a0cea80..98425f4 100644
---- a/utils/images/logo-180.xpm
-+++ b/utils/images/logo-180.xpm
-@@ -8,200 +8,201 @@
-  */
- 
- static const char * const logo_180_xpm[] = {
--"180 180 16 1",
--" 	c None    m None",
--")	c #FF0000 m #FFFFFF",
--",	c #FFFFFF m #FFFFFF",
--".	c #000000 m #000000",
--"-	c #ED9E00 m #FFFFFF",
--"'	c #4F3504 m #000000",
--"=	c #DBDBDB m #000000",
--">	c #B0B0B0 m #000000",
--"+	c #929292 m #000000",
--";	c #797979 m #000000",
--"@	c #A30000 m #000000",
--"#	c #604D28 m #000000",
--"$	c #600000 m #000000",
--"%	c #37332D m #000000",
--"&	c #2D0C05 m #000000",
--"*	c #A46E00 m #000000",
--"                                                                                                                                                                                    ",
--"                                                                    .                                                                                                               ",
--"                                                                   ..                                                                                                               ",
--"                                                                   ...                                                                                                              ",
--"                                                                 . ...                                                                                                              ",
--"                                                                 .. ...                                                                                                             ",
--"                                                                 .&.....                                                                                                            ",
--"                                                                  &&....                                                                                                            ",
--"                                                                  .@&....                                                                                                           ",
--"                                                                   $).....                                                                                                          ",
--"                                                                   .)@....                                                                                                          ",
--"                                                                   .@)@....                                                                                                         ",
--"                                                                    &))$....                                                                                                        ",
--"                                                                    .)))&...                                                                                                        ",
--"                                                                    .@))@&...                                                                                                       ",
--"                                                                     $)))@....                                                                                                      ",
--"                                                                     &))))$....                                                                                                     ",
--"                                                                     .)))))&...                                                                                                     ",
--"                                                                      @))))@....                                                                                                    ",
--"                                                                      $)))))$&...                                                                                                   ",
--"                                                                      .)))))).&..                                                                                                   ",
--"                                                                      .))))))@....                     ..                                                                           ",
--"                                                                      .)))))))&'...                .. ...                                                                           ",
--"                                                                      .@)))))))%'..                .  ...                                                                           ",
--"                                                                       @)))))))$#&..              .. ...                                                                            ",
--"                                                                       $))))))))&#...            .& ....                                                                            ",
--"                                                                       &))))))))$*%..            &. ....                                                                            ",
--"                                                                       $))))))))@#*...          .$.....                                                                             ",
--"                                                                       &)))))))))&-'..         .@$.....                                                                             ",
--"                                                                       $)))))))))&-*..         &)......                                                                             ",
--"                                                                       &)))))))))@*-...       .@@.....                                                                              ",
--"                                                                       .)))))))))$*-&..       &)@.....                                                                              ",
--"                                                                       .)))))))))$**...      .@)$..&..                                                                              ",
--"                                                                       .)))))))))&-'..       &))$.&'..                                                                              ",
--"                                                                       $))))))))$'-...      .@))$.*'..                                                                              ",
--"                                                                       $)))))))).-'..       $)))&%-...                                                                              ",
--"                                                                       @)))))))$#-...      .))))&*-..                                                                               ",
--"                                                                      .@)))))))&-#..       &))))&-*..                                                                               ",
--"                                                                      .)))))))$*-...      .@))))&--...                                                                              ",
--"                  ....................................................$)))))))&-*.........&)))))&-*...............................................................                  ",
--"                 .....................................................@))))))$#-&.........$)))))&--.................................................................                ",
--"                .....................................................&)))))))&-*..........))))))$--..................................................................               ",
--"                .....................................................@))))))$*-'.........$))))))$*-..................................................................               ",
--"               .....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+&))))))).--..;,,,,,,#@))))))@*-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=#....               ",
--"               ....%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&)))))))@'-#..=,,,,,=&)))))))$*-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%@)))))))&--&.%,,,,,,+$)))))))@#-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%$)))))))@'-*..+,,,,,,%)))))))))&-%.#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+$))))))))$*-'.&=,,,,,=&)))))))))&-'.&,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>.)))))))))&--..#,,,,,,;@)))))))))$-#..=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&@))))))))$*-*..>,,,,,,#@)))))))))$**..>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=%@)))))))))&--'.&,,,,,,=&))))))))))@#-..+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;$))))))))))%--..;,,,,,,>$)))))))))))%-&.#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&))))))))))@#--..+,,,,,,;@)))))))))))&-'.%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>=,,,,,,,%@))))))))))$--#..=,,,,,,%))))))))))))$*#..=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;.>,&&=,,+$)))))))))))&--'.%,,,,,,,&))))))))))))@'*..>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,=>>>>>>+>>>>+>>>>+&$;#..;>>&)))))))))))@'--..%>>>>>>+&)))))))))))))&-&.%>>>>+>>>>+>>>>+>>>>+>>>>+>>>>+>>>>>>>>>>>>>>=,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,+...................@&.......$)))))))))))@#--..........$)))))))))))))$*#...............................................%>,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,#...................&)........@)))))))))))@*-*..........@)))))))))))))@#*.................................................+,,,,,,,,=....               ",
--"               ....+,,,,,,,,+....................@@.......$))))))))))))$*-*..........@))))))))))))))&-&.................................................=,,,,,,,=....               ",
--"               ....+,,,,,,,=....................&)@.......)))))))))))))$--#..........@))))))))))))))$*#.................................................%,,,,,,,=....               ",
--"               ....+,,,,,,,>....................@)$......&)))))))))))))$*-*..........)))))))))))))))@'*..................................................,,,,,,,=....               ",
--"               ....+,,,,,,,+....................)).......$)))))))))))))@*-#..........))))))))))))))))&-..................................................>,,,,,,=....               ",
--"               ....+,,,,,,,+...................@)).......@)))))))))))))@#-*..........))))))))))))))))$#'.................................................>,,,,,,=....               ",
--"               ....+,,,,,,,+...................@)@......&)))))))))))))))%-*..........)))))))))))))))))&-.................................................>,,,,,,=....               ",
--"               ....+,,,,,,,+..................$))$......$)))))))))))))))&--..........)))))))))))))))))$*'................................................>,,,,,,=....               ",
--"               ....+,,,,,,,+..................@))&......$)))))))))))))))$*-&.........)))))))))))))))))@%-................................................>,,,,,,=....               ",
--"               ....+,,,,,,,+..................))).......@))))))))))))))))&-#.........))))))))))))))))))&*'...............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................$))).......@))))))))))))))))$*-.........))))))))))))))))))@'*...............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................@))@.......))))))))))))))))))&-&........)))))))))))))))))))$*'..............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................)))@.%.....))))))))))))))))))$#*........@))))))))))))))))))@&-..............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+................$)))$.*.....)))))))))))))))))))&*&.......$)))))))))))))))))))$*#.............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+................@)))$'*.....@)))))))))))))))))))&*.......&))))))))))))))))))))&-&............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+...............&))))$**..&%&@)))))))))))))))))))@%#...%&%.))))))))))))))))))))$#*...&%%&%%&%%&%%&%%&%%&%%....................>,,,,,,=....               ",
--"               ....+,,,,,,,+...............$))))$*-..+,;@))))))))))))))))))))$#%..+,,#@))))))))))))))))))))&-#..%,,,,,,,,,,,,,,,,,,,,=+..................>,,,,,,=....               ",
--"               ....+,,,,,,,+...............@))))$--..+,+@)))))))))))))))))))))&#...=,=&))))))))))))))))))))).-&..#,,,,,,,,,,,,,,,,,,,,,=.................>,,,,,,=....               ",
--"               ....+,,,,,,,+...............)))))$*-%.#,>$))))))))))))))))))))))&#...=,'@))))))))))))))))))))@%-%..;,,,,,,,,,,,,,,,,,,,,,#................>,,,,,,=....               ",
--"               ....+,,,,,,,+..............$)))))$--&.#,,&))))))))))))))))))))))@&'..%,>$)))))))))))))))))))))$#-...+,,,,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+..............@)))))@*-#.%,,#@))))))))))))))))))))))@&'..%=%))))))))))))))))))))))&**...>,,,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+..............@)))))@#-#..,,+$)))))))))))))))))))))))@&%..;+$)))))))))))))))))))))@&--..#,,,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............&))))))@#-*..=,=&))))))))))))))))))))))))$'&..;%))))))))))))))))))))))@'-#..>,,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............&)))))))&--..+,,'@))))))))))))))))))))))))&#...#$))))))))))))))))))))))&*-..#,,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............@)))))))&--..#,,>$)))))))))))))))))))))))))&#....)))))))))))))))))))))))&-#..>,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............@)))))))@#-#.&=,,&)))))))))))))))))))))))))@&#...$))))))))))))))))))))))$#-..#,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............)))))))))#-*..>,,;@)))))))))))))))))))))))))@''...)))))))))))))))))))))))&-'..,,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............&)))))))))&--&.#,,=&))))))))))))))))))))))))))&*&..&))))))))))))))))))))))@#*..>,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............@)))))))))$*-'.&,,,#@))))))))))))))))))))))))))&*...@))))))))))))))))))))))&-..#,,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............@)))))))))@#-*..>,,=&))))))))))))))))))))))))))$##..$))))))))))))))))))))))@##..=,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............@))))))))))%--..#,,,%)))))))))))))))))))))))))))&-&..@))))))))))))))))))))))&*..+,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............)))))))))))$*-#..=,,>&))))))))))))))))))))))))))@#*..$))))))))))))))))))))))$*&.#,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............))))))))))))&--..#,,,%@))))))))))))))))))))))))))&-&..@)))))))))))))))))))))@''.%,,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........$))))))))))))&*-'..=,,+$))))))))))))))))))))))))))@#*..$))))))))))))))))))))))&#..=,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........$))))))))))))@'-*..;,,,&)))))))))))))))))))))))))))&-&..))))))))))))))))))))))$#..>,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........$)))))))))))))&*-'..=,,+$))))))))))))))))))))))))))$**..$))))))))))))))))))))))&..;,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........@)))))))))))))@'-*..;,,,.))))))))))))))))))))))))))@%-...))))))))))))))))))))))&%.%,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........@))))))))))))))$*-%..=,,;$))))))))))))))))))))))))))&-'..@)))))))))))))))))))))$&..,,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........@)))))))))))))))&-*..%,,=&))))))))))))))))))))))))))@'-..$)))))))))))))))))))))@&..>,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........@)))))))))))))))$#-#..>,,;@))))))))))))))))))))))))))&*&.&))))))))))))))))))))))...;,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........@))))))))))))))))&*-&.&=,=.)))))))))))))))))))))))))))&&..))))))))))))))))))))))$..%,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........@))))))))))))))))@&-#..+,,#@)))))))))))))))))))))))))))$.$))))))))))))))))))))))@...=,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........$)))))))))))))))))$#-%..=,>&)))))))))))))))))))))))))))))))))))))))))))))))))))))...>,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........$))))))))))))))))))$**..#,,#@))))))))))))))))))))))))))))))))))))))))))))))))))))...+,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...........&))))))))))))))))))@&-'..>,>$))))))))))))))))))))))))))))))))))))))))))))))))))))$..#,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............)))))))))))))))))))@%-..%,,&))))))))))))))))))))))))))))))))))))))))))))))))))))@..%,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............@)))))))))))))))))))$##..;,#@)))))))))))))))))))))))))))))))))))))))))))))))))))@...,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+............$))))))))))))))))))))&*&.&=>$))))))))))))))))))))))))))))))))))))))))))))))))))))...=,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............)))))))))))))))))))))%#..;,&))))))))))))))))))))))))))))))))))))))))))))))))))))&..>,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............@))))))))))))))))))))$''..=#@)))))))))))))))))))))))))))))))))))))))))))))))))))$..;,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.............&)))))))))))))))))))))&#..#+$)))))))))))))))))))))))))))))))))))))))))))))))))))$..;,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+..............@))))))))))))))))))))@&'..=$)))))))))))))))))))))))))))))))))))))))))))))))))))@..&,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+..............$)))))))))))))))))))))$'..+&)))))))))))))))))))))))))))))))))))))))))))))))))))@...=,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...............))))))))))))))))))))))...#%))))))))))))))))))))))))))))))))))))))))))))))))))))...=,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+...............$)))))))))))))))))))))$....))))))))))))))))))))))))))))))))))))))))))))))))))))...+,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+................))))))))))))))))))))))....))))))))))))))))))))))))))))))))))))))))))))))))))))...;,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+................$)))))))))))))))))))))$...@)))))))))))))))))))))))))))))))))))))))))))))))))))&&.#,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................))))))))))))))))))))))&..))))))))))))))))))))))))))))))))))))))))))))))))))))$%.%,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................$))))))))))))))))))))))&&))))))))))))))))))))))))))))))))))))))))))))))))))))$'..,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$#..=,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................+$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$*..>,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................=%)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$*..>,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,+&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-..;,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,#@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-%.#,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,=&)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-'.%,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,;$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@'-#.&,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,,&@))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@*-*..=,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,,>$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&--&..=,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,,,#@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-'..#,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,,,=&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$**..%,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,,,,>&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).*..&=,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,,,,,;$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$'...=,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................,,,,,,,,%@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).&..;,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................=,,,,,,,=&)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$...#,,,,,,,,,,,,,>................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................>,,,,,,,,>&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))...%,,,,,,,,,,,,,,+................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................;,,,,,,,,,#$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&..&=,,,,,,,,,,,,,,%................>,,,,,,=....               ",
--"               ....+,,,,,,,+..................+,,,,,,,,,#$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@...=,,,,,,,,,,,,,,;.................>,,,,,,=....               ",
--"               ....+,,,,,,,+...................#+>>>>>>>>%@))))))))))))))))))))))))))))))))))))))))))))))))))))))))@...#>>>>>>>>>>>>>+#..................>,,,,,,=....               ",
--"               ....+,,,,,,,+...............................@)))))))))))))))))))))))))))))))))))))))))))))))))))))))&.....................................>,,,,,,=....               ",
--"               ....+,,,,,,,+................................@)))))))))))))))))))))))))))))))))))))))))))))))))))))&......................................>,,,,,,=....               ",
--"               ....+,,,,,,,+................................&@)))))))))))))))))))))))))))))))))))))))))))))))))))$.......................................>,,,,,,=....               ",
--"               ....+,,,,,,,+.................................&@)))))))))))))))))))))))))))))))))))))))))))))))))@........................................>,,,,,,=....               ",
--"               ....+,,,,,,,+..................................&@)))))))))))))))))))))))))))))))))))))))))))))))$.........................................>,,,,,,=....               ",
--"               ....+,,,,,,,+...................................&@)))))))))))))))))))))))))))))))))))))))))))))$..........................................>,,,,,,=....               ",
--"               ....+,,,,,,,+....................................&@)))))))))))))))))))))))))))))))))))))))))))$...........................................>,,,,,,=....               ",
--"               ....+,,,,,,,+......................................@)))))))))))))))))))))))))))))))))))))))))&............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+.......................................$))))))))))))))))))))))))))))))))))))))@..............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+.........................................@)))))))))))))))))))))))))))))))))))&...............................................>,,,,,,=....               ",
--"               ....+,,,,,,,+..........................................$))))))))))))))))))))))))))))))))@.................................................=,,,,,,=....               ",
--"               ....+,,,,,,,=............................................$))))))))))))))))))))))))))))$&.................................................&,,,,,,,=....               ",
--"               ....+,,,,,,,,%.............................................$@))))))))))))))))))))))@$&...................................................;,,,,,,,=....               ",
--"               ....+,,,,,,,,=................................................$@@))))))))))))))@@@&'#%..................................................%,,,,,,,,=....               ",
--"               ....+,,,,,,,,,=&...................................................$$@@@@@@@$$&''**'...................................................%=,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,=+%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%..................#----'............%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%##+,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,&..................&''..............=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+....................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,&.....................................=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#......................................%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+........................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>&.........................................>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>............................................>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>..............................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#................................................#=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>%..................................................&+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>%......................................................%>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=;%..........................................................&;=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>................................................................+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.................................................................%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%................................................................#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=....               ",
--"               ....&,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>....               ",
--"                ....%;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>;.....               ",
--"                .....................................................................................................................................................               ",
--"                 ...................................................................................................................................................                ",
--"                 ..................................................................................................................................................                 ",
--"                   ...............................................................................................................................................                  ",
-+"180 180 17 1",
-+" 	c None",
-+".	c #020300",
-+"+	c #221E1C",
-+"@	c #312D2C",
-+"#	c #422D09",
-+"$	c #815711",
-+"%	c #5D5B5C",
-+"&	c #B5802B",
-+"*	c #A98F64",
-+"=	c #949495",
-+"-	c #E59C23",
-+";	c #FBA616",
-+">	c #F6C774",
-+",	c #E1CAA5",
-+"'	c #CFD2D4",
-+")	c #F9E3B8",
-+"!	c #F1F4F3",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                     ========                                                                                       ",
-+"                                                                                  ==============                                                                                    ",
-+"                                                                                %===============%%                                                                                  ",
-+"                                                                              ====================%%                                                                                ",
-+"                                                                            %%=====================%%                                                                               ",
-+"                                                                           %========================%%                                                                              ",
-+"                                                                          %=================='''=====%%                                                                             ",
-+"                                                                         %=================='''!'==%%=*=                                                                            ",
-+"                                                                        %%=================='+++'=%%%*,,,                                                                           ",
-+"                                                                       %%===================+++++=%%**),,)                                                                          ",
-+"                                                                      %%%%=======%%%%%%%=====+++==%*&->,,))))                                                                       ",
-+"                                                                     %%%%%%=%%%%%%@@@@@%%%%%=%%%%%*&-;-->>>))))                                                                     ",
-+"                                                                    @%%%%%%%%%@@+++++++++@%%%%%%*$&------->>>>))))                                                                  ",
-+"                                                                   @%%%%%%%%@@@+++++++++++@@%%*&&>>>>>---------->>>>))                                                              ",
-+"                                                                  @%%%%%%%@@++++++++++++++++@%$&&&>,>>>>---------&>>),                                                              ",
-+"                                                                 @@%%%%%@@+++++++++++++++++++##$$#**>>>>>>>>&*********                                                              ",
-+"                                                                @@@%%%@@++++++++++++++++++++++#$$$$&&&*>>>$$&&&&&&&***                                                              ",
-+"                                                               +@@@@@@++++++++++++++++++++++++@$&--&&$$&&&&&&&&---&&                                                                ",
-+"                                                              ++@@@@@++++++++++++++++++++++++++@#$&&--&--&&&&&$$$                                                                   ",
-+"                                                             +++@@@++++++++++++++++++++++++++++++#$$&&&&&&&&$$                                                                      ",
-+"                                                            ++++++++++++++++++++++++++++++++++++++++@####                                                                           ",
-+"                                                           +++++++++++++++++++++++++++++++++++++++++++                                                                              ",
-+"                                                          ++++++++++++++++++++++++++++++++++++++++++                                                                                ",
-+"                                                         ++++++++++++++++++++++++++++++++++++++++++                                                                                 ",
-+"                                                        +++++++++++++++++++++++++++++++++++++++++++                                                                                 ",
-+"                                                       +++++++++++++++++++++++++++++++++++++++++++                                                                                  ",
-+"                                                      ++++++++++++++++++++++++++++++++++++++++++++                                                                                  ",
-+"                                                     +++++++++++++++++++++++++++++++++++++++++++++                                                                                  ",
-+"                                                    ++++++++++++++++++++...++++++++++++++++++++++                                                                                   ",
-+"                                                   ++++++++++++++++@@%%=====%@+++++++++++++++++++                                                                                   ",
-+"                                                  ++++++++++++++++@%=='!!!!!'%@++++++++++++++++++                                                                                   ",
-+"                                                 +++++++++++++.+@%=''!!!!!!!!'=%+.+++++++++...++++                                                                                  ",
-+"                                                ++++++++++++++@%='!!!!!!!!!!!!!=%@+++++++@@%%%@+++                                                                                  ",
-+"                                               ++++++++++++++@='!!!!!!!!!!!!!!!!'=@++++++%='!'=@++                                                                                  ",
-+"                                              +++++++++++++@%='!!!!!!!!!!!!!!!!!!'==%%%%=='!!!'=%++                                                                                 ",
-+"                                             +++++++++++++@='!!!!!!!!!!!!!!!!!!!!!!'===='!!!!!!!=@++                                                                                ",
-+"                                            @@@++++++++++%='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=@+@@@                                                                             ",
-+"                                           @@@@++++++++@%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%+@@%%%%%%%%%%%%                                                                  ",
-+"                                         @@@@@++++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%@@%%%%%%%%%=========%                                                            ",
-+"                                        @@@@@@+++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=%@@%%%%%%%%%============                                                         ",
-+"                                       @@%@@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=@@%%%%%%%%%%%%==========                                                        ",
-+"                                     @%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'@@%%@@@@@@@@@@@@%%%========                                                     ",
-+"                                    %%%%%@@+++++++%='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%@@@@@++++++++++@@%%%%=======                                                   ",
-+"                                   %%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=%+++++++++++++++++++@%%===='==                                                 ",
-+"                                 %%%%%%@@+++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%++++++++++++++++++++@@%%=='''''                                               ",
-+"                                %%%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=++++@@@@@@@@@@@@@@+++++@%===''''                                              ",
-+"                               %%%%%%@@++++++++='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=@++@@%%=========%%@@+++++@@=='''''                                            ",
-+"                              %%%%%%@@+++++++@%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=%%%====''''''''''====%%@@++@%=='''''                                          ",
-+"                             %%%%%%%@++++++++%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='''!!!!!!!!!!!!!!!!'==%@@++@%='''''                                         ",
-+"                            %%%%%%%@++++++++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'==''!!!!!!!!!!!!!!!!!!''''=%%@@%%='''''                                       ",
-+"                           %%==%%%@++++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='!!!!!!!!!!!'''!!!!!!!!'==%@@%%==''''                                      ",
-+"                          %%==%%%@+++++++++%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='!!!!!''==               !''=%@@%='''''                                    ",
-+"                         %====%%@+++++++++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=='!!'''                       =%%%==='''=                                   ",
-+"                        %=====%@++++++++++=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==!!!=%                           =%%=====                                   ",
-+"                       %=====%@@++++++++@%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==!'%                                                                        ",
-+"                      %=====%@+++@%%@++.@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=='=                                                                         ",
-+"                     %=====%@@++@%==@++.%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=%                                                                          ",
-+"                     =====%%@++@%'==@++@%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==                                                                           ",
-+"                    %=====%@++@%'!=@+++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==                                                                           ",
-+"                   ======%@++%='!!%++++=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=                                                                           ",
-+"                  %=====%@++%='!!'%.++@'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=                                                                           ",
-+"                  ======%++@='!!'=%++@%'!!!!!!!!!!!!!!!!!!!!!))))))!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=                                                                           ",
-+"                 ======%@+%='!!!'%@++@='!!!!!!!!!!!!!!!!!!!!)>---->,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=      =====             ==                     ==            =             ",
-+"                ======%@+@='!!!!=@+++%'!!!!!!!!!!!!!!!!!!!!!)-;;;;;*,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'     ========            ==                     ==           ==             ",
-+"               ======%@+@%'!!!!'=+++.%'!!!!!!!!!!!!!!!!!!!!!)-;;;;-*='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'     ==    ===           ==                     ==           ==             ",
-+"               ======@+@%'!!!!!=%++++=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'    ===     =    =====   ==    ====   ==    ==  ==   =====  =====   ===     ",
-+"              ======%@@%'!!!!!'%++++@=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'    ==          =======  ==   ======  ==    ==  ==  ======= =====  =====    ",
-+"             ======%+@%'!!!!!=%@++++%=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'    ==          ==   ==  ==  ===  ==  ==    ==  ==  ==   ==  ==   ==   ==   ",
-+"            =='===%@@%'!!!!''=@++++@%=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!)>>>)!!!!!!!!!'    ==             ====  ==  ==       ==    ==  ==     ====  ==   =======   ",
-+"           ='''===@@='!!!!'=@  ++++@%'!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;>,!!!!!!!!!    ==           ======  ==  ==       ==    ==  ==   ======  ==   =======   ",
-+"          =''''=%%%='!!!''=%   ++++@%'!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>;;;;->'!!!!!!!!    ===     =   ===  ==  ==  ==       ==    ==  ==  ===  ==  ==   ==        ",
-+"         '''''==%%='!!!!'=@    @+++@='!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!)>;;;;-&='!!!!!!      ==    ===  ==   ==  ==  ===  ==  ==   ===  ==  ==   ==  ==   ===  ==   ",
-+"       ''''''=%%='!!!!'=%      @@++@='!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>;;;;-&='!!!!!!      ========   =======  ==   =====   ========  ==  =======  ====  =====    ",
-+"     '''''''===='!!!''=        @@@+@=!!!!!!!!!'''!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)--;-&*%=!!!!!!        =====     ==== == ==    ====    ==== ==  ==   ==== ==  ===   ===     ",
-+"  =''''''''==='!!!''=          @@@+@=!!!!!!!!!'''!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!)--&*%='!!!!!!                                                                             ",
-+" ='''''''''''''!''             @@@+@=!!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!,**%=''!!!!!!                                                                             ",
-+" ='''''''''!!!''               %@@+@='!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!''=='!!!!!!!                                                                              ",
-+"  =='''!!!                     %%@+@='!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!                                                                              ",
-+"                               %%%@@%'!!!!!'''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!))))!!!!!!!!!                                                                              ",
-+"                               %%%@@%'!!!!!'''''''''!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)>>>>))!!!!!!     ;;;;;;;;           ;;;;               ;;;;    ;;;                 ;;;     ",
-+"                               %%%@+%=!!!!!'''''''''!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)>-;->,''!!!!  ;;;;;;;;;;;;;-       ;;;;;-             ;;;;;-  ;;;;;;;           ;;;;;;-    ",
-+"                               %%%@+@=!!!!!''''''''''!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;-*''!!!  ;;;;;;;;;;;;;;;-      ;;;;;&             ;;;;;- $;;;;;;;;;       ;;;;;;;;-$   ",
-+"                                %=%@+=!!!!!''''''''''!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!!! ;;;;;;;;;;;;;;;;;-     ;;;;;&#            ;;;;;- $;;;;;;;;;-     ;;;;;;;;;&$   ",
-+"                                %=%@+%!!!!!'''''''''''!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!!);;;;;;;---&--;;;;;;-    ;;;;;&#            ;;;;;-.$;;;;;;;;;;-   ;;;;;;;;;-&$   ",
-+"                                %==%+%'!!!!''''''''''''!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)-;;;&*='!!>;;;;;;-&$$$$&-;;;;;-&   ;;;;;&#            ;;;;;-+#;----;;;;;;&&;;;;;;;---&$#   ",
-+"                                 ==%@@='!!!'''''''''''''!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!>;;;;;-&$      $-;;;;;-   ;;;;;&#            ;;;;;-+   $$&&-;;;;;;;;;;;-&$###     ",
-+"                                 ===@@%'!!!!''''''''''''''!!,-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!-;;;;;&#        &-;;;;;$  ;;;;;&#            ;;;;;-+      $--;;;;;;;;;-&#.        ",
-+"                                 %==%@@'!!!!'''''''''''''''!,-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*=' ;;;;;-$           ;;;;;$  ;;;;;&#            ;;;;;-+        &;;;;;;;;-$.          ",
-+"                                  ===%@=!!!!'''''''''''''''',-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*== ;;;;;&            ;;;;;&  ;;;;;&#            ;;;;;-+         -;;;;;;-$#           ",
-+"                                  ===%@%=!!!!''''''''''''''',-;;;;-$=''!!!!!!!!!!!!!!!!'>-;;;&*=  ;;;;;$            ;;;;;&$ -;;;;&#            ;;;;;-+          ;;;;;;-#            ",
-+"                                   ===%@%!!!!''''''''''''''',-;;;;-$=''!!!!!!!!!!!!'''''>-;;;&$   ;;;;-#            ;;;;;&$ -;;;;&#            ;;;;;-+          ;;;;;;&             ",
-+"                                   ===%@%'!!!!'''''''''''''',-;;;;-$=''!!!!!''''''''''''>-;;;&$   ;;;;-#            ;;;;;&$ -;;;;&#            ;;;;;-+           ;;;;-$             ",
-+"                            >)))    ===%%='!!!'''''''''''''',-;;;;-$='''''''''''''''''''>-;;;&$   ;;;;-#            ;;;;;&$ -;;;;&#            ;;;;;-+           ;;;;-$             ",
-+"                      -->>>>>>)))>>>****%%='!!!''''''''''''',-;;;;-$='''''''''''''''''''>-;;;&$   ;;;;-#            ;;;;;&$ -;;;;&#            ;;;;;-+           ;;;;-$             ",
-+"                    ;;-->>>>>>>))>>>>>>&*#*,'!!''''''''''''',>;;;;-&*'''''''''''''''''''>-;;;&$   ;;;;-#            ;;;;;&$ -;;;;&#            ;;;;;-+           ;;;;-$             ",
-+"                  ;;;;-->>>>>>>>>>>>>>>-&&&&,,'''''''''''''',>-;;;;&*=''''''''''''''''''>-;;;&$   ;;;;-#            ;;;;;&$ -;;;;&#            ;;;;;-+           ;;;;-&             ",
-+"                 ;;;;;--->>>>>>>>>>>>>------&>,,'''''''''''',>-;;;;-&=''''''''''''''''!!>;;;;&$   ;;;;-#            ;;;;;&$ -;;;;&$            ;;;;;&+          ;;;;;-&             ",
-+"               ;;;;;-;;--->>>>>>>>>>>>--------->,'''''''''''',-;;;;;&='''''''''''''''!!!>;;;;&$   ;;;;-#            ;;;;;&$ -;;;;-$            ;;;;-&+          ;;;;;;-             ",
-+"               ;;----;;;-->>>---->>>>-----------&>,'''''''''',-;;;;;-&'''''''''''''!!!   ;;;;&$   ;;;;-#            ;;;;;&$  ;;;;-&            ;;;;-&+         ;;;;;;;-&            ",
-+"              ;------;;;;-------;->----;;;;------&&,''''''''''>;;;;;;->,'''''''''!!!!    ;;;;&$   ;;;;-#            ;;;;;&$  ;;;;;-           ;;;;;-$+         ;;;;;;;;--           ",
-+"              ------;;;;;;;-----;-----;;;;;;;------&*'''''''''>-;;;;;;->,'''''!!!!!!     ;;;;&$   ;;;;-#            ;;;;;&$  ;;;;;-&          ;;;;;&$        ;;;;;;;;;;;--          ",
-+"              ------;;;;;;;-----;;;;;;;;;;;;;;;-----&>,''''''',>;;;;;;;->>>>,,)))>>>     ;;;;&$   ;;;;-#            ;;;;;&$   ;;;;;--        ;;;;;;$+       ;;;;;;--;;;;;-;         ",
-+"               -----;;;;;;-----;;;;;;;;;;;;;;;;------->,''''''',-;;;;;;;;;;;-----;;;;    ;;;;&$   ;;;;-#            ;;;;;&$   ;;;;;;;-     ;;;;;;;-#     ;;;;;;;;;&&-;;;;;;;;;      ",
-+"                 ---;;;;;;-----;;;;;;;;;;;;------------>,!!!!!!',-;;;;;;;;;;;;;;;;;;;$   ;;;;&$   ;;;;-#            ;;;;;&$    ;;;;;;;;;;;;;;;;;;-$#   ;;;;;;;;;;-$+#-;;;;;;;;;-    ",
-+"                  --;;;;;------;;;;;;;;;;;;----------;;->,!!!!!!!,>--;;;;;;;;;;;;;;;;#   ;;;;&$   ;;;;-#            ;;;;;&$     ;;;;;;;;;;;;;;;;-&#    ;;;;;;;;-&$+   --;;;;;;;-$   ",
-+"                  ----;;--------;;;;;;;;;;-----            !!!!!!!,&-;;;;;;;;;;;;;;;-#   ;;;;&$   ;;;;-#            ;;;;;&$      ;;;;;;;;;;;;;;;&#     ;;;;;;;-&#.     --;;;;;;&$   ",
-+"                  ----;----&------;;;;;;;---                         &&&-----------;-#   ;;--&$   ;;-;-#             ;;;-&$       ---;;;;;;;;-&$#      ;;---&&$#.       &&&----&$   ",
-+"                  -------&  &-------;;;;--&                           #$&&&&&&&&&&&&&#   ;-&&$#   ;-&&&#             --&&$#        &&--------&#.        -&&&$#.           $&&&&$#   ",
-+"                               ---------                                ##############    ####     ####               ####           #########            ###                ###    ",
-+"                                -------                                                                                                                                             ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
-+"                                                                                                                                                                                    ",
- "                                                                                                                                                                                    ",
- "                                                                                                                                                                                    ",
- "                                                                                                                                                                                    "};
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/garcon/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/garcon/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/garcon/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
deleted file mode 100644
index 460395081..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=diff merge(xfce-base/garcon)>=0.3
-diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
-index ed32acb..9922453 100644
---- a/garcon-gtk/garcon-gtk-menu.c
-+++ b/garcon-gtk/garcon-gtk-menu.c
-@@ -486,6 +486,8 @@ garcon_gtk_menu_reload (GarconGtkMenu *menu)
-   if (menu->priv->reload_id == 0
-       && menu->priv->is_loaded)
-     {
-+      GarconMenuItemCache *cache = garcon_menu_item_cache_get_default();
-+      garcon_menu_item_cache_invalidate(cache);
-       menu->priv->reload_id = g_timeout_add (100, garcon_gtk_menu_reload_idle, menu);
-     }
- }
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
deleted file mode 100644
index 34d49146e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Calculate format=diff merge(xfce-base/xfdesktop)>=4.11
-diff --git settings/main.c settings/main.c
-index e3d234b..b0b7150 100644
---- settings/main.c
-+++ settings/main.c
-@@ -1222,26 +1222,16 @@ cb_xfdesktop_combo_color_changed(GtkComboBox *combo,
- static void
- xfdesktop_settings_update_iconview_folder(AppearancePanel *panel)
- {
--    gchar *current_folder, *dirname;
-+    gchar *dirname = "/usr/share/backgrounds/xfce";
- 
-     /* If we haven't found our window return now and wait for that */
-     if(panel->wnck_window == NULL)
-         return;
- 
--    TRACE("entering");
--
--    current_folder = xfdesktop_settings_get_backdrop_image(panel);
--    dirname = g_path_get_dirname(current_folder);
--
--    XF_DEBUG("current_folder %s, dirname %s", current_folder, dirname);
--
-     gtk_file_chooser_set_current_folder((GtkFileChooser*)panel->btn_folder, dirname);
- 
-     /* Workaround for a bug in GTK */
-     cb_folder_selection_changed(panel->btn_folder, panel);
--
--    g_free(current_folder);
--    g_free(dirname);
- }
- 
- /* This function is to add or remove all the bindings for the background
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfwm4/black_background.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
deleted file mode 100644
index daca4e2c1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate format=diff
-diff --git a/src/compositor.c b/src/compositor.c
-index 1bf3322..37df1a4 100644
---- a/src/compositor.c
-+++ b/src/compositor.c
-@@ -861,9 +861,9 @@ root_tile (ScreenInfo *screen_info)
-         XRenderColor c;
- 
-         /* Background default to just plain ugly grey */
--        c.red   = 0x7f00;
--        c.green = 0x7f00;
--        c.blue  = 0x7f00;
-+        c.red   = 0x0000;
-+        c.green = 0x0000;
-+        c.blue  = 0x0000;
-         c.alpha = 0xffff;
-         picture = XRenderCreateSolidFill (dpy, &c);
-     }
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
deleted file mode 100644
index c6cf32bbf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if [[ ${EBUILD_PHASE} == configure ]]
-then
-    einfo "Change icon multimedia-volume-control"
-    grep -rl multimedia-volume-control | 
-        grep -v -e ChangeLog -e NEWS | 
-        xargs sed -i 's/multimedia-volume-control/stock_volume/g'
-fi
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout.patch
deleted file mode 100644
index d93985b55..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate format=diff
-diff --git src/xfpm-dpms.c src/xfpm-dpms.c
-index 53f3721..6fb0947 100644
---- src/xfpm-dpms.c
-+++ src/xfpm-dpms.c
-@@ -46,6 +46,16 @@ static void xfpm_dpms_finalize   (GObject *object);
- #define XFPM_DPMS_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_DPMS, XfpmDpmsPrivate))
- 
-+static void
-+set_saver(Display *dpy, int value)
-+{
-+    int timeout, interval, prefer_blank, allow_exp;
-+
-+    XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
-+    timeout = value;
-+    XSetScreenSaver(dpy, timeout, timeout, prefer_blank, allow_exp);
-+}
-+
- struct XfpmDpmsPrivate
- {
-     XfpmXfconf      *conf;
-@@ -75,6 +85,7 @@ xfpm_dpms_set_timeouts (XfpmDpms *dpms, guint16 standby, guint16 suspend, guint
- 	DPMSSetTimeouts (GDK_DISPLAY(), standby,
- 					suspend,
- 					off );
-+	set_saver(GDK_DISPLAY(), standby);
-     }
- }
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch b/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
deleted file mode 100644
index b1c938ffe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# Calculate format=diff merge(xfce-extra/xfce4-xkb-plugin)>=0.7
-diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c
-index 27ad119..9e563ac 100644
---- a/panel-plugin/xkb-cairo.c
-+++ b/panel-plugin/xkb-cairo.c
-@@ -31,7 +31,7 @@
- #include <librsvg/rsvg-cairo.h>
- #endif
- 
--#define XKB_PREFERRED_FONT "Courier New, Courier 10 Pitch, Monospace Bold"
-+#define XKB_PREFERRED_FONT "Droid Sans, Courier New, Courier 10 Pitch, Monospace Bold"
- 
- #define xkb_cairo_arc_for_flag(cr, x, y, r, a1, a2) \
-     xx = layoutx + width - 12 + x; \
-@@ -93,11 +93,11 @@ xkb_cairo_draw_flag (cairo_t *cr,
- 
-     rsvg_handle_get_dimensions (handle, &dim);
- 
--    scalex = (double) (width - 4) / dim.width;
--    scaley = (double) (height - 4) / dim.height;
-+    scalex = (double) (width - 16) / dim.width;
-+    scaley = (double) (height - 12) / dim.height;
- 
--    layoutx = (actual_width - width) / 2 + 2;
--    layouty = (actual_height - height) / 2 + 2;
-+    layoutx = (actual_width - width) / 2 + 8;
-+    layouty = (actual_height - height) / 2 + 6;
-     cairo_translate (cr, layoutx, layouty);
- 
-     cairo_save (cr);
-@@ -182,10 +182,10 @@ xkb_cairo_draw_label (cairo_t *cr,
-             scalex = scaley = 0.475;
-             break;
-         case DISPLAY_TEXTSIZE_MEDIUM:
--            scalex = scaley = 0.7;
-+            scalex = scaley = 0.6;
-             break;
-         case DISPLAY_TEXTSIZE_LARGE:
--            scalex = scaley = 1;
-+            scalex = scaley = 0.7;
-             break;
-     }
- 
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/.calculate_directory
deleted file mode 100644
index 7d82eaeca..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install ac_install_pxe==on
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_install_pxe/README-eng.txt
deleted file mode 100644
index c01da3e74..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-The ac_install_pxe event:
-- PXE system installation
-
-Action: system setup for PXE booting
-env: install
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_install_pxe/README-rus.txt
deleted file mode 100644
index b6abb26b1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/README-rus.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_pxe:
-- у�тановка PXE �и�темы
-
-Дей�твие: на�тройка PXE загрузки
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
deleted file mode 100644
index a9131c4fe..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!= path=/  name=etc
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/default/nfs b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
deleted file mode 100644
index 4828ad33c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/nfs symbolic
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/exports b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/exports
deleted file mode 100644
index 9882e1b24..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-fs/nfs-utils/exports
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=patch comment=#
-<reg>
-# PXE installation[^\n]*\n[^\n]+</reg>
-<text></text>
-<reg>\n+$</reg>
-<text>
-</text>
-<reg>
-(# PXE installation[^\n]*\n[^\n]+|$)</reg>
-<text>
-
-# PXE installation
-#-os_install_pxe_path-#/calculate *(ro,no_root_squash,acl,fsid=0,insecure,async,no_subtree_check)
-</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
deleted file mode 100644
index 16db28dee..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!= path=/etc  name=conf.d
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
deleted file mode 100644
index 79a92ad9a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/in.tftpd symbolic
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
deleted file mode 100644
index 46b77b292..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=openrc
-
-INTFTPD_PATH="#-os_install_pxe_path-#"
-INTFTPD_OPTS="-R 4096:32767 -s #-os_install_pxe_path-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
deleted file mode 100644
index 441c48d2b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!= path=/etc  name=dhcp
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
deleted file mode 100644
index 0f7257bce..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/default/dhcpd b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
deleted file mode 100644
index 9a8ad9a23..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/dhcpd symbolic
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf b/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
deleted file mode 100644
index 9c92b1fb3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate format=dhcp
-filename "pxelinux.0";
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
deleted file mode 100644
index a0bde4d6d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg()!= path=#-os_install_pxe_path-#  name=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0 b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
deleted file mode 100644
index ef9699788..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate format=bin mirror link=/usr/share/syslinux/pxelinux.0
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/boot.jpg b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/boot.jpg
deleted file mode 100644
index f67ecc490..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/boot.jpg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/boot.jpg
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/calcmenu.c32 b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/calcmenu.c32
deleted file mode 100644
index 5ef6c79d2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/calcmenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/calcmenu.c32
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/common.cfg b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/common.cfg
deleted file mode 100644
index 529902186..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/common.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/common.cfg
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/common.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/common.cfg.patch
deleted file mode 100644
index 881409000..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/common.cfg.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=patch name=common.cfg
-<reg> (/boot)</reg>
-<text> /calculate\1</text>
-<reg> (boot.jpg|lang.cfg|keymap.cfg|vga.cfg|timezone.cfg|f1.txt|video.cfg|memtest|calcmenu.c32)</reg>
-<text> pxelinux.cfg/\1</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
deleted file mode 100644
index 87c0ac9d1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/isolinux.cfg
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default.patch b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default.patch
deleted file mode 100644
index 6d104b3bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=patch name=default
-<reg> root=/dev/ram0</reg>
-<text> real_root=/dev/nfs nfsroot=#-os_install_pxe_ip-#:#-os_install_pxe_path-#/calculate</text>
-<reg> root=live:\S+</reg>
-<text> root=nfs:#-os_install_pxe_ip-#:#-os_install_pxe_path-#/calculate</text>
-<reg>\n\nLABEL harddisk([^\n]*\n*)+SLX=0x80</reg>
-<text></text>
-<reg>([ =])(/boot)</reg>
-<text>\1/calculate\2</text>
-<reg>KERNEL memtest</reg>
-<text>KERNEL calculate/syslinux/memtest</text>
-<reg> (common.cfg|calcmenu.c32)</reg>
-<text> pxelinux.cfg/\1</text>
-<reg> scandelay=\d+</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/f1.txt b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/f1.txt
deleted file mode 100644
index 577628ee9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/f1.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/f1.txt
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/keymap.cfg b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/keymap.cfg
deleted file mode 100644
index def9edcd4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/keymap.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/keymap.cfg
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/keymap.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/keymap.cfg.patch
deleted file mode 100644
index 76d7ac461..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/keymap.cfg.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=patch name=keymap.cfg
-<reg> (/boot)</reg>
-<text> /calculate\1</text>
-<reg> isolinux.cfg</reg>
-<text> pxelinux.cfg/default</text>
-<reg> (common.cfg|calcmenu.c32)</reg>
-<text> pxelinux.cfg/\1</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/lang.cfg b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/lang.cfg
deleted file mode 100644
index c8d97e43f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/lang.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/lang.cfg
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/lang.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/lang.cfg.patch
deleted file mode 100644
index 9386db4a4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/lang.cfg.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=patch name=lang.cfg
-<reg> (/boot)</reg>
-<text> /calculate\1</text>
-<reg> isolinux.cfg</reg>
-<text> pxelinux.cfg/default</text>
-<reg> (common.cfg|calcmenu.c32)</reg>
-<text> pxelinux.cfg/\1</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/timezone.cfg b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/timezone.cfg
deleted file mode 100644
index 999bb5862..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/timezone.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/timezone.cfg
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/timezone.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/timezone.cfg.patch
deleted file mode 100644
index ab9f2a3eb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/timezone.cfg.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=patch name=timezone.cfg
-<reg> (/boot)</reg>
-<text> /calculate\1</text>
-<reg> isolinux.cfg</reg>
-<text> pxelinux.cfg/default</text>
-<reg> (common.cfg|calcmenu.c32)</reg>
-<text> pxelinux.cfg/\1</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/vga.cfg b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/vga.cfg
deleted file mode 100644
index f5c5b318b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/vga.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/vga.cfg mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/vga.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/vga.cfg.patch
deleted file mode 100644
index 6fc71d26c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/vga.cfg.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=patch name=vga.cfg exists(#-os_install_pxe_path-#/pxelinux.cfg/vga.cfg)!=
-<reg> (/boot)</reg>
-<text> /calculate\1</text>
-<reg> isolinux.cfg</reg>
-<text> pxelinux.cfg/default</text>
-<reg> (common.cfg|calcmenu.c32)</reg>
-<text> pxelinux.cfg/\1</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/video.cfg b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/video.cfg
deleted file mode 100644
index 6dc40f4f8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/video.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=#-os_install_pxe_path-#/calculate/isolinux/video.cfg mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/video.cfg.patch b/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/video.cfg.patch
deleted file mode 100644
index c1cf203b6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/video.cfg.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=patch name=video.cfg exists(#-os_install_pxe_path-#/pxelinux.cfg/video.cfg)!=
-<reg> (/boot)</reg>
-<text> /calculate\1</text>
-<reg> isolinux.cfg</reg>
-<text> pxelinux.cfg/default</text>
-<reg> (common.cfg|calcmenu.c32|vga.cfg)</reg>
-<text> pxelinux.cfg/\1</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/zzz_Final/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_pxe/zzz_Final/.calculate_directory
deleted file mode 100644
index 663e2a40e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/zzz_Final/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate append=skip
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_pxe/zzz_Final/prepare-pxe b/profiles/templates/deprecated/3.4/6_ac_install_pxe/zzz_Final/prepare-pxe
deleted file mode 100644
index c1c2a3bf3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_pxe/zzz_Final/prepare-pxe
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate exec=/bin/bash
-
-rc-service -i in.tftpd restart
-rc-service -i nfs restart
-rc-service -i dhcpd restart
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/.calculate_directory
deleted file mode 100644
index 3c347ec89..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install ac_install_unmerge==on&&cl_merge_pkg_pass==
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/README-eng.txt
deleted file mode 100644
index 4ac0a24d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-The ac_install_unmerge event:
-- package removal
-
-Action: system setup when unmerging the package
-env: install
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/README-rus.txt
deleted file mode 100644
index 6cc37a442..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/README-rus.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_unmerge:
-- удаление пакета
-
-Дей�твие: на�тройка �и�темы при удалении пакета
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/clean_runlevels b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/clean_runlevels
deleted file mode 100644
index 2b69c0968..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/clean_runlevels
+++ /dev/null
@@ -1,75 +0,0 @@
-# Calculate run=/bin/bash
-
-#?ini(runlevels.syslog-ng)==on&&pkg(app-admin/syslog-ng)==#
-#-ini(runlevels.syslog-ng,)-#
-#ini#
-
-#?ini(runlevels.splashutils)==on&&pkg(media-gfx/splashutils)==#
-#-ini(runlevels.splashutils,)-#
-#ini#
-
-#?ini(runlevels.alsa-utils)==on&&pkg(media-sound/alsa-utils)==#
-#-ini(runlevels.alsa-utils,)-#
-#ini#
-
-#?ini(runlevels.cups)==on&&pkg(net-print/cups)==#
-#-ini(runlevels.cups,)-#
-#ini#
-
-#?ini(runlevels.calculate-utils/calculate-core)==on&&pkg(sys-apps/calculate-utils)==#
-#-ini(runlevels.calculate-utils/calculate-core,)-#
-#ini#
-
-#?ini(runlevels.dbus)==on&&pkg(sys-apps/dbus)==#
-#-ini(runlevels.dbus,)-#
-#ini#
-
-#?ini(runlevels.openrc/consolefont)==on&&pkg(sys-apps/openrc)==#
-#-ini(runlevels.openrc/consolefont,)-#
-#ini#
-
-#?ini(runlevels.consolekit)==on&&pkg(sys-auth/consolekit)==#
-#-ini(runlevels.consolekit,)-#
-#ini#
-
-#?ini(runlevels.eudev)==on&&pkg(sys-fs/eudev)==#
-#-ini(runlevels.eudev,)-#
-#ini#
-
-#?ini(runlevels.udev)==on&&pkg(sys-fs/udev)==#
-#-ini(runlevels.udev,)-#
-#ini#
-
-#?ini(runlevels.vixie-cron)==on&&pkg(sys-process/vixie-cron)==#
-#-ini(runlevels.vixie-cron,)-#
-#ini#
-
-#?ini(runlevels.openssh)==on&&pkg(net-misc/openssh)==#
-#-ini(runlevels.openssh,)-#
-#ini#
-
-#?ini(runlevels.bluez)==on&&pkg(net-wireless/bluez)==#
-#-ini(runlevels.bluez,)-#
-#ini#
-
-#?ini(runlevels.openrc/numlock)==on&&pkg(sys-apps/openrc)==#
-#-ini(runlevels.openrc/numlock,)-#
-#ini#
-
-#?ini(runlevels.preload)==on&&pkg(sys-apps/preload)==#
-#-ini(runlevels.preload,)-#
-#ini#
-
-#?ini(runlevels.lvm2)==on&&pkg(sys-fs/lvm2)==#
-#-ini(runlevels.lvm2,)-#
-#ini#
-
-#?ini(runlevels.mdadm)==on&&pkg(sys-fs/mdadm)==#
-#-ini(runlevels.mdadm,)-#
-#ini#
-
-#?ini(runlevels.calculate-utils/laptopd)==on&&pkg(sys-apps/calculate-utils)==#
-#-ini(runlevels.calculate-utils/laptopd,)-#
-#ini#
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/media-sound/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/media-sound/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/media-sound/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
deleted file mode 100644
index d1c054d50..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!= merge=media-sound/alsa-utils
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
deleted file mode 100644
index 113653875..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove path=/etc/udev/rules.d
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/recreate_initrd b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
deleted file mode 100644
index 6534ed2cc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
+++ /dev/null
@@ -1,67 +0,0 @@
-# Calculate exec=/bin/bash pkg(sys-kernel/dracut)!=&&os_install_root_type!=livecd&&cl_chroot_status==off
-#!/bin/bash
-
-source /usr/share/grub/grub-mkconfig_lib
-
-get_latest_kernel() {
-    version_find_latest /boot/vmlinuz-*
-}
-
-get_safemode_name() {
-    local kernel=$1
-    [[ $kernel =~ ^([^-]+-[^-]+)-(.+)$ ]] && echo "${BASH_REMATCH[1]}-SafeMode-${BASH_REMATCH[2]}" || echo ${kernel}
-}
-
-get_kernel_version() {
-    local kernel=$1
-    file -L $kernel | sed -r 's/.*version (\S+)\s+.*/\1/'
-}
-
-get_kernel_initramfs() {
-    local kernel=$1
-    echo ${kernel/vmlinuz-/initramfs-}.img
-}
-
-is_calculate_kernel() {
-    local kernel=$1
-    local kernel_version=$(get_kernel_version $kernel)
-    [[ -f /usr/src/linux-${kernel_version}/.calculate ]]
-}
-
-die() {
-    echo $@ 1>&2
-    exit 1
-}
-
-create_hostonly_initramfs() {
-    local kernel_safemode=$(get_safemode_name $kernel)
-    local initrd=$(get_kernel_initramfs $kernel)
-    local initrd_tmp=$(get_kernel_initramfs $kernel).tmp
-    local initrd_safemode=$(get_safemode_name $initrd)
-    local kernel_version=$(get_kernel_version $kernel)
-    [[ -n $kernel_version ]] || die "Failed to detect version"
-
-    echo "Creating Safe-mode initramfs ..."
-    dracut --xz -f --kver $kernel_version $initrd_tmp &>/dev/null ||
-        die "Failed to create Safe-mode initramfs"
-    mv $initrd_tmp $initrd_safemode &>/dev/null || die "Failed to create initramfs Safe-mode"
-    echo "Safe-mode initramfs has been created"
-    if [[ -e $initrd_safemode ]]
-    then
-        echo "Creating Host-Only initramfs ..."
-        dracut -H --xz -f --kver $kernel_version $initrd_tmp &>/dev/null ||
-            die "Failed to create Host-Only initramfs"
-        mv $initrd_tmp $initrd &>/dev/null || die "Failed to rename initramfs"
-        echo "Host-Only initramfs has been created"
-    fi
-}
-
-kernel=$(get_latest_kernel)
-
-if [[ -e $kernel ]] && [[ -e $(get_kernel_initramfs $kernel) ]]
-then
-    is_calculate_kernel $kernel && create_hostonly_initramfs $kernel
-else
-    echo "Re-creating initramfs was skipped"
-fi
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/restartUdev b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/restartUdev
deleted file mode 100644
index c92976b45..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-fs/udev/restartUdev
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate  exec=/bin/bash pkg(sys-apps/eudev)!=&&cl_chroot_status==off
-
-/etc/init.d/udev restart &>/dev/null
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
deleted file mode 100644
index ddf92522e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&ini(update.remove_old_kernel)!=off
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/calculate-sources/clear b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
deleted file mode 100644
index 208752530..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
+++ /dev/null
@@ -1,29 +0,0 @@
-# Calculate run=/bin/bash merge=sys-boot/grub
-
-echo "Clean directory /boot"
-#?merge(sys-kernel/calculate-sources)!=#
-for i in /boot/{initramfs,config,System.map,vmlinuz}-${PV}-*#-os_install_arch_machine-#-#-os_install_linux_shortname-#*{.old,}
-do
-    [[ -f $i || -L $i ]] && rm -f $i
-done
-#merge#
-
-# get extraversion from content package file
-EXTRAVERSION=$(sed -rn 's/^.*usr\/src\/linux-[^-]+(-[^\/]+)$/\1/p' /var/db/pkg/sys-kernel/${PN}-${PVR}/CONTENTS)
-
-for i in /boot/{initramfs,config,System.map,vmlinuz}-${PV}-{calculate,SafeMode}{.img,}{.old,}
-do
-    [[ -f $i || -L $i ]] && rm -f $i
-done
-for i in /boot/{initramfs,config,System.map,vmlinuz}-${PV}{-SafeMode,}${EXTRAVERSION}{.img,}{.old,}
-do
-    [[ -f $i || -L $i ]] && rm -f $i
-done
-
-echo "Remove kernel modules"
-rm -rf /lib/modules/${PV}${EXTRAVERSION}
-echo "Remove kernel sources"
-rm -rf /usr/src/linux-${PV}${EXTRAVERSION}
-
-rm -f /boot/*-#-cl_kernel_uid-#*
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/.calculate_directory
deleted file mode 100644
index 831109d84..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!= path=/etc name=local.d
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/ati-remove.start b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/ati-remove.start
deleted file mode 100644
index 52033d7c9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/ati-remove.start
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate chmod=0755 protected grep(/etc/X11/xorg.conf,fglrx)!=
-#!/bin/bash
-
-cl-setup-video --video radeon
-
-rm /etc/local.d/ati-remove.*
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/ati-remove.stop b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/ati-remove.stop
deleted file mode 100644
index 9a012c65e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/ati-drivers/ati-remove.stop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=0755 link=/etc/local.d/ati-remove.start mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
deleted file mode 100644
index 831109d84..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!= path=/etc name=local.d
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
deleted file mode 100644
index 6bc905439..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate chmod=0755 protected grep(/etc/X11/xorg.conf,nvidia)!=
-#!/bin/bash
-
-cl-setup-video --video nouveau
-
-rm /etc/local.d/nvidia-remove.*
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop b/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
deleted file mode 100644
index 76296c624..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate chmod=0755 link=/etc/local.d/nvidia-remove.start mirror
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/.calculate_directory
deleted file mode 100644
index 633228302..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=update ac_update_sync==on&&os_linux_ver>=14
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/README-eng.txt b/profiles/templates/deprecated/3.4/6_ac_update_sync/README-eng.txt
deleted file mode 100644
index 2996b912b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/README-eng.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-The ac_update_sync event:
-- Portage syncing
-
-Action: world update, fix system
-env: install
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/README-rus.txt b/profiles/templates/deprecated/3.4/6_ac_update_sync/README-rus.txt
deleted file mode 100644
index fe3ae65bb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/README-rus.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate append=skip
-
-Событие ac_update_sync:
-- обновление портежей
-
-Дей�твие: обновление world файла, и�правление �и�темы
-env: install
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/binhost/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/binhost/.calculate_directory
deleted file mode 100644
index 7527f524c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/binhost/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_ver>=3.4.0_beta1&&update.cl_update_binhost!=
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/binhost/binhost b/profiles/templates/deprecated/3.4/6_ac_update_sync/binhost/binhost
deleted file mode 100644
index 88b091200..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/binhost/binhost
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=# path=/etc/portage/make.conf
-
-PORTAGE_BINHOST="#-update.cl_update_binhost-#/grp/#-os_arch_machine-#"
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/00-ini b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/00-ini
deleted file mode 100644
index 665e1a7ff..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/00-ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env ini(overlay-calculate.remerge)==
-
-[overlay-calculate]
-# Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 173
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/.calculate_directory
deleted file mode 100644
index ef7855402..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-calculate.remerge)>=100&&ini(overlay-calculate.remerge)<200
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/101 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/101
deleted file mode 100644
index 94e8d5398..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/101
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<101
-
-[overlay-calculate]
-remerge = 101
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/102 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/102
deleted file mode 100644
index 4455799ea..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/102
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<102
-
-[overlay-calculate]
-remerge = 102
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/103 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/103
deleted file mode 100644
index 15ccdb928..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/103
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=net-misc/netifrc ini(overlay-calculate.remerge)<103
-
-[overlay-calculate]
-remerge = 103
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/104 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/104
deleted file mode 100644
index 5bc522c2b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/104
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=kde-frameworks/breeze-icons ini(overlay-calculate.remerge)<104
-
-[overlay-calculate]
-remerge = 104
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/105 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/105
deleted file mode 100644
index 51b4720e5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/105
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<105
-
-[overlay-calculate]
-remerge = 105
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/107 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/107
deleted file mode 100644
index cc89d341b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/107
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=kde-apps/kmail,net-irc/konversation,kde-apps/kopete,app-office/libreoffice,media-gfx/gimp,kde-apps/gwenview,media-sound/amarok,media-video/smplayer,kde-apps/kwrite ini(overlay-calculate.remerge)<107
-
-[overlay-calculate]
-remerge = 107
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/108 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/108
deleted file mode 100644
index 00a5c37bc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/108
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<108
-
-[overlay-calculate]
-remerge = 108
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/109 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/109
deleted file mode 100644
index 830b7feff..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/109
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-devel/prelink ini(overlay-calculate.remerge)<109
-
-[overlay-calculate]
-remerge = 109
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/110 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/110
deleted file mode 100644
index 869d0e6c6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/110
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-devel/prelink ini(overlay-calculate.remerge)<110
-
-[overlay-calculate]
-remerge = 110
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/113 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/113
deleted file mode 100644
index ab236ed16..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/113
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/openrc,net-dns/bind,net-im/ejabberd,sys-libs/glibc,sys-fs/eudev ini(overlay-calculate.remerge)<113
-
-[overlay-calculate]
-remerge = 113
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/116 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/116
deleted file mode 100644
index 2cb590fd4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/116
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=kde-apps/kde4-l10n,kde-apps/kde-l10n,kde-apps/kdepim-l10n ini(overlay-calculate.remerge)<116
-
-[overlay-calculate]
-remerge = 116
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/117 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/117
deleted file mode 100644
index 245360d6c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/117
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<117
-
-[overlay-calculate]
-remerge = 117
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/118 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/118
deleted file mode 100644
index df5852511..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/118
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<118
-
-[overlay-calculate]
-remerge = 118
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/119 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/119
deleted file mode 100644
index b5209aa13..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/119
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=app-shells/bash ini(overlay-calculate.remerge)<119
-
-[overlay-calculate]
-remerge = 119
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/120 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/120
deleted file mode 100644
index fc8fcf154..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/120
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=kde-apps/gwenview ini(overlay-calculate.remerge)<120
-
-[overlay-calculate]
-remerge = 120
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/121 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/121
deleted file mode 100644
index 0e406a8bf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/121
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-misc/sddm ini(overlay-calculate.remerge)<121
-
-[overlay-calculate]
-remerge = 121
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/122 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/122
deleted file mode 100644
index 93f1ab32e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/122
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-themes/gnome-themes-standard ini(overlay-calculate.remerge)<122
-
-[overlay-calculate]
-remerge = 122
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/123 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/123
deleted file mode 100644
index 54c7b02f8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/123
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/baselayout,sys-boot/grub ini(overlay-calculate.remerge)<123
-
-[overlay-calculate]
-remerge = 123
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/124 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/124
deleted file mode 100644
index 2757f191f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/124
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=kde-plasma/breeze ini(overlay-calculate.remerge)<124
-
-[overlay-calculate]
-remerge = 124
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/125 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/125
deleted file mode 100644
index 3835a160c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/125
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<125
-
-[overlay-calculate]
-remerge = 125
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/126 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/126
deleted file mode 100644
index 77662beb9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/126
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<126
-
-[overlay-calculate]
-remerge = 126
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/127 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/127
deleted file mode 100644
index 8d08ae982..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/127
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/openrc ini(overlay-calculate.remerge)<127
-
-[overlay-calculate]
-remerge = 127
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/128 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/128
deleted file mode 100644
index 460ac05de..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/128
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-kernel/dracut ini(overlay-calculate.remerge)<128
-
-[overlay-calculate]
-remerge = 128
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/129 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/129
deleted file mode 100644
index 68e71c933..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/129
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=app-portage/eix ini(overlay-calculate.remerge)<129
-
-[overlay-calculate]
-remerge = 129
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/130 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/130
deleted file mode 100644
index 058ff1844..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/130
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-kernel/calculate-sources ini(overlay-calculate.remerge)<130
-
-[overlay-calculate]
-remerge = 130
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/132 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/132
deleted file mode 100644
index 80cca54da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/132
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<132
-
-[overlay-calculate]
-remerge = 132
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/133 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/133
deleted file mode 100644
index 59f904f31..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/133
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=media-video/mplayer ini(overlay-calculate.remerge)<133
-
-[overlay-calculate]
-remerge = 133
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/134 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/134
deleted file mode 100644
index 7352f30d1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/134
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<134
-
-[overlay-calculate]
-remerge = 134
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/135 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/135
deleted file mode 100644
index 29f7e30f6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/135
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=media-sound/volumeicon ini(overlay-calculate.remerge)<135
-
-[overlay-calculate]
-remerge = 135
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/136 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/136
deleted file mode 100644
index cec720116..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/136
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-apps/xinit ini(overlay-calculate.remerge)<136
-
-[overlay-calculate]
-remerge = 136
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/138 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/138
deleted file mode 100644
index 44d03822f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/138
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=lxqt-base/lxqt-session,x11-terms/qterminal,lxqt-base/lxqt-about,media-gfx/lximage-qt ini(overlay-calculate.remerge)<138
-
-[overlay-calculate]
-remerge = 138
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/139 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/139
deleted file mode 100644
index ce10bc64e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/139
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-misc/lightdm,x11-base/xorg-server ini(overlay-calculate.remerge)<139
-
-[overlay-calculate]
-remerge = 139
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/140 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/140
deleted file mode 100644
index cb8d2fdf7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/140
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=xfce-base/xfce4-session ini(overlay-calculate.remerge)<140
-
-[overlay-calculate]
-remerge = 140
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/142 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/142
deleted file mode 100644
index c7fdb909b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/142
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-libs/qtermwidget,lxqt-base/lxqt-session ini(overlay-calculate.remerge)<142
-
-[overlay-calculate]
-remerge = 142
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/143 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/143
deleted file mode 100644
index d1a044c00..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/143
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=media-gfx/calculate-wallpapers ini(overlay-calculate.remerge)<143
-
-[overlay-calculate]
-remerge = 143
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/145 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/145
deleted file mode 100644
index 3205bdb2d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/145
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-kernel/calculate-sources ini(overlay-calculate.remerge)<145
-
-[overlay-calculate]
-remerge = 145
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/148 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/148
deleted file mode 100644
index f3db02b10..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/148
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=app-shells/gentoo-bashcomp ini(overlay-calculate.remerge)<148
-
-[overlay-calculate]
-remerge = 148
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/149 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/149
deleted file mode 100644
index fec638991..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/149
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-fs/udev-init-scripts ini(overlay-calculate.remerge)<149
-
-[overlay-calculate]
-remerge = 149
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/152 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/152
deleted file mode 100644
index 306aacb7f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/152
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=app-editors/vim ini(overlay-calculate.remerge)<152
-
-[overlay-calculate]
-remerge = 152
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/153 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/153
deleted file mode 100644
index 458fe2377..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/153
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=media-sound/alsa-utils ini(overlay-calculate.remerge)<153
-
-[overlay-calculate]
-remerge = 153
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/154 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/154
deleted file mode 100644
index 5099543b0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/154
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<154
-
-[overlay-calculate]
-remerge = 154
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/155 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/155
deleted file mode 100644
index cc33b1c6b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/155
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=net-im/telegram-desktop-bin ini(overlay-calculate.remerge)<155
-
-[overlay-calculate]
-remerge = 155
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/157 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/157
deleted file mode 100644
index 6a91d4c52..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/157
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-libs/glibc ini(overlay-calculate.remerge)<157
-
-[overlay-calculate]
-remerge = 157
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/158 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/158
deleted file mode 100644
index 16d6dd11a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/158
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-base/xorg-server ini(overlay-calculate.remerge)<158
-
-[overlay-calculate]
-remerge = 158
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/159 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/159
deleted file mode 100644
index a3a83691d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/159
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-themes/gnome-themes-standard ini(overlay-calculate.remerge)<159
-
-[overlay-calculate]
-remerge = 159
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/161 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/161
deleted file mode 100644
index 883806ed4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/161
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-libs/libX11,x11-base/xorg-server ini(overlay-calculate.remerge)<161
-
-[overlay-calculate]
-remerge = 161
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/162 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/162
deleted file mode 100644
index d30607f37..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/162
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<162
-
-[overlay-calculate]
-remerge = 162
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/163 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/163
deleted file mode 100644
index 37f0391e6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/163
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-fs/fuse ini(overlay-calculate.remerge)<163
-
-[overlay-calculate]
-remerge = 163
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/164 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/164
deleted file mode 100644
index 93d504f07..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/164
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-auth/pambase,app-admin/sudo ini(overlay-calculate.remerge)<164
-
-[overlay-calculate]
-remerge = 164
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/165 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/165
deleted file mode 100644
index 9c25758ef..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/165
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<165
-
-[overlay-calculate]
-remerge = 165
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/166 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/166
deleted file mode 100644
index f364fd9c3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/166
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=app-office/scribus ini(overlay-calculate.remerge)<166
-
-[overlay-calculate]
-remerge = 166
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/167 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/167
deleted file mode 100644
index 408fb9a5f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/167
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=net-misc/netifrc ini(overlay-calculate.remerge)<167
-
-[overlay-calculate]
-remerge = 167
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/169 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/169
deleted file mode 100644
index 81d89694b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/169
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<169
-
-[overlay-calculate]
-remerge = 169
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/173 b/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/173
deleted file mode 100644
index 93a2add28..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/remerge/101-200/173
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<173
-
-[overlay-calculate]
-remerge = 173
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/01-migrate-ini.env b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/01-migrate-ini.env
deleted file mode 100644
index fed4887f8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/01-migrate-ini.env
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate path=/etc/calculate name=ini.env format=samba ini(overlay-calculate.revision)<1
-
-[overlay-calculate]
-world = 1
-revision = #-ini(update.revision)-#
-
-[update]
-!remerge =
-!revision =
-!rev =
-!worldtest =
-!revtest =
-!remove_kernel =
-!clear_old_kernel =
-#?ini(update.remove_kernel)!=off&&ini(update.clear_old_kernel)!=off#
-remove_old_kernel = on
-#ini#
-#?ini(update.remove_kernel)==off||ini(update.clear_old_kernel)==off#
-remove_old_kernel = off
-#ini#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/02-restore_crontab_if_empty b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/02-restore_crontab_if_empty
deleted file mode 100644
index b404c2908..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/02-restore_crontab_if_empty
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<2 run=/bin/bash merge=sys-process/vixie-cron
-
-#-ini(overlay-calculate.revision,2)-#
-
-#?cl_chroot_status==off#
-/bin/sed -i '/cl-update/d' /etc/crontab
-
-# restore crontab if it is corrupted
-if ! grep -q lastrun/cron.hourly /etc/crontab
-then
-    (cat <<EOF
-# for vixie cron
-#
-# Global variables
-SHELL=/bin/bash
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-MAILTO=root
-HOME=/
-
-# check scripts in cron.hourly, cron.daily, cron.weekly and cron.monthly
-59  *  * * *  root    rm -f /var/spool/cron/lastrun/cron.hourly
-9  3  * * *   root    rm -f /var/spool/cron/lastrun/cron.daily
-19 4  * * 6   root    rm -f /var/spool/cron/lastrun/cron.weekly
-29 5  1 * *   root    rm -f /var/spool/cron/lastrun/cron.monthly
-*/10  *  * * *    root    test -x /usr/sbin/run-crons && /usr/sbin/run-crons
-EOF
-)>/etc/crontab
-fi
-#cl_chroot_status#
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/04-fix_chrome-binary-plugins_update b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/04-fix_chrome-binary-plugins_update
deleted file mode 100644
index b6ccb0722..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/04-fix_chrome-binary-plugins_update
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<4 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,4)-#
-
-#?pkg(www-plugins/chrome-binary-plugins)!=#
-test -f /var/db/pkg/www-plugins/chrome-binary-plugins-*/CONTENTS &&
-   sed -i '/chromium-browser\/libpdf.so/d' /var/db/pkg/www-plugins/chrome-binary-plugins-*/CONTENTS
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/06-fix_claws-mail_update b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/06-fix_claws-mail_update
deleted file mode 100644
index b03158595..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/06-fix_claws-mail_update
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<6 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,6)-#
-
-#?pkg(mail-client/claws-mail-address_keeper)!=#
-test -f /var/db/pkg/mail-client/claws-mail-address_keeper-*/CONTENTS &&
-   sed -i '/claws-mail\/plugins\/address_keeper.so/d' /var/db/pkg/mail-client/claws-mail-address_keeper-*/CONTENTS
-#pkg#
-#?pkg(mail-client/claws-mail-fancy)!=#
-test -f /var/db/pkg/mail-client/claws-mail-fancy-*/CONTENTS &&
-   sed -i '/claws-mail\/plugins\/fancy.so/d' /var/db/pkg/mail-client/claws-mail-fancy-*/CONTENTS
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/10-restore_alsa_conf b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/10-restore_alsa_conf
deleted file mode 100644
index e5e5fe15b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/10-restore_alsa_conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate dotall format=patch ini(overlay-calculate.revision)<10&&pkg(media-sound/alsa-utils)!= path=/etc/init.d name=alsasound merge=media-sound/alsa-utils
-
-#-ini(overlay-calculate.revision,10)-#
-
-<reg>\n\s*einfo "Setting up ALSA Mixer Levels".*?&amp;&amp;\s*restore\s*fi</reg>
-<text>\n\t\tewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/100-rebuild_ntfs3g b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/100-rebuild_ntfs3g
deleted file mode 100644
index c0c289af6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/100-rebuild_ntfs3g
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<100 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,100)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["sys-fs/ntfs3"]="2016.2.22-r1 2016.2.22_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/11-remove_old_metadata b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/11-remove_old_metadata
deleted file mode 100644
index 44b7d47ad..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/11-remove_old_metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<11 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,11)-#
-
-/bin/rm -rf /var/cache/edb/dep/usr/portage
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/12-fix_cl-update b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/12-fix_cl-update
deleted file mode 100644
index a745ad741..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/12-fix_cl-update
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=diff pkg(sys-apps/calculate-update)<3.2.2&&ini(overlay-calculate.revision)<12
-#-ini(overlay-calculate.revision,12)-#
---- /usr/lib/python2.7/site-packages/calculate/update/utils/cl_update.py
-+++ /usr/lib/python2.7/site-packages/calculate/update/utils/cl_update.py
-@@ -115,11 +115,6 @@
-         {'name': 'update:update_perl',
-          'group': __("Updating Perl"),
-          'tasks': [
--             {'name': 'update:update_perl_pkg',
--              'message': __('Updating {0}').format(pkg_color('dev-lang/perl')),
--              'method': 'Update.emerge("-u","dev-lang/perl")',
--              'condition': need_upgrade('dev-lang/perl$')
--             },
-              {'name': 'update:perl_cleaner',
-               'message': __('Find & rebuild packages and Perl header files '
-                             'broken due to a perl upgrade'),
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/13-disable_parallel_boot b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/13-disable_parallel_boot
deleted file mode 100644
index a52905b9a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/13-disable_parallel_boot
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<13 path=/etc name=rc.conf format=openrc
-
-#-ini(overlay-calculate.revision,13)-#
-
-rc_parallel="NO"
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/14-clean_ini_env b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/14-clean_ini_env
deleted file mode 100644
index a7ef4eead..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/14-clean_ini_env
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate dotall format=patch ini(overlay-calculate.revision)<14 path=/etc/calculate name=ini.env
-
-<reg>\n{3,}</reg>
-<text>\n\n</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/16-rebuild_xfdesktop b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/16-rebuild_xfdesktop
deleted file mode 100644
index 0b24f8001..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/16-rebuild_xfdesktop
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<16 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,16)-#
-
-PKGDB=/var/db/pkg
-[[ -d $PKGDB/xfce-base/xfdesktop-4.11.8 ]] && mv $PKGDB/xfce-base/xfdesktop-4.11.8 $PKGDB/xfce-base/xfdesktop-4.11.7
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/17-remove_root_dot_config b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/17-remove_root_dot_config
deleted file mode 100644
index 18ec99323..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/17-remove_root_dot_config
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<17 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,17)-#
-
-#?cl_chroot_status==off#
-[[ -d /.config ]] && rm -rf /.config &>/dev/null
-#cl_chroot_status#
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/18-fix_xinitrc b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/18-fix_xinitrc
deleted file mode 100644
index 6c07dc8c1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/18-fix_xinitrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate dotall format=patch ini(overlay-calculate.revision)<18 path=/etc/X11/xinit name=xinitrc
-<reg>^\s*</reg>
-<text></text>
-<reg>Calculate ini change revision</reg>
-<text>#-ini(overlay-calculate.revision,18)-#</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/19-rebulid_garcon b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/19-rebulid_garcon
deleted file mode 100644
index 9d75a69db..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/19-rebulid_garcon
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<19 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,19)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["xfce-base/garcon"]="0.3.0 0.3.0_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/20-remove_old_kernel_on b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/20-remove_old_kernel_on
deleted file mode 100644
index 08dcae375..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/20-remove_old_kernel_on
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate path=/etc/calculate name=ini.env format=samba ini(overlay-calculate.revision)<20
-
-[update]
-remove_old_kernel = on
-
-[overlay-calculate]
-revision = 20
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/21-restore_dracut_conf b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/21-restore_dracut_conf
deleted file mode 100644
index 6f3740472..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/21-restore_dracut_conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate multiline format=patch pkg(sys-kernel/dracut)!=&&ini(overlay-calculate.revision)<21 path=/etc name=dracut.conf
-<reg>^omit_dracutmodules.*$</reg>
-<text>omit_dracutmodules+=""</text>
-<reg>^add_dracutmodules.*$</reg>
-<text>add_dracutmodules+=""</text>
-<reg>Calculate ini change revision</reg>
-<text>#-ini(overlay-calculate.revision,21)-#</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/22-rebuild_plymouth_openrc b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/22-rebuild_plymouth_openrc
deleted file mode 100644
index 5529516b8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/22-rebuild_plymouth_openrc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<22 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,22)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["sys-boot/plymouth-openrc-plugin"]="0.1.2 0.1.2_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/23-fix_mc_skin b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/23-fix_mc_skin
deleted file mode 100644
index 035bd9590..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/23-fix_mc_skin
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate dotall format=patch pkg(app-misc/mc)!=&&ini(overlay-calculate.revision)<23&&exists(/root/.config/mc/skins/modarcon16root-defbg.ini)!= path=/root/.config/mc/skins name=modarcon16root-defbg.ini
-<reg>dhoriz=[^[]*?
-
-\[</reg>
-<text>dhoriz=─
-  dvert=│
-  dlefttop=┌
-  drighttop=�
-  dleftbottom=â””
-  drightbottom=┘
-  dtopmiddle=─
-  dbottommiddle=─
-  dleftmiddle=├
-  drightmiddle=┤
-
-[</text>
-<reg>Calculate ini change revision</reg>
-<text>#-ini(overlay-calculate.revision,23)-#</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/24-fix_libtool b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/24-fix_libtool
deleted file mode 100644
index ade6d3d38..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/24-fix_libtool
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<24 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,24)-#
-
-#?pkg(sys-devel/libtool)<2.4.3-r2#
-for delpath in  /usr/include/libltdl/lt_dlloader.h \
-  /usr/include/libltdl/lt_error.h \
-  /usr/include/libltdl/lt_system.h \
-  /usr/include/ltdl.h \
-  /usr/lib64/libltdl.la \
-  /usr/lib64/libltdl.so \
-  /usr/lib64/libltdl.so.7
-do
-test -f /var/db/pkg/sys-devel/libtool-*/CONTENTS &&
-   sed -i "/ ${delpath////\/} /d" /var/db/pkg/sys-devel/libtool-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/25-calculate-core_default b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/25-calculate-core_default
deleted file mode 100644
index 680536204..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/25-calculate-core_default
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<25 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,25)-#
-
-if [[ -L /etc/runlevels/boot/calculate-core ]]
-then
-	rc-update del calculate-core boot &>/dev/null
-	rc-update add calculate-core default &>/dev/null
-fi
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/26-clean_kdm_themes b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/26-clean_kdm_themes
deleted file mode 100644
index c7ee2cfb9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/26-clean_kdm_themes
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<26 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,26)-#
-
-#?pkg(media-gfx/kdm-themes-calculate)!=#
-rm -rf /usr/share/apps/ksplash/Themes/CalculateSplashEn
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/27-fix_gnome-themes-standard b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/27-fix_gnome-themes-standard
deleted file mode 100644
index b17bb1d53..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/27-fix_gnome-themes-standard
+++ /dev/null
@@ -1,35 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<27 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,27)-#
-
-#?pkg(x11-themes/gnome-themes-standard)<3.14#
-for delfile in 00008160000006810000408080010102 circle fleur right_side \
-    028006030e0e7ebffc7f7070c0600140 copy grabbing right_tee \
-    03b6e0fcb3499374a867c041f52298f0 cross hand sb_down_arrow \
-    08e8e1c95fe2fc01f976f1e063a24ccd crossed_circle hand1 sb_h_double_arrow \
-    1081e37283d90000800003c07f3ef6bf crosshair hand2 sb_left_arrow \
-    14fef782d02440884392942c11205230 cross_reverse h_double_arrow sb_right_arrow \
-    2870a09082c103050810ffdffffe0204 d9ce0ab605698f320427677b458ad60b help sb_up_arrow \
-    3085a0e285430894940527032f8b26df diamond_cross icon sb_v_double_arrow \
-    3ecb610c1bf2410f44200f48c40d3599 dnd-ask left_ptr target \
-    4498f0e0c1937ffe01fd06f973665830 dnd-copy left_ptr_help tcross \
-    5c6cd98b3f3ebcb1f9c7f1c204630408 dnd-link left_ptr_watch top_left_arrow \
-    6407b0e94181790501fd1e167b474872 dnd-move left_side top_left_corner \
-    640fb0e74195791501fd1ed57b41487f dnd-none left_tee top_right_corner \
-    9081237383d90e509aa00f00170e968f dotbox link top_side \
-    9d800788f1b08800ae810202380a0822 dot_box_mask ll_angle top_tee \
-    arrow double_arrow lr_angle ul_angle \
-    bd_double_arrow draft_large move ur_angle \
-    bottom_left_corner draft_small pencil v_double_arrow \
-    bottom_right_corner draped_box pirate watch \
-    bottom_side e29285e634086352946a0e7090d73106 plus X_cursor \
-    bottom_tee fcf1c3c7cd4491d801f1e1c78f100000 question_arrow xterm \
-    c7088f0f3e6c8088236ef8e1e3e70000 fd_double_arrow right_ptr
-do
-    delpath="/usr/share/cursors/xorg-x11/Adwaita/cursors/${delfile}"
-    test -f /var/db/pkg/x11-themes/gnome-themes-standard-*/CONTENTS &&
-        sed -i "/ ${delpath////\/} /d" /var/db/pkg/x11-themes/gnome-themes-standard-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/28-fix_udisks b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/28-fix_udisks
deleted file mode 100644
index 0d5cd1d39..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/28-fix_udisks
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<28 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,28)-#
-
-#?pkg(sys-fs/udisks:2)!=#
-for delfile in org.freedesktop.udisks.policy
-do
-    delpath="/usr/share/polkit-1/actions/${delfile}"
-    test -f /var/db/pkg/sys-fs/udisks-2.1*/CONTENTS &&
-        sed -i "/ ${delpath////\/} /d" /var/db/pkg/sys-fs/udisks-2.1*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/29-rebuild_xfwm4 b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/29-rebuild_xfwm4
deleted file mode 100644
index 693dc3d06..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/29-rebuild_xfwm4
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<29 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,29)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["xfce-base/xfwm4"]="4.11.2 4.11.2_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/30-net_trigger b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/30-net_trigger
deleted file mode 100644
index 655bf7c6e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/30-net_trigger
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<30 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,30)-#
-
-#?cl_chroot_status==off&&pkg(sys-fs/eudev)!=&&pkg(sys-fs/eudev)<3.0#
-/bin/udevadm trigger -c add -s net &>/dev/null
-#cl_chroot_status#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/31-fix_emul-linux-x86-bjdeps b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/31-fix_emul-linux-x86-bjdeps
deleted file mode 100644
index 8a6f13be2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/31-fix_emul-linux-x86-bjdeps
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<31 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,31)-#
-
-#?pkg(app-emulation/emul-linux-x86-bjdeps)!=#
-for delpath in  /usr/lib32/libpopt.so.0.0.0 \
-  /usr/lib32/libpopt.so.0 \
-  /usr/lib32/libpopt.so
-do
-test -f /var/db/pkg/app-emulation/emul-linux-x86-bjdeps-*/CONTENTS &&
-   sed -i "/ ${delpath////\/} /d" /var/db/pkg/app-emulation/emul-linux-x86-bjdeps-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/32-fix_nss_ldap b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/32-fix_nss_ldap
deleted file mode 100644
index e7c451b0a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/32-fix_nss_ldap
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<32 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,32)-#
-
-#?pkg(sys-auth/nss_ldap)!=#
-test -f /var/db/pkg/sys-auth/nss_ldap-*/CONTENTS &&
-sed -i "/ \/etc\/ldap.conf /d" /var/db/pkg/sys-auth/nss_ldap-*/CONTENTS
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/33-fix_qt_emul b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/33-fix_qt_emul
deleted file mode 100644
index 2c8db18c9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/33-fix_qt_emul
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<33 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,33)-#
-
-#?pkg(dev-qt/qtcore)!=&&pkg(dev-qt/qtcore)<4.8.6#
-test -f /var/db/pkg/dev-qt/qtcore-*/CONTENTS &&
-   sed -i "/ \/usr\/share\/qt4\/translations/d" /var/db/pkg/dev-qt/qtcore-*/CONTENTS
-#pkg#
-#
-#?pkg(app-emulation/emul-linux-x86-bjdeps)!=#
-for delpath in /usr/lib32/libpopt.so \
-  /usr/lib32/libpopt.so.0 \
-  /usr/lib32/libpopt.so.0.0.0
-do
-test -f /var/db/pkg/app-emulation/emul-linux-x86-bjdeps-*/CONTENTS &&
-   sed -i "/ ${delpath////\/} /d" /var/db/pkg/app-emulation/emul-linux-x86-bjdeps-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/34-clean_tmp_runlevels b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/34-clean_tmp_runlevels
deleted file mode 100644
index 72ee81493..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/34-clean_tmp_runlevels
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<34 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,34)-#
-
-rm -rf /var/lib/calculate/-runlevels-*
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/35-rebuild_garcon b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/35-rebuild_garcon
deleted file mode 100644
index 94bc1c9b7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/35-rebuild_garcon
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<35 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,35)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["xfce-base/garcon"]="0.5.0 0.5.0_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/37-rebuild_portage b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/37-rebuild_portage
deleted file mode 100644
index 091c1ea22..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/37-rebuild_portage
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<37 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,37)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["sys-apps/portage"]="2.2.18 2.2.18_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/38-rebuild_os-prober b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/38-rebuild_os-prober
deleted file mode 100644
index f48afe566..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/38-rebuild_os-prober
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<38 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,38)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["sys-boot/os-prober"]="1.62 1.62_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/39-fix_gnome-common b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/39-fix_gnome-common
deleted file mode 100644
index 9354a2a3e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/39-fix_gnome-common
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<39 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,39)-#
-
-#?pkg(gnome-base/gnome-common)!=#
-for delpath in /usr/share/aclocal/ax_check_enable_debug.m4 \
-  /usr/share/aclocal/ax_code_coverage.m4
-do
-test -f /var/db/pkg/gnome-base/gnome-common-*/CONTENTS &&
-   sed -i "/ ${delpath////\/} /d" /var/db/pkg/gnome-base/gnome-common-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/42-rebuild_lightdm b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/42-rebuild_lightdm
deleted file mode 100644
index f824ac862..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/42-rebuild_lightdm
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<42 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,42)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["x11-misc/lightdm"]="1.10.5 1.10.5_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/43-fix_root_qtgui b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/43-fix_root_qtgui
deleted file mode 100644
index 0e48a52de..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/43-fix_root_qtgui
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate name=Trolltech.conf format=raw path=/root/.config ini(overlay-calculate.revision)<43&&ini(overlay-calculate.revision,43)==&&cl_chroot_status==off&&pkg(dev-qt/qtgui)!=
-[qt]
-font="Droid Sans,10,-1,5,50,0,0,0,0,0"
-style=GTK+
-#?pkg(kde-base/kdelibs)!=#
-Palette\active=#221f1e, #dfdcd9, #f6f5f5, #dfdcdb, #797472, #b7afab, #1f1c1b, #ffffff, #221f1e, #ffffff, #d6d2d0, #464342, #43ace8, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #181513, #e7fdff
-Palette\inactive=#221f1e, #dfdcd9, #f6f5f5, #dfdcdb, #797472, #b7afab, #1f1c1b, #ffffff, #221f1e, #ffffff, #d6d2d0, #464342, #94caef, #221f1e, #0057ae, #644a9b, #f8f7f6, #000000, #181513, #e7fdff
-Palette\disabled=#908d8b, #d6d2ce, #eceae9, #d7d3d1, #746f6c, #afa8a4, #a9a7a7, #ffffff, #969391, #f4f4f4, #cdc8c6, #454240, #cdc8c6, #908d8b, #97bcdf, #c1b6d7, #eeece9, #000000, #181513, #e7fdff
-KWinPalette\activeBackground=#30aee8
-KWinPalette\activeBlend=#ffffff
-KWinPalette\activeForeground=#ffffff
-KWinPalette\frame=#d6d2d0
-KWinPalette\activeTitleBtnBg=#d6d2d0
-KWinPalette\inactiveBackground=#e0dfde
-KWinPalette\inactiveBlend=#4b4743
-KWinPalette\inactiveForeground=#4b4743
-KWinPalette\inactiveFrame=#d6d2d0
-KWinPalette\inactiveTitleBtnBg=#d6d2d0
-KDE\contrast=5
-#pkg#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/44-rebuild_splashutils b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/44-rebuild_splashutils
deleted file mode 100644
index 98e0b1331..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/44-rebuild_splashutils
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<44 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,44)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["media-gfx/splashutils"]="1.5.4.4-r5 1.5.4.4_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/45-fix_baselayout b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/45-fix_baselayout
deleted file mode 100644
index c628e0739..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/45-fix_baselayout
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<45 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,45)-#
-
-test -f /var/db/pkg/sys-apps/baselayout-*/CONTENTS &&
-   sed -i "/ \/etc\/mtab/d" /var/db/pkg/sys-apps/baselayout-*/CONTENTS
-#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/46-drop_cache b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/46-drop_cache
deleted file mode 100644
index b02ba2014..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/46-drop_cache
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate name=emerge_parser.py format=patch path=/usr/lib/python2.7/site-packages/calculate/update ini(overlay-calculate.revision)<46&&ini(overlay-calculate.revision,46)==&&cl_chroot_status==off&&pkg(sys-apps/calculate-utils)<3.3.2.8
-<reg>(def get_cached_package_list\(self\):)(
-        )(self\.read_cache)</reg>
-<text>\1\2return None\2\3</text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/51-rebuild_chroot_initrd b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/51-rebuild_chroot_initrd
deleted file mode 100644
index e5eb0c9b8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/51-rebuild_chroot_initrd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<51 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,51)-#
-
-#?pkg(sys-kernel/dracut)!=&&pkg(media-gfx/splashutils)!=&&main.cl_chroot_status==on#
-KVER=$(readlink /usr/src/linux)
-if [[ -n $KVER ]]
-then
-    /usr/bin/dracut --kver=${KVER#linux-} -f &>/dev/null
-fi
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/53-rebuild_portage b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/53-rebuild_portage
deleted file mode 100644
index 744aa3d2b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/53-rebuild_portage
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<53 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,53)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["sys-apps/portage"]="2.2.20.1 2.2.20.1_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/54-shadow b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/54-shadow
deleted file mode 100644
index a35f858e3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/54-shadow
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<54 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,54)-#
-
-test -f /var/db/pkg/sys-apps/shadow-*/CONTENTS &&
-   sed -i "/ \/etc\/shadow/d" /var/db/pkg/sys-apps/shadow-*/CONTENTS
-#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/55-env-update b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/55-env-update
deleted file mode 100644
index d7e545c08..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/55-env-update
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<55 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,55)-#
-
-#?cl_chroot_status==off#
-/usr/sbin/env-update
-#cl_chroot_status#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/56-rebuild_lightdm-gtk-greeter b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/56-rebuild_lightdm-gtk-greeter
deleted file mode 100644
index ced22d266..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/56-rebuild_lightdm-gtk-greeter
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<56 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,56)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["x11-misc/lightdm-gtk-greeter"]="2.0.1 2.0.1_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/57-rebuild_xfce4-xkb-plugin b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/57-rebuild_xfce4-xkb-plugin
deleted file mode 100644
index a4b58b471..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/57-rebuild_xfce4-xkb-plugin
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<57 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,57)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["xfce-extra/xfce4-xkb-plugin"]="0.7.1 0.7.1_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/58-locale_gen b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/58-locale_gen
deleted file mode 100644
index 6bb18e29f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/58-locale_gen
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<58 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,58)-#
-
-/usr/sbin/locale-gen
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/59-chroot_locale_gen b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/59-chroot_locale_gen
deleted file mode 100644
index 8d2d50026..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/59-chroot_locale_gen
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<59 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,59)-#
-
-#?cl_chroot_status==on#
-/usr/sbin/locale-gen
-#cl_chroot_status#
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/60-fix_eudev b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/60-fix_eudev
deleted file mode 100644
index 1180722e7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/60-fix_eudev
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<60 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,60)-#
-
-#?pkg(sys-fs/eudev)<3.1.5#
-for delpath in /usr/include/gudev-1.0/gudev/gudev.h \
-  /usr/include/gudev-1.0/gudev/gudevclient.h \
-  /usr/include/gudev-1.0/gudev/gudevdevice.h \
-  /usr/include/gudev-1.0/gudev/gudevenumerator.h \
-  /usr/include/gudev-1.0/gudev/gudevenums.h \
-  /usr/include/gudev-1.0/gudev/gudevenumtypes.h \
-  /usr/include/gudev-1.0/gudev/gudevtypes.h \
-  /usr/lib64/girepository-1.0/GUdev-1.0.typelib \
-  /usr/lib64/libgudev-1.0.so \
-  /usr/lib64/libgudev-1.0.so.0 \
-  /usr/lib64/libgudev-1.0.so.0.2.0 \
-  /usr/lib64/pkgconfig/gudev-1.0.pc \
-  /usr/lib/girepository-1.0/GUdev-1.0.typelib \
-  /usr/lib/libgudev-1.0.so \
-  /usr/lib/libgudev-1.0.so.0 \
-  /usr/lib/libgudev-1.0.so.0.2.0 \
-  /usr/lib/pkgconfig/gudev-1.0.pc \
-  /usr/share/gir-1.0/GUdev-1.0.gir
-do
-test -f /var/db/pkg/sys-fs/eudev-*/CONTENTS &&
-   sed -i "/ ${delpath////\\/} /d" /var/db/pkg/sys-fs/eudev-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/62-rebuild_chroot_initrd b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/62-rebuild_chroot_initrd
deleted file mode 100644
index 1f185d7d0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/62-rebuild_chroot_initrd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<62 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,62)-#
-
-#?pkg(sys-kernel/dracut)!=&&pkg(media-gfx/splashutils)!=&&main.cl_chroot_status==on#
-KVER=$(readlink /usr/src/linux)
-if [[ -n $KVER ]]
-then
-    /usr/bin/dracut --xz --kver=${KVER#linux-} -f &>/dev/null
-fi
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/64-rebuild_for_libdb_4.8 b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/64-rebuild_for_libdb_4.8
deleted file mode 100644
index cded8a48c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/64-rebuild_for_libdb_4.8
+++ /dev/null
@@ -1,32 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<64 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,64)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["dev-lang/perl"]="5.20.2 5.20.2_rc73"
-                      ["dev-lang/ruby"]="2.1.7 2.1.7_rc73"
-                      ["dev-lang/ruby"]="2.0.0_p647-r1 2.0.0_p647"
-                      ["dev-libs/redland"]="1.0.16 1.0.16_rc73"
-                      ["gnome-extra/evolution-data-server"]="3.16.5 3.16.5_rc73"
-                      ["mail-filter/bogofilter"]="1.2.4-r1 1.2.4_rc73"
-                      ["net-libs/libetpan"]="1.6 1.6_rc73"
-                      ["net-mail/mailutils"]="2.99.98 2.99.98_rc73"
-                      ["net-nds/openldap"]="2.4.38-r2 2.4.38_rc73"
-                      ["sys-apps/iproute2"]="4.3.0 4.3.0_rc73"
-                      ["sys-libs/pam"]="1.2.1 1.2.1_rc73"
-                      ["x11-libs/libqxt"]="0.6.2-r2 0.6.2_rc73"
-                      ["dev-libs/cyrus-sasl"]="2.1.26-r9 2.1.26_rc73"
-                      ["net-fs/netatalk"]="3.1.6 3.1.6_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/65-remove_libdb_6.0 b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/65-remove_libdb_6.0
deleted file mode 100644
index ed0b11d2d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/65-remove_libdb_6.0
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<65 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,65)-#
-
-#?pkg(sys-libs/db:6.0)!=#
-DBPKG=/var/db/pkg
-OLDPN=sys-libs/db-6.0.35
-NEWPN=sys-libs/db-0_rc73
-
-if [[ -d $DBPKG/$OLDPN ]]
-then
-	mv $DBPKG/$OLDPN $DBPKG/$NEWPN
-	echo 0 >$DBPKG/$NEWPN/SLOT
-
-	grep -rnP "sys-libs/db[^ ]*:6" $DBPKG/*/*/*DEPEND | awk -F: '{print $1}' |
-	while read fn
-	do
-		sed -ri 's/(sys-libs\/db[^ ]*):[^ []+/\1/' $fn
-	done
-fi
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/67-rebuild_bash b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/67-rebuild_bash
deleted file mode 100644
index e429e25a9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/67-rebuild_bash
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<67 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,67)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["app-shells/bash"]="4.3_p42-r1 4.3_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/68-fix_amdgpu-ucode b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/68-fix_amdgpu-ucode
deleted file mode 100644
index b55e087f0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/68-fix_amdgpu-ucode
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<68 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,68)-#
-
-#?pkg(sys-firmware/amdgpu-ucode)!=&&pkg(sys-kernel/linux-firmware)!=#
-:> /var/db/pkg/sys-firmware/amdgpu-ucode*/CONTENTS
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/69-fix_breeze b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/69-fix_breeze
deleted file mode 100644
index a4e723ab2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/69-fix_breeze
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<69 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,69)-#
-
-#?pkg(kde-plasma/breeze)!=#
-sed -i '/start-here/d' /var/db/pkg/kde-plasma/breeze-5.*/CONTENTS
-declare -A map_move=( 
-        ["kde-plasma/breeze"]="5.6.2 5.6.2_rc73"
-        ["kde-frameworks/breeze-icons"]="5.21.0 5.21.0_rc73"
-    )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/70-revert_prelink b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/70-revert_prelink
deleted file mode 100644
index 9c0fdf2fc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/70-revert_prelink
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<70 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,70)-#
-
-#?pkg(sys-devel/prelink)!=&&cl_chroot_status==off#
-echo "Revert binaries and libraries to their original content before they were prelinked..."
-/usr/sbin/prelink -au &>/dev/null
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/71-fix_kde4-l10n b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/71-fix_kde4-l10n
deleted file mode 100644
index 341cec672..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/71-fix_kde4-l10n
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<71 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,71)-#
-
-#?pkg(kde-apps/kde4-l10n)!=#
-for delpath in /usr/share/doc/HTML/sr@latin/khelpcenter/index.cache.bz2 \
-    /usr/share/doc/HTML/sr@latin/khelpcenter/index.docbook
-do
-test -f /var/db/pkg/kde-apps/kde4-l10n-*/CONTENTS &&
-   sed -i "/ ${delpath////\\/} /d" /var/db/pkg/kde-apps/kde4-l10n-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/73-change_profile b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/73-change_profile
deleted file mode 100644
index 1f8fc45bf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/73-change_profile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<73 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,73)-#
-
-for arch in x86 amd64
-do
-	if [[ "$(readlink -f /etc/portage/make.profile)" =~ .*distros/profiles/CLSK/${arch}$ ]]
-	then
-		rm /etc/portage/make.profile
-		ln -sf ../../var/lib/layman/distros/profiles/CLD/${arch} /etc/portage/make.profile
-	fi
-done
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/74-fix_imageview b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/74-fix_imageview
deleted file mode 100644
index 1a3e413c3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/74-fix_imageview
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate path=/etc/calculate name=ini.env format=samba ini(overlay-calculate.revision)<74
-
-[overlay-calculate]
-revision = 74
-
-#?ini(desktop.imageview)==digikam#
-[desktop]
-!imageview = 
-#ini#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/75-change_profile b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/75-change_profile
deleted file mode 100644
index b1ac83e27..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/75-change_profile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<75 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,75)-#
-
-for arch in x86 amd64
-do
-	for pname in CLD CLDX CDS
-	do
-		if [[ "$(readlink -f /etc/portage/make.profile)" =~ .*distros/profiles/${pname}\+/${arch}$ ]]
-		then
-			rm /etc/portage/make.profile
-			ln -sf ../../var/lib/layman/distros/profiles/${pname}/${arch} /etc/portage/make.profile
-		fi
-	done
-done
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/76-change_python b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/76-change_python
deleted file mode 100644
index c090e1828..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/76-change_python
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<76 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,76)-#
-
-/usr/bin/eselect python set python3.4
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/77-apply_calculate_env b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/77-apply_calculate_env
deleted file mode 100644
index 6c239bfc9..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/77-apply_calculate_env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<77 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,77)-#
-
-/usr/sbin/etc-update --automode -5 /etc/calculate/calculate.env &>/dev/null
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/78-rebuild_kiconthemes b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/78-rebuild_kiconthemes
deleted file mode 100644
index 847cf02ed..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/78-rebuild_kiconthemes
+++ /dev/null
@@ -1,22 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<78 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,78)-#
-
-#?pkg(kde-frameworks/kiconthemes)!=#
-declare -A map_move=( 
-        ["kde-frameworks/kiconthemes"]="5.21.0 5.21.0_rc73"
-    )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/79-fix_kde_dirs b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/79-fix_kde_dirs
deleted file mode 100644
index 97380c0ec..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/79-fix_kde_dirs
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<79 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,79)-#
-
-#?pkg(kde-apps/kde4-l10n)!=#
-delpath=/kde4-l10n
-test -f /var/db/pkg/kde-apps/kde4-l10n-*/CONTENTS &&
-   sed -i "/ ${delpath////\\/}/d" /var/db/pkg/kde-apps/kde4-l10n-*/CONTENTS
-#pkg#
-
-#?pkg(kde-apps/kde-l10n)!=#
-delpath=/kde-l10n
-test -f /var/db/pkg/kde-apps/kde-l10n-*/CONTENTS &&
-   sed -i "/ ${delpath////\\/}/d" /var/db/pkg/kde-apps/kde-l10n-*/CONTENTS
-#pkg#
-#
-#?pkg(kde-apps/kdepim-l10n)!=#
-delpath=/kdepim-l10n
-test -f /var/db/pkg/kde-apps/kdepim-l10n-*/CONTENTS &&
-   sed -i "/ ${delpath////\\/}/d" /var/db/pkg/kde-apps/kdepim-l10n-*/CONTENTS
-#pkg#
-
-for dn in /kdepim-l10n /kde-l10n /kde4-l10n
-do
-    [[ -d $dn ]] && rmdir $dn
-done
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/80-fix_rc_conf b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/80-fix_rc_conf
deleted file mode 100644
index 73b54810b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/80-fix_rc_conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=patch path=/etc name=rc.conf ini(overlay-calculate.revision)<80
-
-#-ini(overlay-calculate.revision,80)-#
-
-<reg>rc_hostname_before="net.lo"
-</reg>
-<text></text>
-<reg>rc_udev_need="hostname"
-</reg>
-<text></text>
-<reg>rc_named_after="ldap"
-</reg>
-<text></text>
-<reg>rc_jabberd_after="ldap"
-</reg>
-<text></text>
-<reg>rc_nscd_use="!net logger root"
-</reg>
-<text></text>
-<reg>rc_nscd_before="dbus xdm"
-</reg>
-<text></text>
-<reg>no_umounts="/newroot[.][*]:/lib/splash/cache:/lib64/splash/cache"
-</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/81-fix_localmount_conf b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/81-fix_localmount_conf
deleted file mode 100644
index b8a62bf72..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/81-fix_localmount_conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=patch path=/etc/conf.d name=localmount ini(overlay-calculate.revision)<81
-
-#-ini(overlay-calculate.revision,81)-#
-
-<reg>no_umounts="/newroot[.][*]:/lib/splash/cache:/lib64/splash/cache.*
-</reg>
-<text></text>
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/84-fix_gnome-icon-theme b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/84-fix_gnome-icon-theme
deleted file mode 100644
index f5d997ecf..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/84-fix_gnome-icon-theme
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<84 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,84)-#
-
-#?pkg(x11-themes/gnome-icon-theme)!=#
-for delpath in /usr/share/icons/HighContrast/index.theme
-do
-    test -f /var/db/pkg/x11-themes/gnome-icon-theme-3*/CONTENTS &&
-        sed -i "/ ${delpath////\\/} /d" /var/db/pkg/x11-themes/gnome-icon-theme-3*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/85-fix_calculate-sources b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/85-fix_calculate-sources
deleted file mode 100644
index 12b2db730..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/85-fix_calculate-sources
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<85 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,85)-#
-
-#?pkg(sys-kernel/calculate-sources)!=#
-if ! [ -L /usr/src/linux ]
-then
-    for fn in /usr/src/linux/linux-*-calculate
-    do
-        mv $fn /usr/src/linux.symlink || break
-    done
-    rm -rf /usr/src/linux
-    mv /usr/src/linux.symlink /usr/src/linux
-fi
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/86-fix_eudev b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/86-fix_eudev
deleted file mode 100644
index 4b65d7738..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/86-fix_eudev
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<86 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,86)-#
-
-#?pkg(sys-fs/eudev)!=#
-for delpath in /etc/init.d/udev \
-  /etc/conf.d/udev \
-  /etc/runlevels/sysinit/udev
-do
-test -f /var/db/pkg/sys-fs/eudev-*/CONTENTS &&
-   sed -i "/ ${delpath////\\/} /d" /var/db/pkg/sys-fs/eudev-*/CONTENTS
-done
-#pkg#
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/87-fix-udev-init-scripts b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/87-fix-udev-init-scripts
deleted file mode 100644
index 0b1a9d14f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/87-fix-udev-init-scripts
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<87 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,87)-#
-
-[[ -d /udev-init-scripts ]] && rmdir /udev-init-scripts
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/88-rescan_mirrors b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/88-rescan_mirrors
deleted file mode 100644
index 6b3563c47..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/88-rescan_mirrors
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=samba ini(overlay-calculate.revision)<66 name=calculate.env path=/etc/calculate
-
-#-ini(overlay-calculate.revision,88)-#
-
-#?cl_chroot_status==off#
-[update]
-!cl_update_binhost=
-#cl_chroot_status#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/89-rebuild_sddm b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/89-rebuild_sddm
deleted file mode 100644
index 110eebf0a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/89-rebuild_sddm
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<89 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,89)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["x11-misc/sddm"]="0.14.0-r1 0.14.0_rc73" )
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/90-clear-outdated b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/90-clear-outdated
deleted file mode 100644
index a8dd75545..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/90-clear-outdated
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<90 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,90)-#
-
-for fn in /etc/conf.d/fbcondecor \
-    /etc/runlevels/default/fbcondecor \
-    /etc/runlevels/sysinit/udev-mount \
-    /etc/runlevels/boot/calculate-builder \
-    /etc/runlevels/default/calculate-builder
-do
-    rm -f "${fn}"
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/91-rebuild_openconnect_libproxy b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/91-rebuild_openconnect_libproxy
deleted file mode 100644
index b548e2480..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/91-rebuild_openconnect_libproxy
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<91 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,91)-#
-
-# key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["net-libs/libproxy"]="0.4.13-r1 0.4.13_rc73"
-    ["net-misc/openconnect"]="7.07-r2 7.07_rc73"
-)
-
-PKGDB=/var/db/pkg
-for pkg in ${!map_move[@]}
-do
-    vers=(${map_move[$pkg]})
-    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
-    then
-        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
-        rm -rf $PKGDB/${pkg}-${vers[0]}
-    fi
-done
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/92-locale_gen b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/92-locale_gen
deleted file mode 100644
index 7b7088823..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/92-locale_gen
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<92 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,92)-#
-
-#?cl_chroot_status==off#
-/usr/sbin/locale-gen
-#cl_chroot_status#
-
-true
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/94-fix-openrc-baselayout-util b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/94-fix-openrc-baselayout-util
deleted file mode 100644
index e91394a1b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/94-fix-openrc-baselayout-util
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<94 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,94)-#
-
-test -f /var/db/pkg/sys-apps/baselayout-[0-9]*/CONTENTS &&
-   sed -i "/ \/etc\/shadow/d" /var/db/pkg/sys-apps/baselayout-[0-9]*/CONTENTS
-
-test -f /var/db/pkg/sys-apps/openrc-*/CONTENTS &&
-   sed -i "/ \/etc\/mtab/d" /var/db/pkg/sys-apps/openrc-*/CONTENTS
-
-test -f /var/db/pkg/sys-apps/openrc-*/CONTENTS &&
-   sed -i "/ \/etc\/resolv.conf/d" /var/db/pkg/sys-apps/openrc-*/CONTENTS
-
-test -f /var/db/pkg/sys-apps/util-linux-*/CONTENTS &&
-   sed -i "/ \/etc\/fstab/d" /var/db/pkg/sys-apps/util-linux-*/CONTENTS
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/95-fix-shadow b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/95-fix-shadow
deleted file mode 100644
index b294fd0b7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/95-fix-shadow
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate ini(overlay-calculate.revision)<95 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,95)-#
-
-[[ -f /etc/shadow ]] && chmod 0600 /etc/shadow
-[[ -f /etc/shadow- ]] && chmod 0600 /etc/shadow-
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/98-fix_ati-drivers b/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/98-fix_ati-drivers
deleted file mode 100644
index 05adeef5b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/revision/98-fix_ati-drivers
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate exec=/bin/bash ini(overlay-calculate.revision)<98 exec=/bin/bash
-
-#-ini(overlay-calculate.revision,98)-#
-
-test -f /var/db/pkg/x11-drivers/ati-drivers-*/CONTENTS &&
-   sed -i "/lib\/modules/d" /var/db/pkg/x11-drivers/ati-drivers-*/CONTENTS
-
-
-exit 0
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/.calculate_directory
deleted file mode 100644
index 38e1ddec0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/var/lib name=portage
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/0-ini b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/0-ini
deleted file mode 100644
index dd3d3f1da..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/0-ini
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-calculate.world)==
-
-[overlay-calculate]
-world = 6
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/.calculate_directory
deleted file mode 100644
index efc748522..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_update_world==merge||cl_update_world==rebuild
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/0-world b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/0-world
deleted file mode 100644
index 68f6918d6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/0-world
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove cl_update_world==rebuild name=world
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/base b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/base
deleted file mode 100644
index 9e1e8851c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/create/base
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate name=world format=world in(os_linux_pkglist,calculate)!=
-
-app-portage/eix
-app-portage/gentoolkit
-app-portage/layman
-dev-vcs/git
-media-gfx/gfxboot-themes-calculate
-net-fs/nfs-utils
-sys-apps/calculate-utils:3
-sys-apps/openrc
-sys-apps/v86d
-sys-boot/grub:2
-sys-boot/os-prober
-sys-fs/e2fsprogs
-sys-fs/eudev
-sys-kernel/calculate-sources
-
-#?os_arch_machine==x86_64#
-sys-boot/efibootmgr
-sys-boot/gnu-efi
-app-crypt/shim-signed
-app-crypt/sbsigntool
-#os_arch_machine#
-
-#?in(os_linux_pkglist, desktop)!=#
-sys-fs/ecryptfs-utils
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/.calculate_directory
deleted file mode 100644
index 3ee654385..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_update_world==merge&&os_linux_shortname==destkop||cl_update_world==merge&&os_linux_shortname==server||cl_update_world==rebuild&&os_linux_shortname==desktop||cl_update_world==rebuild&&os_linux_shortname==server
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/app-portage b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/app-portage
deleted file mode 100644
index e569dcc9b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/app-portage
+++ /dev/null
@@ -1,57 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-portage/cfg-update
-app-portage/conf-update
-app-portage/cpuid2cpuflags
-app-portage/deltup
-app-portage/demerge
-app-portage/diffmask
-app-portage/distpatch
-app-portage/eclass-manpages
-app-portage/eix
-app-portage/elogv
-app-portage/elogviewer
-app-portage/emerge-delta-webrsync
-app-portage/epkg
-app-portage/esearch
-app-portage/etc-proposals
-app-portage/euscan
-app-portage/euses
-app-portage/fetchcommandwrapper
-app-portage/flaggie
-#app-portage/fquery
-app-portage/g-cpan
-app-portage/genlop
-app-portage/gentoolkit
-app-portage/gentoolkit-dev
-app-portage/gentoopm
-app-portage/getdelta
-app-portage/g-octave
-app-portage/gpytage
-app-portage/gpyutils
-#app-portage/gs-elpa
-#app-portage/g-sorcery
-#app-portage/gs-pypi
-app-portage/install-mask
-#app-portage/java-ebuilder
-app-portage/kuroo4
-app-portage/layman
-app-portage/metagen
-app-portage/mirrorselect
-app-portage/overlint
-app-portage/perl-info
-app-portage/pfl
-app-portage/portage-utils
-app-portage/porthole
-app-portage/porticron
-app-portage/portpeek
-app-portage/pqlop
-app-portage/repo-commit
-app-portage/repoman
-app-portage/smart-live-rebuild
-app-portage/splat
-app-portage/tatt
-app-portage/ufed
-app-portage/unsandbox
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/applications b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/applications
deleted file mode 100644
index 3119a26c2..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/applications
+++ /dev/null
@@ -1,39 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-editors/bluefish
-app-editors/gvim
-app-editors/juffed
-app-editors/latexila
-app-editors/leafpad
-#app-i18n/poedit
-app-misc/rox-filer
-app-misc/xmind
-app-office/abiword
-#app-office/calligra
-app-office/dia
-app-office/gnumeric
-app-office/libreoffice
-app-office/lyx
-app-office/orage
-app-office/scribus
-app-office/texmacs
-app-office/texmaker
-app-office/texstudio
-app-text/calibre
-app-text/cherrytree
-app-text/fbless
-app-text/fbreader
-app-text/kchmviewer
-app-text/keepnote
-app-text/mupdf
-app-text/qpdfview
-app-text/xournal
-dev-db/pgadmin3
-dev-util/meld
-kde-misc/openofficeorg-thumbnail
-sci-calculators/galculator
-sci-calculators/keurocalc
-sci-calculators/speedcrunch
-x11-misc/zim
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/base b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/base
deleted file mode 100644
index 74a2616f7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/base
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-media-fonts/terminus-font
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-sys-apps/calculate-toolkit
-sys-apps/ifplugd
-sys-apps/less
-sys-kernel/dracut
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/children b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/children
deleted file mode 100644
index d26aabe54..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/children
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-media-gfx/tuxpaint
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/decoration b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/decoration
deleted file mode 100644
index 1b09cf015..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/decoration
+++ /dev/null
@@ -1,28 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-media-gfx/grub-splashes-calculate
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-media-gfx/calculate-wallpapers
-media-gfx/dm-themes-calculate
-media-gfx/lightdm-themes-calculate
-media-gfx/plasma-themes-calculate
-x11-misc/nitrogen
-x11-themes/audacious-themes
-x11-themes/calculate-icon-theme
-x11-themes/calculate-xcursors
-x11-themes/claws-mail-theme-calculate
-x11-themes/elementary-icon-theme
-x11-themes/faenza-icon-theme
-x11-themes/gnome-themes-standard
-x11-themes/greybird
-x11-themes/gtk-engines
-x11-themes/pidgin-penguins-smileys
-x11-themes/slim-themes
-x11-themes/smplayer-skins
-x11-themes/smplayer-themes
-x11-themes/tangerine-icon-theme
-x11-themes/xfwm4-themes
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/dev-python b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/dev-python
deleted file mode 100644
index 3323d9446..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/dev-python
+++ /dev/null
@@ -1,943 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-dev-python/3to2
-dev-python/addons
-dev-python/adodb-py
-dev-python/aioeventlet
-dev-python/alabaster
-dev-python/alembic
-dev-python/amqplib
-dev-python/aniso8601
-dev-python/ansi2html
-dev-python/ansicolor
-dev-python/anyjson
-dev-python/anyvc
-dev-python/aodhclient
-dev-python/apipkg
-dev-python/appdirs
-dev-python/apptools
-dev-python/apse
-dev-python/apsw
-dev-python/aquarium
-dev-python/argcomplete
-dev-python/argh
-dev-python/arrayterator
-dev-python/assets
-dev-python/astng
-dev-python/astor
-dev-python/astroid
-dev-python/async
-#dev-python/atom
-dev-python/authres
-dev-python/autobahn
-dev-python/automaton
-dev-python/autopep8
-dev-python/axiom
-dev-python/Babel
-dev-python/babelfish
-dev-python/backports
-dev-python/backports-abc
-dev-python/backports-lzma
-dev-python/backports-ssl-match-hostname
-dev-python/bandit
-#dev-python/basemap
-dev-python/bashate
-dev-python/batinfo
-dev-python/bcrypt
-dev-python/beaker
-dev-python/beanstalkc
-dev-python/beautifulsoup
-dev-python/bicyclerepair
-dev-python/billiard
-dev-python/biplist
-dev-python/bitarray
-dev-python/bitstring
-dev-python/BitVector
-dev-python/bjoern
-#dev-python/blaze
-dev-python/bleach
-dev-python/blinker
-#dev-python/blockcanvas
-dev-python/blosc
-#dev-python/blz
-#dev-python/bokeh
-dev-python/boto
-dev-python/bottle
-#dev-python/bottleneck
-dev-python/bpython
-dev-python/bsddb3
-dev-python/buzhug
-dev-python/bytecodeassembler
-dev-python/CacheControl
-dev-python/cachetools
-dev-python/cairocffi
-dev-python/cangjie
-dev-python/carbon
-dev-python/carrot
-dev-python/castellan
-dev-python/casuarius
-dev-python/cddb-py
-dev-python/celementtree
-dev-python/celery
-dev-python/cement
-dev-python/certifi
-dev-python/cffi
-dev-python/cfgparse
-#dev-python/cgkit
-dev-python/chaco
-dev-python/chameleon
-dev-python/characteristic
-dev-python/chardet
-dev-python/cheetah
-dev-python/cherrypy
-dev-python/cherrytemplate
-dev-python/click
-dev-python/clientcookie
-dev-python/cliff
-dev-python/cliff-tablib
-dev-python/cloudpickle
-dev-python/cmd2
-#dev-python/codetools
-dev-python/Coffin
-dev-python/colander
-dev-python/colorama
-dev-python/colorlog
-dev-python/colout
-dev-python/columnize
-dev-python/common
-dev-python/compizconfig-python
-dev-python/configargparse
-dev-python/configobj
-dev-python/configparser
-dev-python/contextlib2
-#dev-python/cosmolopy
-dev-python/couchdb-python
-dev-python/cov-core
-dev-python/coverage
-dev-python/crcmod
-dev-python/croniter
-dev-python/crumbs
-dev-python/cryptography
-dev-python/cryptography-vectors
-dev-python/cssselect
-dev-python/cssutils
-dev-python/ctypesgen
-dev-python/cursive
-dev-python/cx_Freeze
-dev-python/cython
-dev-python/cytoolz
-#dev-python/d2to1
-dev-python/dap
-dev-python/datashape
-dev-python/dbus-python
-dev-python/dbutils
-dev-python/ddt
-dev-python/debtcollector
-dev-python/decorator
-dev-python/decoratortools
-dev-python/deform
-dev-python/defusedxml
-dev-python/demjson
-dev-python/dicttoxml
-dev-python/diff-match-patch
-dev-python/dingus
-dev-python/discogs-client
-dev-python/disqus-python
-dev-python/distlib
-dev-python/django
-dev-python/django-annoying
-dev-python/django-appconf
-#dev-python/django-auth-ldap
-#dev-python/django-celery
-dev-python/django-compressor
-dev-python/django-debug-toolbar
-dev-python/django-discover-runner
-dev-python/django-endless-pagination
-dev-python/django-evolution
-dev-python/django-haystack
-dev-python/django-international
-#dev-python/django-ldapdb
-dev-python/django-ldap-groups
-dev-python/django-nose
-dev-python/django-openid-auth
-dev-python/django-picklefield
-dev-python/django-pipeline
-dev-python/django-piston
-dev-python/django-recaptcha
-dev-python/django-registration
-dev-python/django-select2
-dev-python/django-setuptest
-#dev-python/django-social-auth
-dev-python/django-tastypie
-dev-python/django-xslt
-dev-python/dnspython
-dev-python/doc8
-dev-python/docker-py
-dev-python/docopt
-dev-python/doctest-ignore-unicode
-dev-python/docutils
-dev-python/docutils-glep
-dev-python/dogpile-cache
-dev-python/dogpile-core
-dev-python/doit
-dev-python/dominate
-dev-python/dpkt
-dev-python/dreampie
-dev-python/drpython
-dev-python/dugong
-dev-python/dulwich
-dev-python/dynd-python
-dev-python/ecdsa
-#dev-python/editobj
-dev-python/egenix-mx-base
-dev-python/egg-python
-dev-python/elasticsearch-py
-dev-python/elementtree
-dev-python/elib-intl
-dev-python/embedly
-dev-python/empy
-dev-python/enable
-#dev-python/enaml
-dev-python/encore
-dev-python/enum34
-dev-python/envisage
-dev-python/envoy
-dev-python/enzyme
-dev-python/epsilon
-dev-python/epydoc
-dev-python/errorhandler
-dev-python/etsdevtools
-dev-python/etsproxy
-dev-python/et_xmlfile
-dev-python/eunuchs
-dev-python/eventlet
-dev-python/execnet
-dev-python/extras
-dev-python/extremes
-dev-python/eyeD3
-dev-python/fabric
-dev-python/fasteners
-dev-python/feedgenerator
-dev-python/feedparser
-dev-python/fexpect
-dev-python/figleaf
-dev-python/fixtures
-dev-python/flake8
-dev-python/flask
-dev-python/flask-admin
-dev-python/flask-babel
-dev-python/flask-dashed
-dev-python/flask-evolution
-dev-python/Flask-KVSession
-dev-python/flask-login
-dev-python/flask-mail
-dev-python/flask-migrate
-dev-python/flask-mongoengine
-dev-python/flask-openid
-dev-python/flask-peewee
-dev-python/flask-principal
-dev-python/flask-pymongo
-dev-python/flask-restful
-dev-python/flask-restless
-dev-python/flask-script
-dev-python/flask-security
-dev-python/flask-sqlalchemy
-dev-python/flask-testing
-dev-python/flask-themes
-dev-python/flask-uploads
-dev-python/flask-whooshalchemy
-dev-python/flask-wtf
-dev-python/flask-xml-rpc
-dev-python/flup
-dev-python/fonttools
-dev-python/foolscap
-dev-python/formencode
-dev-python/fpconst
-dev-python/frozen-flask
-dev-python/fudge
-dev-python/funcparserlib
-dev-python/funcsigs
-dev-python/functest
-dev-python/functools32
-dev-python/fuse-python
-dev-python/fusil
-dev-python/future
-dev-python/futures
-dev-python/futurist
-dev-python/gconf-python
-dev-python/gcs-oauth2-boto-plugin
-dev-python/gdata
-dev-python/genshi
-dev-python/geoip-python
-dev-python/geopy
-dev-python/gevent
-dev-python/gevent-socketio
-dev-python/gevent-websocket
-dev-python/ghp-import
-dev-python/gitdb
-dev-python/git-python
-dev-python/git-review
-dev-python/glance_store
-dev-python/gmpy
-dev-python/gnome-keyring-python
-dev-python/gnome-python-base
-dev-python/gnome-python-desktop-base
-dev-python/gnome-python-extras-base
-dev-python/gnome-vfs-python
-dev-python/gnuplot-py
-dev-python/google-api-python-client
-dev-python/google-apputils
-dev-python/graphcanvas
-#dev-python/graph-tool
-dev-python/graphy
-dev-python/greenlet
-dev-python/gst-python
-dev-python/gtkspell-python
-dev-python/guppy
-dev-python/h5py
-dev-python/hachoir-core
-dev-python/hachoir-parser
-dev-python/hachoir-regex
-#dev-python/hacking
-dev-python/happydoc
-dev-python/hcs-utils
-dev-python/hgdistver
-dev-python/hgtools
-dev-python/hiredis
-dev-python/html2text
-dev-python/html5lib
-dev-python/htmlgen
-dev-python/httplib2
-dev-python/http-parser
-dev-python/httpretty
-dev-python/hypothesis
-dev-python/icalendar
-dev-python/iconvcodec
-dev-python/id3-py
-dev-python/idna
-dev-python/ijson
-dev-python/imapclient
-dev-python/importing
-dev-python/iniparse
-dev-python/into
-dev-python/ioflo
-dev-python/ipaddr
-dev-python/ipaddress
-dev-python/ipcalc
-dev-python/ipdb
-dev-python/ipy
-dev-python/ipython
-dev-python/irc
-dev-python/irman-python
-dev-python/iso8601
-dev-python/isodate
-dev-python/itsdangerous
-dev-python/jaraco-utils
-dev-python/jaxml
-dev-python/jdcal
-dev-python/jedi
-dev-python/jingo
-dev-python/jinja
-dev-python/jmespath
-dev-python/joblib
-dev-python/jonpy
-dev-python/jpype
-dev-python/jsmin
-dev-python/jsonpatch
-dev-python/jsonpickle
-dev-python/jsonpointer
-dev-python/json-rpc
-dev-python/jsonrpclib
-dev-python/jsonschema
-dev-python/json-tools
-dev-python/kaa-base
-dev-python/kaa-display
-dev-python/kaa-imlib2
-dev-python/kaa-metadata
-dev-python/kazoo
-dev-python/keyczar
-dev-python/keyring
-dev-python/keystoneauth
-dev-python/keystonemiddleware
-dev-python/kid
-dev-python/Kivy
-dev-python/kivy-garden
-dev-python/kiwi
-dev-python/kiwisolver
-dev-python/kombu
-#dev-python/ldappool
-dev-python/lesscpy
-dev-python/libbonobo-python
-dev-python/libcloud
-dev-python/libextractor-python
-dev-python/libgnomecanvas-python
-dev-python/libgnome-python
-dev-python/libnacl
-dev-python/librharris
-dev-python/librsvg-python
-dev-python/libvirt-python
-dev-python/libwnck-python
-dev-python/linecache2
-dev-python/livereload
-dev-python/llfuse
-#dev-python/llvmlite
-dev-python/lockfile
-dev-python/log4py
-dev-python/logbook
-dev-python/logilab-common
-dev-python/logilab-constraint
-dev-python/logutils
-dev-python/louie
-dev-python/lupy
-dev-python/lxml
-dev-python/lz4
-dev-python/m2crypto
-dev-python/m2secret
-dev-python/mako
-dev-python/mantissa
-dev-python/manuel
-dev-python/markdown
-dev-python/markdown2
-dev-python/markups
-dev-python/markupsafe
-dev-python/matplotlib
-dev-python/mccabe
-dev-python/mecab-python
-dev-python/mechanize
-dev-python/medusa
-dev-python/meld3
-dev-python/microversion-parse
-dev-python/mimeparse
-dev-python/mimerender
-dev-python/minidb
-dev-python/minimock
-dev-python/mistune
-dev-python/mkdocs
-dev-python/mock
-dev-python/mocker
-dev-python/mockldap
-dev-python/mongoengine
-dev-python/monotonic
-dev-python/morbid
-dev-python/more-itertools
-dev-python/moto
-dev-python/mox
-dev-python/mox3
-dev-python/mpi4py
-dev-python/msgpack
-dev-python/multipledispatch
-dev-python/mygpoclient
-dev-python/mysqlclient
-#dev-python/mysql-python
-dev-python/natsort
-dev-python/nautilus-python
-dev-python/ndg-httpsclient
-dev-python/netaddr
-dev-python/netifaces
-dev-python/networkx
-dev-python/neutron-lib
-dev-python/nevow
-dev-python/nltk
-dev-python/nose
-dev-python/nose-cover3
-dev-python/nose-exclude
-dev-python/nose_fixes
-dev-python/nosehtmloutput
-dev-python/nosexcover
-dev-python/notify-python
-dev-python/numexpr
-dev-python/numpy
-dev-python/numpydoc
-dev-python/oauth
-dev-python/oauth2
-dev-python/oauth2client
-dev-python/oauthlib
-#dev-python/oct2py
-#dev-python/oosuite
-dev-python/openpyxl
-dev-python/openstack-nose-plugin
-dev-python/openstacksdk
-dev-python/optcomplete
-dev-python/ordereddict
-dev-python/os-brick
-dev-python/osc-lib
-dev-python/os-client-config
-dev-python/oslo-cache
-dev-python/oslo-concurrency
-dev-python/oslo-config
-dev-python/oslo-context
-dev-python/oslo-db
-dev-python/oslo-i18n
-dev-python/oslo-log
-dev-python/oslo-messaging
-dev-python/oslo-middleware
-dev-python/oslo-policy
-dev-python/oslo-privsep
-#dev-python/oslo-reports
-dev-python/oslo-rootwrap
-dev-python/oslo-serialization
-dev-python/oslo-service
-dev-python/oslo-sphinx
-#dev-python/oslotest
-dev-python/oslo-utils
-#dev-python/oslo-versionedobjects
-dev-python/oslo-vmware
-dev-python/osprofiler
-dev-python/os-testr
-dev-python/os-vif
-dev-python/os-win
-#dev-python/ovs
-dev-python/packaging
-dev-python/paisley
-dev-python/pandas
-dev-python/paramiko
-dev-python/passlib
-dev-python/paste
-dev-python/pastedeploy
-dev-python/pastescript
-dev-python/pathlib
-dev-python/path-py
-dev-python/pathtools
-#dev-python/patsy
-dev-python/paver
-dev-python/pbkdf2
-dev-python/pbr
-dev-python/pdfrw
-dev-python/pecan
-dev-python/peewee
-dev-python/pep8
-dev-python/peppercorn
-dev-python/pexpect
-dev-python/pgasync
-dev-python/pickleshare
-dev-python/pika
-dev-python/pika-pool
-dev-python/pillow
-dev-python/pip
-dev-python/pivy
-dev-python/pkginfo
-dev-python/placefinder
-dev-python/ply
-dev-python/plyr
-#dev-python/pmw
-dev-python/polib
-dev-python/polygon
-dev-python/positional
-dev-python/posix_ipc
-dev-python/pretend
-dev-python/prettytable
-dev-python/pretty-yaml
-dev-python/progress
-dev-python/progressbar
-dev-python/prompt_toolkit
-#dev-python/pssi
-dev-python/psutil
-dev-python/psycopg
-dev-python/ptpython
-dev-python/ptyprocess
-dev-python/pudge
-dev-python/pupynere
-dev-python/py
-dev-python/py2play
-dev-python/pyalsa
-dev-python/pyalsaaudio
-dev-python/py-amqp
-dev-python/pyao
-dev-python/pyasn1
-dev-python/pyasn1-modules
-dev-python/pyatspi
-dev-python/pyaudio
-#dev-python/py-bcrypt
-dev-python/pybloomfiltermmap
-dev-python/pybluez
-dev-python/pycadf
-dev-python/pycairo
-dev-python/pycanberra
-dev-python/pychart
-dev-python/pychecker
-dev-python/pychm
-dev-python/pyclamav
-dev-python/pycollada
-dev-python/PyContracts
-dev-python/pycparser
-dev-python/pycrypto
-dev-python/pycryptopp
-dev-python/pycups
-dev-python/pycurl
-dev-python/pycxx
-dev-python/pydns
-dev-python/PyECLib
-dev-python/pyelftools
-dev-python/pyenchant
-dev-python/pyev
-dev-python/pyface
-#dev-python/pyfits
-dev-python/pyflakes
-dev-python/pyfltk
-dev-python/PyFoam
-dev-python/pyftpdlib
-dev-python/pygal
-dev-python/pygame
-dev-python/PyGithub
-#dev-python/pyglet
-dev-python/pygments
-dev-python/pygobject
-dev-python/pygoocanvas
-dev-python/pygpgme
-dev-python/pygraphviz
-dev-python/pygresql
-dev-python/pygsl
-dev-python/pygtk
-dev-python/pygtkglext
-dev-python/pygtkhelpers
-dev-python/pygtksourceview
-#dev-python/pyh2o
-dev-python/pyid3lib
-dev-python/pyinotify
-dev-python/pyjwt
-dev-python/pykerberos
-dev-python/pylast
-#dev-python/pyldap
-dev-python/pylibacl
-dev-python/pylibmc
-dev-python/pylibpcap
-dev-python/pylint
-dev-python/pylirc
-#dev-python/pylons
-#dev-python/pylons-sphinx-themes
-dev-python/pymad
-dev-python/pymetar
-dev-python/pymilter
-dev-python/pymongo
-dev-python/pympler
-#dev-python/pymssql
-dev-python/pymtp
-dev-python/pymysql
-dev-python/pynotifier
-dev-python/py-notify
-dev-python/pynzb
-dev-python/pyodbc
-dev-python/pyode
-dev-python/pyogg
-dev-python/pyopenal
-#dev-python/pyopencl
-dev-python/pyopengl
-dev-python/pyopenssl
-dev-python/pyorbit
-dev-python/pyosd
-dev-python/pypam
-dev-python/pyparsing
-dev-python/pyparted
-dev-python/pypax
-dev-python/pyPdf
-dev-python/PyPDF2
-dev-python/pypeg2
-dev-python/pypgsql
-dev-python/pyphen
-dev-python/pyprotocols
-dev-python/PyQt4
-dev-python/PyQt5
-dev-python/pyquery
-#dev-python/pyqwt
-dev-python/pyramid
-dev-python/pyrex
-dev-python/pyro
-dev-python/PyRSS2Gen
-dev-python/pysaml2
-dev-python/pysendfile
-dev-python/pyserial
-dev-python/pyside
-dev-python/pyside-tools
-dev-python/py-smbpasswd
-dev-python/pysnmp
-dev-python/PySocks
-dev-python/pyspf
-dev-python/pystache
-dev-python/pysvn
-#dev-python/pytables
-dev-python/pytest
-dev-python/pytest-capturelog
-#dev-python/pytest-cov
-dev-python/pytest-runner
-dev-python/pytest-xdist
-dev-python/python3-openid
-dev-python/python-barbicanclient
-dev-python/python-bibtex
-dev-python/python-biggles
-dev-python/python-bugzilla
-dev-python/python-caja
-dev-python/python-cdb
-dev-python/python-ceilometerclient
-dev-python/python-cinderclient
-dev-python/python-cluster
-dev-python/python-daemon
-dev-python/python-dateutil
-dev-python/python-debian
-dev-python/python-designateclient
-dev-python/pythondialog
-dev-python/python-digest
-dev-python/python-distutils-extra
-dev-python/python-docs
-dev-python/python-editor
-dev-python/python-efl
-dev-python/python-fastimport
-dev-python/python-fchksum
-dev-python/python-gflags
-dev-python/python-glanceclient
-dev-python/python-gtkmvc
-dev-python/python-gudev
-dev-python/python-heatclient
-dev-python/python-iwscan
-dev-python/python-keystoneclient
-dev-python/python-ldap
-dev-python/python-levenshtein
-#dev-python/python-magic
-dev-python/python-magnumclient
-dev-python/python-manilaclient
-dev-python/python-memcached
-dev-python/python-mistralclient
-dev-python/python-monascaclient
-dev-python/python-mpd
-dev-python/python-musicbrainz
-dev-python/python-musicbrainz-ngs
-dev-python/python-nbxmpp
-dev-python/python-neutronclient
-dev-python/python-novaclient
-dev-python/python-openid
-dev-python/python-openstackclient
-dev-python/python-poppler
-dev-python/python-ptrace
-dev-python/python-senlinclient
-dev-python/python-slip
-dev-python/python-social-auth
-dev-python/python-sqlparse
-dev-python/python-swiftclient
-dev-python/python-termstyle
-dev-python/python-troveclient
-dev-python/python-virtkey
-dev-python/python-wpactrl
-dev-python/python-xlib
-dev-python/python-zaqarclient
-dev-python/pytools
-dev-python/pytz
-dev-python/pyudev
-dev-python/pyutil
-dev-python/pyvorbis
-dev-python/pywebkitgtk
-dev-python/pyx
-dev-python/pyxattr
-dev-python/pyxdg
-dev-python/pyxenstore
-dev-python/pyxml
-dev-python/pyyaml
-dev-python/pyzmq
-dev-python/pyzor
-dev-python/qpid-python
-dev-python/qrcode
-dev-python/qscintilla-python
-dev-python/queuelib
-dev-python/quixote
-dev-python/rarfile
-dev-python/rdflib
-dev-python/readme
-dev-python/rebulk
-dev-python/recaptcha-client
-dev-python/redis-py
-dev-python/rednose
-dev-python/regendoc
-dev-python/rencode
-dev-python/reno
-dev-python/reportlab
-dev-python/repoze-lru
-dev-python/repoze-who
-dev-python/requests
-dev-python/requests-cache
-dev-python/requestsexceptions
-dev-python/requests-mock
-dev-python/requests-oauthlib
-dev-python/restkit
-dev-python/restructuredtext-lint
-dev-python/retry-decorator
-dev-python/retrying
-dev-python/rfc3986
-dev-python/rlcompleter2
-dev-python/roman
-dev-python/rope
-dev-python/ropemode
-dev-python/routes
-dev-python/rply
-#dev-python/rpy
-dev-python/rpyc
-dev-python/rsa
-dev-python/rst2pdf
-dev-python/rtslib-fb
-dev-python/ryu
-dev-python/SaltTesting
-dev-python/sancho
-#dev-python/scimath
-dev-python/scripttest
-dev-python/selenium
-dev-python/semantic_version
-dev-python/send2trash
-#dev-python/sepolgen
-dev-python/serpent
-dev-python/service_identity
-dev-python/setproctitle
-dev-python/setuptools
-dev-python/setuptools-git
-dev-python/setuptools_hg
-dev-python/setuptools_scm
-dev-python/shiboken
-dev-python/shortuuid
-dev-python/simplegeneric
-dev-python/simplejson
-dev-python/simplekv
-dev-python/simpleparse
-#dev-python/simpy
-dev-python/singledispatch
-dev-python/sip
-dev-python/six
-dev-python/slowaes
-dev-python/smmap
-dev-python/snakeoil
-dev-python/snappy
-dev-python/snowballstemmer
-dev-python/soaplib
-dev-python/soappy
-dev-python/socketpool
-#dev-python/south
-#dev-python/soya
-dev-python/sparql-wrapper
-dev-python/speaklater
-dev-python/sphinx
-dev-python/sphinx-better-theme
-dev-python/sphinx-bootstrap-theme
-dev-python/sphinxcontrib-googleanalytics
-dev-python/sphinxcontrib-httpdomain
-dev-python/sphinxcontrib-issuetracker
-dev-python/sphinxcontrib-programoutput
-dev-python/sphinx_rtd_theme
-dev-python/sphinxtogithub
-dev-python/spyder
-dev-python/sqlalchemy
-dev-python/sqlalchemy-migrate
-dev-python/sqlitecachec
-dev-python/ssl-fetch
-#dev-python/statsmodels
-dev-python/stevedore
-dev-python/stomper
-dev-python/strict-rfc3339
-#dev-python/stsci-distutils
-#dev-python/stsci-sphinxext
-dev-python/subunit
-dev-python/subvertpy
-dev-python/suds
-dev-python/sudsds
-dev-python/sure
-dev-python/symboltype
-dev-python/tablib
-dev-python/tagpy
-dev-python/taskflow
-dev-python/tempest-lib
-dev-python/tempita
-dev-python/termcolor
-dev-python/terminado
-dev-python/testfixtures
-dev-python/testrepository
-dev-python/testresources
-dev-python/testscenarios
-dev-python/testtools
-dev-python/thunarx-python
-dev-python/timelib
-dev-python/tinycss
-dev-python/tlslite
-dev-python/toolz
-dev-python/tooz
-dev-python/tox
-dev-python/tpg
-dev-python/traceback2
-dev-python/tracing
-dev-python/traits
-dev-python/traitsui
-dev-python/translate-toolkit
-dev-python/translationstring
-dev-python/trollius
-dev-python/ttfquery
-dev-python/ttystatus
-dev-python/tvdb_api
-dev-python/twill
-dev-python/twisted-conch
-dev-python/twisted-core
-dev-python/twisted-lore
-dev-python/twisted-mail
-dev-python/twisted-names
-dev-python/twisted-news
-dev-python/twisted-pair
-dev-python/twisted-runner
-dev-python/twisted-web
-dev-python/twisted-words
-dev-python/twitter
-dev-python/twython
-dev-python/txAMQP
-dev-python/ujson
-dev-python/unicodecsv
-dev-python/unidecode
-dev-python/unittest2
-dev-python/uritemplate
-dev-python/urlgrabber
-dev-python/urllib3
-dev-python/urwid
-dev-python/utidylib
-dev-python/vcversioner
-dev-python/venusian
-dev-python/versiontools
-dev-python/vertex
-dev-python/virtualenv
-dev-python/virtualenv-clone
-dev-python/virtualenvwrapper
-dev-python/visual
-dev-python/vobject
-dev-python/voluptuous
-dev-python/waitress
-dev-python/warlock
-dev-python/watchdog
-dev-python/wcwidth
-dev-python/webassets
-dev-python/webcolors
-dev-python/webob
-dev-python/webpy
-dev-python/websocket-client
-dev-python/websockify
-dev-python/webtest
-dev-python/webut
-dev-python/werkzeug
-dev-python/wheel
-dev-python/whisper
-dev-python/whoosh
-dev-python/wrapt
-dev-python/ws4py
-dev-python/wsaccel
-dev-python/wsgiintercept
-dev-python/wsgiproxy2
-dev-python/WSME
-dev-python/wstools
-dev-python/wtforms
-dev-python/wxpython
-dev-python/xcffib
-dev-python/xlrd
-dev-python/xlsxwriter
-dev-python/xlwt
-dev-python/xmltodict
-dev-python/xmpppy
-#dev-python/xvfbwrapper
-dev-python/yapsy
-dev-python/yaql
-dev-python/yolk
-dev-python/yolk-portage
-dev-python/zake
-dev-python/zbase32
-dev-python/zfec
-dev-python/zope-interface
-dev-python/zsi
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/dicts b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/dicts
deleted file mode 100644
index 4c74a1666..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/dicts
+++ /dev/null
@@ -1,37 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-dicts/opendict
-app-dicts/stardict-calculate-ru
-app-dicts/stardict-cdict-en-zh-big5 
-app-dicts/stardict-cdict-en-zh-gb 
-app-dicts/stardict-cedict-zh-en-big5 
-app-dicts/stardict-cedict-zh-en-gb 
-app-dicts/stardict-dictd-devils 
-app-dicts/stardict-freedict-eng-deu
-app-dicts/stardict-freedict-eng-fra
-app-dicts/stardict-freedict-eng-ita
-app-dicts/stardict-freedict-eng-lat
-app-dicts/stardict-freedict-eng-rus
-app-dicts/stardict-freedict-eng-spa
-app-dicts/stardict-freedict-eng-swe
-app-dicts/stardict-freedict-eng-tur
-app-dicts/stardict-freedict-tur-deu
-app-dicts/stardict-freedict-tur-eng
-app-dicts/stardict-jmdict-en-ja 
-app-dicts/stardict-jmdict-ja-en 
-app-dicts/stardict-langdao-en-zh-gb 
-app-dicts/stardict-langdao-zh-en-gb 
-app-dicts/stardict-mova-smiley 
-app-dicts/stardict-oxford-en-zh-gb 
-app-dicts/stardict-quick-eng-fra 
-app-dicts/stardict-quick-eng-jpn 
-app-dicts/stardict-quick-jpn-eng 
-app-dicts/stardict-quick-ru-en
-app-dicts/stardict-xdict-en-zh-big5 
-app-dicts/stardict-xdict-en-zh-gb 
-app-dicts/stardict-xdict-zh-en-big5 
-app-dicts/stardict-xdict-zh-en-gb
-app-text/sdcv
-app-text/stardict
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/editor b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/editor
deleted file mode 100644
index f73a3512b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/editor
+++ /dev/null
@@ -1,33 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-app-editors/vim
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-app-editors/dav
-app-editors/e3
-app-editors/ee
-app-editors/elvis
-app-editors/emacs
-app-editors/ghex
-app-editors/gvim
-app-editors/jasspa-microemacs
-app-editors/jed
-app-editors/joe
-app-editors/lpe
-app-editors/mg
-app-editors/mousepad
-app-editors/nano
-app-editors/neovim
-app-editors/nvi
-app-editors/qemacs
-app-editors/retext
-app-editors/teco
-app-editors/uemacs-pk
-app-editors/vile
-app-editors/vim
-app-editors/vim-qt
-app-editors/xemacs
-app-xemacs/xemacs-packages-all
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/education b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/education
deleted file mode 100644
index 04e0c47e5..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/education
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-sci-astronomy/stellarium
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/emulation b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/emulation
deleted file mode 100644
index 75b774be4..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/emulation
+++ /dev/null
@@ -1,83 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-emulation/aqemu
-app-emulation/bochs
-app-emulation/cloud-init
-app-emulation/coldfire
-app-emulation/dinero
-app-emulation/dlx
-app-emulation/domi
-app-emulation/dosemu
-app-emulation/dynamips
-app-emulation/edumips64
-app-emulation/e-uae
-app-emulation/flannel
-app-emulation/free42
-app-emulation/gxemul
-app-emulation/hercules
-app-emulation/libcacard
-app-emulation/libguestfs-appliance
-app-emulation/libspectrum
-app-emulation/libvirt
-app-emulation/libvirt-glib
-app-emulation/lxc
-app-emulation/open-vm-tools
-app-emulation/playonlinux
-app-emulation/q4wine
-app-emulation/qemu
-app-emulation/qemu-guest-agent
-app-emulation/qemu-init-scripts
-app-emulation/qtemu
-app-emulation/s6-overlay
-app-emulation/simh
-app-emulation/softgun
-app-emulation/spectemu
-app-emulation/spice
-app-emulation/spice-protocol
-app-emulation/spice-vdagent
-app-emulation/spim
-app-emulation/uade
-app-emulation/uae
-app-emulation/vagrant
-app-emulation/virtio-win
-app-emulation/virt-manager
-app-emulation/virtualbox
-app-emulation/virtualbox-additions
-app-emulation/virtualbox-extpack-oracle
-app-emulation/virtualbox-guest-additions
-app-emulation/virtualbox-modules
-app-emulation/virt-viewer
-app-emulation/virt-what
-app-emulation/vpcs
-app-emulation/wine
-app-emulation/winetricks
-app-emulation/x48
-app-emulation/xtrs
-games-emulation/desmume
-games-emulation/dosbox
-games-emulation/hatari
-games-emulation/mednafen
-games-server/mednafen-server
-sci-visualization/qtiplot
-#in#
-
-#?in(os_linux_pkglist, desktop)!=&&os_arch_machine==x86_64#
-app-emulation/containerd
-app-emulation/docker
-app-emulation/docker-compose
-app-emulation/docker-machine
-app-emulation/docker-registry
-app-emulation/docker-swarm
-app-emulation/hyperd
-app-emulation/lxd
-app-emulation/rkt
-app-emulation/runc
-app-emulation/runv
-app-emulation/vmware-modules
-app-emulation/vmware-tools
-app-emulation/vmware-workstation
-app-emulation/xen
-app-emulation/xen-pvgrub
-app-emulation/xen-tools
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/fonts b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/fonts
deleted file mode 100644
index 1c767199d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/fonts
+++ /dev/null
@@ -1,194 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist,desktop)!=#
-media-fonts/acroread-asianfonts
-media-fonts/ahem
-media-fonts/alee-fonts
-media-fonts/alegreya-sans
-media-fonts/andika
-media-fonts/anonymous-pro
-media-fonts/aquafont
-media-fonts/aquapfont
-media-fonts/arabeyes-fonts
-media-fonts/arkpandora
-media-fonts/arphicfonts
-media-fonts/artwiz-aleczapka-en
-media-fonts/artwiz-latin1
-media-fonts/baekmuk-fonts
-media-fonts/bitstream-cyberbit
-media-fonts/cantarell
-media-fonts/cardo
-media-fonts/cheapskatefonts
-media-fonts/clearsans
-media-fonts/cm-unicode
-media-fonts/comic-neue
-media-fonts/courier-prime
-media-fonts/cronyx-fonts
-media-fonts/croscorefonts
-media-fonts/culmus
-media-fonts/dina
-media-fonts/dzongkha-fonts
-media-fonts/eb-garamond
-media-fonts/efont-unicode
-media-fonts/ekushey-bangla-fonts
-media-fonts/essays1743
-media-fonts/exljbris-free
-media-fonts/exo
-media-fonts/fantasque-sans-mono
-media-fonts/farsi-fonts
-media-fonts/fgdc-emergency
-media-fonts/fifth-leg
-media-fonts/fira-mono
-media-fonts/fira-sans
-media-fonts/font-adobe-100dpi
-media-fonts/font-adobe-75dpi
-media-fonts/font-adobe-utopia-100dpi
-media-fonts/font-adobe-utopia-75dpi
-media-fonts/font-adobe-utopia-type1
-media-fonts/font-arabic-misc
-media-fonts/fontawesome
-media-fonts/font-bh-100dpi
-media-fonts/font-bh-75dpi
-media-fonts/font-bh-lucidatypewriter-100dpi
-media-fonts/font-bh-lucidatypewriter-75dpi
-media-fonts/font-bh-ttf
-media-fonts/font-bh-type1 
-media-fonts/font-bitstream-100dpi
-media-fonts/font-bitstream-75dpi
-media-fonts/font-bitstream-speedo
-media-fonts/font-bitstream-type1
-media-fonts/font-cronyx-cyrillic
-media-fonts/font-cursor-misc
-media-fonts/font-daewoo-misc
-media-fonts/font-dec-misc
-media-fonts/font-ibm-type1
-media-fonts/font-isas-misc
-media-fonts/font-jis-misc
-media-fonts/font-micro-misc
-media-fonts/font-misc-cyrillic
-media-fonts/font-misc-ethiopic
-media-fonts/font-misc-meltho
-media-fonts/font-mutt-misc
-media-fonts/font-schumacher-misc
-media-fonts/font-screen-cyrillic
-media-fonts/font-sony-misc
-media-fonts/font-sun-misc
-media-fonts/font-winitzki-cyrillic
-media-fonts/font-xfree86-type1
-media-fonts/free-bangla-font
-media-fonts/freefonts
-media-fonts/fs-fonts
-media-fonts/gidole
-media-fonts/hermit
-media-fonts/heuristica
-media-fonts/hkscs-ming
-media-fonts/Humor-Sans
-media-fonts/hunkyfonts
-media-fonts/inconsolata
-media-fonts/inconsolata-hellenic
-#media-fonts/infinality-ultimate-meta
-media-fonts/intlfonts
-media-fonts/ipaex
-media-fonts/ipamonafont
-media-fonts/ja-ipafonts
-media-fonts/jisx0213-fonts
-media-fonts/jomolhari
-media-fonts/jsmath
-#media-fonts/jsmath-extra-dark
-media-fonts/jsmath-extra-light
-media-fonts/kacst-fonts
-media-fonts/kanjistrokeorders
-media-fonts/khmer
-media-fonts/kochi-substitute
-media-fonts/konfont
-media-fonts/koruri
-media-fonts/lfpfonts-fix
-media-fonts/lfpfonts-var
-media-fonts/lklug
-media-fonts/lohit-assamese
-media-fonts/lohit-bengali
-media-fonts/lohit-devanagari
-media-fonts/lohit-fonts
-media-fonts/lohit-gujarati
-media-fonts/lohit-gurmukhi
-media-fonts/lohit-kannada
-media-fonts/lohit-malayalam
-media-fonts/lohit-marathi
-media-fonts/lohit-nepali
-media-fonts/lohit-odia
-media-fonts/lohit-tamil
-media-fonts/lohit-tamil-classical
-media-fonts/lohit-telugu
-media-fonts/mathematica-fonts
-media-fonts/mgopen
-media-fonts/mikachan-font-otf
-media-fonts/mikachan-font-ttc
-media-fonts/mikachan-font-ttf
-media-fonts/mix-mplus-ipa
-media-fonts/monafont
-media-fonts/monoid
-media-fonts/montecarlo
-media-fonts/mplus-fonts
-media-fonts/mplus-outline-fonts
-media-fonts/nanum
-media-fonts/nanumfont
-media-fonts/nepali-fonts
-media-fonts/noto-cjk
-media-fonts/nunito
-media-fonts/nuosu-sil
-media-fonts/ohsnap
-media-fonts/oldstandard
-media-fonts/opendesktop-fonts
-media-fonts/open-sans
-media-fonts/oto
-media-fonts/paratype
-media-fonts/pcf2bdf
-media-fonts/pigiarniq
-media-fonts/pothana2k
-media-fonts/powerline-symbols
-media-fonts/proggy-fonts
-media-fonts/qomolangma
-media-fonts/quivira
-media-fonts/ricty
-media-fonts/sazanami
-media-fonts/sgi-fonts
-media-fonts/shinonome
-media-fonts/signika
-media-fonts/sil-abyssinica
-media-fonts/sil-arabicfonts
-media-fonts/sil-charis
-media-fonts/sil-doulos
-media-fonts/sil-ezra
-media-fonts/sil-galatia
-media-fonts/sil-gentium
-media-fonts/sil-padauk
-media-fonts/sophia-nubian
-media-fonts/source-han-sans
-media-fonts/source-pro
-media-fonts/symbola
-media-fonts/takao-fonts
-media-fonts/tengwar-fonts
-media-fonts/termsyn
-media-fonts/texcm-ttf
-media-fonts/tex-gyre
-media-fonts/thaifonts-scalable
-media-fonts/tibetan-machine-font
-media-fonts/ttf-bitstream-vera
-media-fonts/ubuntu-font-family
-media-fonts/umeplus-fonts
-media-fonts/unfonts
-media-fonts/unfonts-extra
-media-fonts/unifont
-media-fonts/urwvn-fonts
-media-fonts/vc-fonts
-media-fonts/vdrsymbols-ttf
-media-fonts/viga
-media-fonts/vlgothic
-media-fonts/vollkorn
-media-fonts/webby-fonts
-media-fonts/wqy-bitmapfont
-media-fonts/wqy-microhei
-#media-fonts/wqy-unibit
-media-fonts/x11fonts-jmk
-media-fonts/zh-kcfonts
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/games b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/games
deleted file mode 100644
index 63abe18de..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/games
+++ /dev/null
@@ -1,64 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-games-action/chromium-bsu
-games-action/minetest
-games-action/minetest_game
-games-action/openclonk
-games-action/supertuxkart
-games-action/teeworlds
-games-arcade/briquolo
-games-arcade/frozen-bubble
-games-arcade/kobodeluxe
-games-arcade/lbreakout2
-games-arcade/opensonic
-games-arcade/solarwolf
-games-arcade/supertux
-games-arcade/tecnoballz
-games-fps/alienarena
-games-fps/enemy-territory
-games-fps/enemy-territory-truecombat
-games-fps/nexuiz
-#games-fps/openarena
-games-fps/warsow
-games-fps/xonotic
-games-kids/gcompris
-games-kids/tuxtype
-games-misc/xpenguins
-games-puzzle/meandmyshadow
-games-rpg/freedroidrpg
-games-sports/torcs
-games-sports/xmoto
-games-strategy/0ad
-games-strategy/freeciv
-games-strategy/hedgewars
-games-strategy/warzone2100
-games-util/steam-launcher
-
-# Lode-Runner-like
-games-arcade/xscavenger
-games-arcade/holotz-castle
-
-# Gnome
-games-arcade/gnome-nibbles
-games-arcade/gnome-robots
-games-board/four-in-a-row
-games-board/gnome-chess
-games-board/gnome-mahjongg
-games-board/gnome-mines
-games-board/iagno
-games-board/tali
-games-puzzle/five-or-more
-games-puzzle/gnome-klotski
-games-puzzle/gnome-sudoku
-games-puzzle/gnome-taquin
-games-puzzle/gnome-tetravex
-games-puzzle/hitori
-games-puzzle/lightsoff
-games-puzzle/quadrapassel
-games-puzzle/swell-foop
-#in#
-
-#?in(os_linux_pkglist, desktop)!=&&os_arch_machine==x86_64#
-games-action/oolite
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/gnome b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/gnome
deleted file mode 100644
index 58a59ab1f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/gnome
+++ /dev/null
@@ -1,47 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-admin/openrc-settingsd
-app-arch/file-roller
-app-cdr/brasero
-app-crypt/seahorse
-app-dicts/gnome-dictionary
-app-editors/gedit
-app-text/evince
-dev-util/anjuta
-gnome-base/nautilus
-gnome-extra/cinnamon
-gnome-extra/gconf-editor
-gnome-extra/gnome-calculator
-gnome-extra/gnome-calendar
-gnome-extra/gnome-characters
-gnome-extra/gnome-clocks
-gnome-extra/gnome-color-chooser
-gnome-extra/gnome-commander
-gnome-extra/gnome-documents
-gnome-extra/gnome-search-tool
-gnome-extra/gnome-system-monitor
-gnome-extra/gnome-weather
-gnome-extra/gucharmap
-gnome-extra/nautilus-actions
-gnome-extra/nautilus-dropbox
-gnome-extra/nautilus-sendto
-gnome-extra/nautilus-tracker-tags
-gnome-extra/sushi
-media-gfx/cinnamon-themes-calculate
-media-gfx/eog
-media-gfx/eog-plugins
-media-gfx/gnome-font-viewer
-media-gfx/gnome-photos
-media-gfx/gnome-screenshot
-media-gfx/simple-scan
-media-sound/gnome-music
-media-sound/sound-juicer
-media-video/cheese
-net-analyzer/gnome-nettool
-net-im/empathy
-net-irc/polari
-net-wireless/gnome-bluetooth
-sci-geosciences/gnome-maps
-x11-terms/gnome-terminal
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/graphics b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/graphics
deleted file mode 100644
index b5ef9490d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/graphics
+++ /dev/null
@@ -1,31 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-media-gfx/blender
-media-gfx/comix
-media-gfx/darktable
-media-gfx/digikam
-media-gfx/displaycal
-media-gfx/fotowall
-media-gfx/freecad
-media-gfx/geeqie
-media-gfx/gimmage
-media-gfx/gimp
-media-gfx/gpicview
-media-gfx/gqview
-media-gfx/gthumb
-media-gfx/hugin
-media-gfx/imagemagick
-media-gfx/inkscape
-media-gfx/kfax
-media-gfx/kphotoalbum
-media-gfx/krita
-media-gfx/librecad
-media-gfx/mirage
-media-gfx/nomacs
-media-gfx/openscad
-media-gfx/photoqt
-media-gfx/pinta
-media-gfx/ristretto
-x11-misc/shutter
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/httpd b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/httpd
deleted file mode 100644
index ee23395f3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/httpd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-www-servers/apache
-www-servers/boa
-www-servers/bozohttpd
-www-servers/cherokee
-www-servers/fnord
-www-servers/hiawatha
-www-servers/lighttpd
-www-servers/monkeyd
-www-servers/nginx
-www-servers/resin
-www-servers/thttpd
-www-servers/tomcat
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/ide b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/ide
deleted file mode 100644
index afc4ac4cc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/ide
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-dev-util/android-studio
-dev-util/eric
-dev-util/kdevelop
-dev-util/kdevelop-php
-dev-util/netbeans
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-apps b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-apps
deleted file mode 100644
index 8c04c44e7..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-apps
+++ /dev/null
@@ -1,251 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-kde-apps/akonadiconsole
-kde-apps/akregator
-kde-apps/analitza
-kde-apps/ark
-kde-apps/artikulate
-kde-apps/attica
-kde-apps/audiocd-kio
-kde-apps/baloo-widgets
-kde-apps/blinken
-kde-apps/blogilo
-kde-apps/bomber
-kde-apps/bovo
-kde-apps/calendarjanitor
-kde-apps/cantor
-kde-apps/cervisia
-kde-apps/dolphin
-kde-apps/dolphin-plugins
-kde-apps/dragon
-kde-apps/drkonqi
-kde-apps/ffmpegthumbs
-kde-apps/filelight
-kde-apps/gpgmepp
-kde-apps/granatier
-kde-apps/gwenview
-kde-apps/jovie
-kde-apps/juk
-kde-apps/kabcclient
-kde-apps/kaccessible
-kde-apps/kaccounts-integration
-kde-apps/kaddressbook
-kde-apps/kajongg
-kde-apps/kalarm
-kde-apps/kalgebra
-kde-apps/kalzium
-kde-apps/kamera
-kde-apps/kanagram
-kde-apps/kapman
-kde-apps/kapptemplate
-kde-apps/kate
-kde-apps/katomic
-kde-apps/kblackbox
-kde-apps/kblocks
-kde-apps/kbounce
-kde-apps/kbreakout
-kde-apps/kbruch
-kde-apps/kcachegrind
-kde-apps/kcalc
-kde-apps/kcalcore
-kde-apps/kcharselect
-kde-apps/kcmshell
-kde-apps/kcolorchooser
-kde-apps/kcontacts
-#kde-apps/kcontrol
-kde-apps/kcron
-kde-apps/kde4-l10n
-kde-apps/kdeaccessibility-meta
-kde-apps/kdeadmin-meta
-#kde-apps/kde-apps-meta
-#kde-apps/kdeartwork-styles
-kde-apps/kdebase-data
-kde-apps/kdebase-desktoptheme
-kde-apps/kdebase-kioslaves
-kde-apps/kdebase-menu
-kde-apps/kdebase-menu-icons
-kde-apps/kdebase-meta
-kde-apps/kdebase-runtime-meta
-kde-apps/kdebugdialog
-kde-apps/kdebugsettings
-kde-apps/kdecore-meta
-kde-apps/kde-dev-scripts
-kde-apps/kde-dev-utils
-kde-apps/kdeedu-data
-#kde-apps/kdeedu-meta
-kde-apps/kdegames-meta
-#kde-apps/kdegraphics-meta
-kde-apps/kdegraphics-mobipocket
-kde-apps/kde-l10n
-#kde-apps/kde-meta
-kde-apps/kdemultimedia-meta
-kde-apps/kdenetwork-filesharing
-kde-apps/kdenetwork-meta
-kde-apps/kdenlive
-#kde-apps/kdepasswd
-kde-apps/kdepim-common-libs
-#kde-apps/kdepim-icons
-kde-apps/kdepim-kresources
-kde-apps/kdepim-l10n:4
-kde-apps/kdepimlibs
-kde-apps/kdepim-meta
-kde-apps/kdepim-runtime
-#kde-apps/kdepim-wizards
-kde-apps/kdesdk-kioslaves
-kde-apps/kdesdk-meta
-kde-apps/kdesdk-thumbnailers
-kde-apps/kdesu
-kde-apps/kdeutils-meta
-kde-apps/kdewebdev-meta
-kde-apps/kdf
-kde-apps/kdgantt2
-kde-apps/kdialog
-kde-apps/kdiamond
-kde-apps/kdontchangethehostname
-kde-apps/keditbookmarks
-kde-apps/keditfiletype
-kde-apps/kfile
-kde-apps/kfilereplace
-kde-apps/kfind
-kde-apps/kfloppy
-kde-apps/kfmclient
-kde-apps/kfourinline
-kde-apps/kgeography
-kde-apps/kget
-kde-apps/kglobalaccel
-kde-apps/kgoldrunner
-kde-apps/kgpg
-kde-apps/khangman
-kde-apps/khelpcenter
-kde-apps/kiconfinder
-kde-apps/kig
-kde-apps/kigo
-kde-apps/killbots
-kde-apps/kimagemapeditor
-kde-apps/kimgio
-kde-apps/kioclient
-kde-apps/kio-extras
-kde-apps/kiriki
-kde-apps/kiten
-kde-apps/kjots
-kde-apps/kjumpingcube
-kde-apps/kleopatra
-kde-apps/klettres
-kde-apps/klickety
-kde-apps/klines
-kde-apps/klinkstatus
-kde-apps/kmag
-kde-apps/kmahjongg
-kde-apps/kmail
-kde-apps/kmimetypefinder
-kde-apps/kmines
-kde-apps/kmix
-kde-apps/kmousetool
-kde-apps/kmouth
-kde-apps/kmplot
-kde-apps/knavalbattle
-kde-apps/knetattach
-kde-apps/knetwalk
-kde-apps/knewstuff
-kde-apps/knode
-kde-apps/knotes
-kde-apps/knotify
-kde-apps/kolf
-kde-apps/kollision
-kde-apps/kolourpaint
-kde-apps/kommander
-kde-apps/kompare
-kde-apps/konq-plugins
-kde-apps/konqueror
-kde-apps/konquest
-kde-apps/konsole
-kde-apps/konsolekalendar
-kde-apps/konsolepart
-kde-apps/kontact
-kde-apps/kopete
-kde-apps/korganizer
-kde-apps/kpasswdserver
-kde-apps/kpat
-kde-apps/kppp
-kde-apps/kqtquickcharts
-kde-apps/kquitapp
-kde-apps/krdc
-kde-apps/kreadconfig
-kde-apps/kremotecontrol
-kde-apps/kreversi
-kde-apps/krfb
-kde-apps/kruler
-kde-apps/ksaneplugin
-kde-apps/kscd
-kde-apps/kshisen
-kde-apps/ksirk
-kde-apps/ksnakeduel
-#kde-apps/ksnapshot
-kde-apps/kspaceduel
-kde-apps/ksquares
-kde-apps/kstars
-kde-apps/kstart
-kde-apps/ksudoku
-kde-apps/ksystemlog
-kde-apps/kteatime
-kde-apps/ktimer
-kde-apps/ktimetracker
-kde-apps/ktimezoned
-kde-apps/ktnef
-kde-apps/ktouch
-#kde-apps/ktp-l10n
-kde-apps/ktraderclient
-kde-apps/ktuberling
-kde-apps/kturtle
-kde-apps/kubrick
-kde-apps/kuiserver
-kde-apps/kurifilter-plugins
-kde-apps/kwalletd
-#kde-apps/kwalletd-pam
-kde-apps/kwalletmanager
-kde-apps/kwordquiz
-kde-apps/kwrite
-kde-apps/libkcddb
-kde-apps/libkcompactdisc
-kde-apps/libkdcraw
-#kde-apps/libkdeedu
-kde-apps/libkdegames
-#kde-apps/libkdepim
-kde-apps/libkeduvocdocument
-kde-apps/libkexiv2
-kde-apps/libkface
-#kde-apps/libkgeomap
-kde-apps/libkipi
-#kde-apps/libkleo
-kde-apps/libkmahjongg
-kde-apps/libkomparediff2
-kde-apps/libkonq
-#kde-apps/libkpgp
-kde-apps/libksane
-kde-apps/lokalize
-kde-apps/lskat
-#kde-apps/marble
-kde-apps/minuet
-kde-apps/nsplugins
-kde-apps/okteta
-kde-apps/okular
-kde-apps/palapeli
-kde-apps/parley
-kde-apps/phonon-kde
-kde-apps/picmi
-kde-apps/plasma-apps
-kde-apps/plasma-runtime
-kde-apps/poxml
-kde-apps/print-manager
-kde-apps/renamedlg-plugins
-kde-apps/rocs
-kde-apps/solid-runtime
-kde-apps/spectacle
-kde-apps/step
-kde-apps/svgpart
-kde-apps/sweeper
-kde-apps/thumbnailers
-kde-apps/umbrello
-kde-apps/zeroconf-ioslave
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-frameworks b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-frameworks
deleted file mode 100644
index 872ac7e3c..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-frameworks
+++ /dev/null
@@ -1,74 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-kde-frameworks/attica
-kde-frameworks/baloo
-kde-frameworks/bluez-qt
-kde-frameworks/extra-cmake-modules
-kde-frameworks/frameworkintegration
-kde-frameworks/kactivities
-kde-frameworks/kapidox
-kde-frameworks/karchive
-kde-frameworks/kauth
-kde-frameworks/kbookmarks
-kde-frameworks/kcmutils
-kde-frameworks/kcodecs
-kde-frameworks/kcompletion
-kde-frameworks/kconfig
-kde-frameworks/kconfigwidgets
-kde-frameworks/kcoreaddons
-kde-frameworks/kcrash
-kde-frameworks/kdbusaddons
-kde-frameworks/kdeclarative
-kde-frameworks/kded
-kde-frameworks/kdelibs4support
-kde-frameworks/kdesignerplugin
-kde-frameworks/kdesu
-kde-frameworks/kdewebkit
-kde-frameworks/kdnssd
-kde-frameworks/kdoctools
-kde-frameworks/kemoticons
-kde-frameworks/kf-env
-kde-frameworks/kfilemetadata
-kde-frameworks/kglobalaccel
-kde-frameworks/kguiaddons
-kde-frameworks/khtml
-kde-frameworks/ki18n
-kde-frameworks/kiconthemes
-kde-frameworks/kidletime
-kde-frameworks/kimageformats
-kde-frameworks/kinit
-kde-frameworks/kio
-kde-frameworks/kitemmodels
-kde-frameworks/kitemviews
-kde-frameworks/kjobwidgets
-kde-frameworks/kjs
-kde-frameworks/kjsembed
-kde-frameworks/kmediaplayer
-kde-frameworks/knewstuff
-kde-frameworks/knotifications
-kde-frameworks/knotifyconfig
-kde-frameworks/kpackage
-kde-frameworks/kparts
-kde-frameworks/kpeople
-kde-frameworks/kplotting
-kde-frameworks/kpty
-kde-frameworks/kross
-kde-frameworks/krunner
-kde-frameworks/kservice
-kde-frameworks/ktexteditor
-kde-frameworks/ktextwidgets
-kde-frameworks/kunitconversion
-kde-frameworks/kwallet
-kde-frameworks/kwayland
-kde-frameworks/kwidgetsaddons
-kde-frameworks/kwindowsystem
-kde-frameworks/kxmlgui
-kde-frameworks/kxmlrpcclient
-kde-frameworks/modemmanager-qt
-kde-frameworks/networkmanager-qt
-kde-frameworks/plasma
-kde-frameworks/solid
-kde-frameworks/sonnet
-kde-frameworks/threadweaver
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-misc b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-misc
deleted file mode 100644
index b1ae21f02..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-misc
+++ /dev/null
@@ -1,113 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-#kde-misc/about-distro
-#kde-misc/adjustableclock
-kde-misc/akonadi-git-resource
-#kde-misc/baloo-kcmadv
-kde-misc/basket
-#kde-misc/bkodama
-#kde-misc/chromi
-kde-misc/colibri
-kde-misc/colord-kde
-#kde-misc/commandwatch
-#kde-misc/cpuload
-#kde-misc/customizable-weather
-#kde-misc/drop2ftp
-#kde-misc/emerging-plasmoid
-kde-misc/eventlist
-#kde-misc/eyesaver
-#kde-misc/fancytasks
-#kde-misc/geekclock
-#kde-misc/gx-mail-notify
-#kde-misc/hdaps_monitor
-#kde-misc/homerun
-kde-misc/kanyremote
-kde-misc/kbiff
-#kde-misc/kbstateapplet
-#kde-misc/kcaldav
-kde-misc/kcm-grub2
-#kde-misc/kcm-touchpad
-#kde-misc/kcm-ufw
-kde-misc/kcollectd
-kde-misc/kcometen4
-kde-misc/kdeconnect
-#kde-misc/kde-gtk-config
-kde-misc/kdesudo
-kde-misc/kdiff3
-kde-misc/kdirstat
-#kde-misc/kdmthemegenerator
-#kde-misc/kepas
-kde-misc/kfilebox
-#kde-misc/kgrubeditor
-kde-misc/kim4
-kde-misc/kimtoy
-kde-misc/kio-ftps
-kde-misc/kio-gdrive
-kde-misc/kio_gopher
-kde-misc/kio-locate
-kde-misc/kio-mtp
-kde-misc/kio-slp
-kde-misc/kolor-manager
-kde-misc/konstruktor
-kde-misc/kookie
-kde-misc/kopete-antispam
-kde-misc/kopete-thinklight
-kde-misc/kover
-kde-misc/kprayertime
-#kde-misc/kraidmonitor
-kde-misc/krcstat
-kde-misc/krecipes
-kde-misc/krename
-kde-misc/krunner-googletranslate
-kde-misc/krunner-kopete-contacts
-kde-misc/krusader
-#kde-misc/kscreen
-kde-misc/kshutdown
-kde-misc/ksplasher
-kde-misc/ktoshiba
-kde-misc/ktrafficanalyzer
-kde-misc/kvkbd
-kde-misc/kwebkitpart
-#kde-misc/milou
-#kde-misc/miniplayer
-#kde-misc/nightmode
-kde-misc/nvdevmon
-kde-misc/openofficeorg-thumbnail
-#kde-misc/plasma-applet-daisy
-kde-misc/plasma-applet-network-monitor
-kde-misc/plasma-applet-redshift-control
-kde-misc/plasma-applet-weather-widget
-#kde-misc/plasma-emergelog
-kde-misc/plasma-lionmail
-kde-misc/plasma-mpd-nowplaying
-#kde-misc/plasma-network-status
-#kde-misc/plasma-nm
-#kde-misc/plasma-photooftheday
-#kde-misc/plasmatvgr
-kde-misc/plasma-widget-menubar
-kde-misc/plasma-widget-message-indicator
-#kde-misc/plasma-wifi
-#kde-misc/plasmoid-workflow
-kde-misc/pyrad
-kde-misc/quadkonsole
-#kde-misc/quickaccess
-#kde-misc/redshift-plasmoid
-kde-misc/rsibreak
-#kde-misc/semantik
-kde-misc/serverstatuswidget
-kde-misc/skanlite
-#kde-misc/smooth-tasks
-#kde-misc/stdin-plasmoid
-kde-misc/steamcompanion
-#kde-misc/stock-quote
-kde-misc/synaptiks
-#kde-misc/systemd-kcm
-#kde-misc/takeoff
-kde-misc/tellico
-kde-misc/wacomtablet
-kde-misc/wicd-client-kde
-kde-misc/yakuake
-#kde-misc/yawp
-kde-misc/zanshin
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-plasma b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-plasma
deleted file mode 100644
index 71c70bbe6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/kde-plasma
+++ /dev/null
@@ -1,38 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-kde-plasma/bluedevil
-kde-plasma/breeze
-kde-plasma/kde-cli-tools
-kde-plasma/kdecoration
-kde-plasma/kde-gtk-config
-kde-plasma/kdeplasma-addons
-kde-plasma/kgamma
-kde-plasma/khotkeys
-kde-plasma/kinfocenter
-kde-plasma/kmenuedit
-kde-plasma/kscreen
-kde-plasma/ksshaskpass
-kde-plasma/ksysguard
-kde-plasma/kwallet-pam
-kde-plasma/kwayland-integration
-kde-plasma/kwin
-kde-plasma/kwrited
-kde-plasma/libkscreen
-kde-plasma/libksysguard
-kde-plasma/milou
-kde-plasma/oxygen
-kde-plasma/oxygen-fonts
-kde-plasma/plasma-desktop
-kde-plasma/plasma-meta
-kde-plasma/plasma-nm
-kde-plasma/plasma-pa
-kde-plasma/plasma-sdk
-kde-plasma/plasma-workspace
-kde-plasma/plasma-workspace-wallpapers
-kde-plasma/polkit-kde-agent
-kde-plasma/powerdevil
-kde-plasma/sddm-kcm
-kde-plasma/systemsettings
-kde-plasma/user-manager
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lib b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lib
deleted file mode 100644
index 02410f6ed..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lib
+++ /dev/null
@@ -1,52 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-dev-libs/weston
-sci-libs/scipy
-
-dev-qt/assistant:5 
-dev-qt/designer:5
-dev-qt/linguist:5 
-dev-qt/linguist-tools:5
-dev-qt/pixeltool:5 
-dev-qt/qdbus:5
-dev-qt/qdbusviewer:5 
-dev-qt/qdoc:5 
-dev-qt/qtbluetooth:5 
-dev-qt/qtconcurrent:5
-dev-qt/qtcore:5
-dev-qt/qtdbus:5
-dev-qt/qtdeclarative:5
-dev-qt/qtdiag:5
-dev-qt/qt-docs:5
-dev-qt/qtgraphicaleffects:5
-dev-qt/qtgui:5
-dev-qt/qthelp:5
-dev-qt/qtimageformats:5
-dev-qt/qtimageformats:5
-dev-qt/qtlocation:5
-dev-qt/qtmultimedia-5
-dev-qt/qtnetwork:5
-dev-qt/qtopengl:5
-dev-qt/qtpaths:5
-dev-qt/qtplugininfo:5
-dev-qt/qtpositioning:5 
-dev-qt/qtprintsupport:5
-dev-qt/qtquickcontrols:5
-dev-qt/qtscript:5
-dev-qt/qtsensors:5 
-dev-qt/qtserialport:5 
-dev-qt/qtsql:5
-dev-qt/qtsvg:5
-dev-qt/qttest:5
-dev-qt/qttranslations:5
-dev-qt/qtwayland:5 
-dev-qt/qtwebchannel:5 
-dev-qt/qtwebengine:5
-dev-qt/qtwebkit:5
-dev-qt/qtwebsockets:5
-dev-qt/qtwidgets:5
-dev-qt/qtx11extras:5
-dev-qt/qtxml:5
-dev-qt/qtxmlpatterns:5
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/logger b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/logger
deleted file mode 100644
index bc4eb789e..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/logger
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-admin/metalog
-app-admin/rsyslog
-app-admin/socklog
-app-admin/sysklogd
-app-admin/syslog-ng
-app-admin/syslogread
-#sys-freebsd/freebsd-usbin
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lxde b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lxde
deleted file mode 100644
index 3092e8c72..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lxde
+++ /dev/null
@@ -1,19 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-lxde-base/lxappearance
-lxde-base/lxappearance-obconf
-lxde-base/lxde-common
-lxde-base/lxde-icon-theme
-lxde-base/lxde-meta
-lxde-base/lxdm
-lxde-base/lxinput
-lxde-base/lxlauncher
-lxde-base/lxmenu-data
-lxde-base/lxpanel
-lxde-base/lxrandr
-lxde-base/lxsession
-lxde-base/lxtask
-lxde-base/lxterminal
-lxde-base/menu-cache
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lxqt b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lxqt
deleted file mode 100644
index 11d7e01df..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/lxqt
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-lxqt-base/lxqt-admin
-lxqt-base/lxqt-meta
-lxqt-base/lxqt-openssh-askpass
-lxqt-base/lxqt-powermanagement
-lxqt-base/lxqt-sudo
-media-gfx/lximage-qt
-x11-terms/qterminal
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/mate b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/mate
deleted file mode 100644
index db9d656fb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/mate
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-mate-base/mate
-mate-extra/caja-dropbox
-mate-extra/caja-extensions
-mate-extra/mate-calc
-mate-extra/mate-sensors-applet
-mate-extra/mate-user-guide
-mate-extra/mate-user-share
-x11-misc/mate-notification-daemon
-x11-misc/parcellite
-x11-themes/mate-icon-theme-faenza
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/multimedia b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/multimedia
deleted file mode 100644
index 7ccbd14ec..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/multimedia
+++ /dev/null
@@ -1,74 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-cdr/acetoneiso
-app-cdr/cdrtools
-app-cdr/dvd+rw-tools
-app-cdr/gcdemu
-app-cdr/graveman
-app-cdr/k3b
-app-cdr/xfburn
-media-gfx/clockphoto
-media-gfx/gphotofs
-media-gfx/shotwell
-media-gfx/viewnior
-media-gfx/viewnior
-media-plugins/qmmp-plugin-pack
-media-sound/adplay
-media-sound/alsa-utils
-media-sound/amarok
-media-sound/ario
-media-sound/audacious
-media-sound/audacity
-media-sound/bluez-alsa
-media-sound/cantata
-media-sound/clementine
-media-sound/easytag
-media-sound/exaile
-media-sound/flacon
-media-sound/gmtp
-media-sound/gpodder
-media-sound/grip
-media-sound/guayadeque
-media-sound/kmetronome
-#media-sound/kmid
-#media-sound/lxmusic
-media-sound/pnmixer
-media-sound/potamus
-media-sound/pragha
-media-sound/qastools
-media-sound/qmmp
-media-sound/qtractor
-media-sound/quodlibet
-media-sound/rhythmbox
-media-sound/sonata
-media-sound/soundconverter
-media-sound/tagtool
-media-sound/tomahawk
-media-sound/vimpc
-media-sound/xfmpc
-media-sound/xmms2
-media-tv/kodi
-media-video/avidemux
-media-video/cinelerra
-media-video/dvdauthor
-media-video/dvgrab
-media-video/gtk-recordmydesktop
-media-video/kaffeine
-media-video/kino
-media-video/kmplayer
-media-video/lives
-media-video/mediainfo
-media-video/mpv
-media-video/openshot:0
-media-video/openshot:1
-media-video/parole
-media-video/pitivi
-media-video/plasma-mediacenter
-media-video/qt-recordmydesktop
-media-video/simplescreenrecorder
-media-video/smplayer
-media-video/smtube
-media-video/totem
-media-video/vlc
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/net-misc b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/net-misc
deleted file mode 100644
index bb8e94232..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/net-misc
+++ /dev/null
@@ -1,237 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-net-misc/aria2
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-net-misc/adjtimex
-net-misc/aget
-net-misc/aggregate
-net-misc/aggregate-flim
-net-misc/aiccu
-net-misc/arm
-#net-misc/arpd
-net-misc/asterisk
-net-misc/asterisk-core-sounds
-net-misc/asterisk-extra-sounds
-net-misc/asterisk-moh-opsound
-net-misc/autossh
-net-misc/axel
-net-misc/badvpn
-#net-misc/bfgminer
-net-misc/bridge-utils
-net-misc/bsdwhois
-net-misc/bwwhois
-#net-misc/capi4hylafax
-net-misc/cbqinit
-net-misc/cfengine
-net-misc/charm
-net-misc/chrome-remote-desktop
-net-misc/chrony
-net-misc/clamz
-net-misc/clipgrab
-net-misc/clockspeed
-net-misc/clusterssh
-net-misc/cmst
-net-misc/connect
-net-misc/connman
-net-misc/connman-gtk
-net-misc/corkscrew
-net-misc/curl
-net-misc/dahdi
-net-misc/dahdi-tools
-net-misc/dhcp
-net-misc/dhcpcd
-net-misc/dhcpcd-ui
-net-misc/dhcping
-net-misc/dibbler
-#net-misc/dleyna-server
-net-misc/dnetstats
-net-misc/dropbear
-net-misc/dropbox
-net-misc/dropbox-cli
-net-misc/efax
-net-misc/electrum
-net-misc/fakeidentd
-net-misc/freerdp
-net-misc/gcap
-net-misc/geoipupdate
-net-misc/getdate
-net-misc/gnome-online-miners
-#net-misc/gofish
-net-misc/grdesktop
-#net-misc/gsasl
-net-misc/gupnp-tools
-net-misc/gwget
-net-misc/gwhois
-net-misc/hotot
-net-misc/hsc
-net-misc/htbinit
-net-misc/htpdate
-net-misc/httptunnel
-net-misc/httptype
-net-misc/hylafaxplus
-net-misc/iaxmodem
-net-misc/icecast
-net-misc/ices
-net-misc/ifenslave
-net-misc/igmpproxy
-net-misc/ipcalc
-net-misc/iperf
-net-misc/ipsc
-net-misc/ipsorcery
-net-misc/iputils
-net-misc/ipv6calc
-net-misc/ipx-utils
-net-misc/isatapd
-net-misc/java-wakeonlan
-net-misc/jrdesktop
-net-misc/jumpgate
-net-misc/jwhois
-net-misc/keychain
-#net-misc/knemo
-net-misc/knock
-net-misc/kvpnc
-net-misc/l7-protocols
-#net-misc/libreswan
-#net-misc/libteam
-net-misc/linux-identd
-net-misc/livestreamer
-net-misc/lksctp-tools
-#net-misc/lldpd
-#net-misc/mediatomb
-net-misc/memcached
-net-misc/mindterm
-net-misc/minidlna
-net-misc/miredo
-net-misc/mobile-broadband-provider-info
-net-misc/modemmanager
-net-misc/mosh
-net-misc/mrouted
-net-misc/nat-traverse
-#net-misc/ndisc6
-net-misc/nemesis
-#net-misc/netctl
-net-misc/netdate
-net-misc/netfleet
-net-misc/netifrc
-net-misc/netkit-bootparamd
-net-misc/netkit-bootpd
-net-misc/netkit-fingerd
-net-misc/netkit-rsh
-net-misc/netkit-rwho
-net-misc/netkit-talk
-net-misc/netkit-telnetd
-net-misc/netkit-timed
-net-misc/netpipes
-#net-misc/netsed
-net-misc/netstat-nat
-net-misc/networkmanager
-net-misc/networkmanager-openconnect
-#net-misc/networkmanager-openswan
-net-misc/networkmanager-openvpn
-net-misc/networkmanager-pptp
-net-misc/networkmanager-vpnc
-net-misc/npapi-sdk
-net-misc/nstx
-net-misc/ntp
-net-misc/ntpclient
-net-misc/nx
-net-misc/ofono
-net-misc/oidentd
-net-misc/olsrd
-net-misc/omniORB
-net-misc/openconnect
-#net-misc/openntpd
-net-misc/openrdate
-net-misc/openssh
-net-misc/openssh-blacklist
-net-misc/openvpn
-#net-misc/openvswitch
-net-misc/orbited
-net-misc/packETH
-net-misc/pedro
-net-misc/pen
-net-misc/portfwd
-net-misc/pps-tools
-net-misc/proxychains
-#net-misc/pssh
-net-misc/pump
-net-misc/putty
-net-misc/pycnb
-net-misc/pymazon
-net-misc/pytvshows
-net-misc/qtm
-net-misc/quagga
-#net-misc/r8168
-net-misc/rabbitmq-server
-net-misc/radvd
-net-misc/rdate
-net-misc/rdesktop
-net-misc/remmina
-net-misc/rinetd
-net-misc/rsync
-net-misc/rygel
-#net-misc/s3cmd
-net-misc/scponly
-net-misc/secpanel
-net-misc/sendfile
-net-misc/shmux
-net-misc/sipcalc
-#net-misc/siproxd
-net-misc/sitecopy
-#net-misc/sks
-net-misc/smb4k
-net-misc/snarf
-net-misc/sobby
-net-misc/socat
-net-misc/sock
-net-misc/spice-gtk
-net-misc/spiped
-net-misc/spread
-net-misc/ssh-askpass-fullscreen
-net-misc/sshpass
-net-misc/sslh
-net-misc/ssvnc
-net-misc/stone
-net-misc/streamtuner
-net-misc/strongswan
-net-misc/stunnel
-#net-misc/suite3270
-net-misc/taylor-uucp
-net-misc/tcpsound
-#net-misc/telnet-bsd
-#net-misc/throttle
-net-misc/tigervnc
-net-misc/tlsdate
-#net-misc/tn5250
-net-misc/tor
-net-misc/ttytter
-net-misc/udpcast
-#net-misc/unison
-net-misc/urlview
-net-misc/vconfig
-net-misc/vde
-net-misc/vinagre
-net-misc/vino
-net-misc/vpnc
-net-misc/vtun
-net-misc/wakeonlan
-net-misc/wget
-net-misc/whatmask
-net-misc/whois
-net-misc/wicd
-net-misc/wireguard
-net-misc/wol
-net-misc/wput
-net-misc/x11-ssh-askpass
-net-misc/x2goclient
-net-misc/x2goserver
-net-misc/yandex-disk
-net-misc/youtube-dl
-net-misc/youtube-viewer
-net-misc/ytalk
-net-misc/zssh
-net-misc/zsync
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/netapps b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/netapps
deleted file mode 100644
index 46c703fa0..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/netapps
+++ /dev/null
@@ -1,88 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-net-analyzer/ettercap
-net-p2p/mldonkey
-www-client/elinks
-www-client/links
-www-client/w3m
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-app-text/wgetpaste
-mail-client/balsa
-mail-client/claws-mail
-mail-client/geary
-mail-client/sylpheed
-mail-client/thunderbird
-mail-client/trojita
-net-analyzer/bmon
-net-analyzer/fail2ban
-net-analyzer/iptraf-ng
-net-analyzer/macchanger
-net-analyzer/nmap
-net-analyzer/sarg
-net-analyzer/tcpdump
-net-analyzer/traceroute
-net-analyzer/trafshow
-net-analyzer/vnstat
-net-analyzer/wireshark
-net-dialup/minicom
-net-firewall/ufw
-net-ftp/filezilla
-net-ftp/gftp
-net-ftp/tftp-hpa
-net-im/choqok
-net-im/corebird
-net-im/gajim
-net-im/licq
-net-im/pidgin
-net-im/psi
-net-im/psimedia
-net-im/qutim
-net-im/skype
-net-im/skypeforlinux
-net-im/telegram-desktop-bin
-net-im/vacuum
-net-irc/hexchat
-net-irc/irssi
-net-irc/konversation
-net-irc/kvirc
-net-irc/quassel
-net-irc/quassel-irssi
-net-irc/weechat
-net-misc/modem-manager-gui
-net-p2p/amule
-net-p2p/deluge
-net-p2p/kmldonkey
-net-p2p/ktorrent
-#net-p2p/mldonkey
-net-p2p/qbittorrent
-net-p2p/rtorrent
-net-p2p/transmission
-net-p2p/vuze
-net-voip/ekiga
-net-voip/linphone
-www-client/chromium
-www-client/dillo
-www-client/dooble
-www-client/epiphany
-www-client/firefox
-www-client/lynx
-www-client/midori
-www-client/opera
-www-client/otter
-www-client/qtweb
-www-client/qupzilla
-www-client/qutebrowser
-www-client/seamonkey
-www-client/surf
-www-client/uget
-www-client/xombrero
-www-plugins/chrome-ublock
-x11-misc/grsync
-x11-misc/x11vnc
-x11-plugins/pidgin-hotkeys
-x11-plugins/pidgin-libnotify
-x11-plugins/purple-plugin_pack
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/network b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/network
deleted file mode 100644
index 1c0fa3cd1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/network
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-net-dialup/ppp
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-gnome-extra/nm-applet
-net-dialup/pptpclient
-net-dialup/pptpd
-net-dialup/rp-pppoe
-net-dialup/xl2tpd
-net-dns/bind-tools
-net-dns/ddclient
-net-firewall/firehol
-net-firewall/fwbuilder
-net-firewall/ipsec-tools
-net-firewall/iptables
-net-firewall/sanewall
-net-firewall/shorewall
-net-fs/samba
-net-misc/networkmanager-l2tp
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/openbox b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/openbox
deleted file mode 100644
index f3a87ce63..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/openbox
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-x11-misc/compton
-x11-misc/gmrun
-#x11-misc/notification-daemon
-x11-misc/obconf
-x11-misc/pcmanfm
-x11-misc/screengrab
-x11-misc/tint2
-x11-misc/tintwizard
-x11-misc/xxkb
-x11-wm/openbox
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/plugins b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/plugins
deleted file mode 100644
index 9d9072cb8..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/plugins
+++ /dev/null
@@ -1,177 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-x11-plugins/allin1
-x11-plugins/asapm
-x11-plugins/asclock
-x11-plugins/ascpu
-x11-plugins/asmem
-x11-plugins/asmon
-x11-plugins/astime
-x11-plugins/bfm
-x11-plugins/bubblemon
-x11-plugins/compiz-plugins-extra
-x11-plugins/compiz-plugins-main
-x11-plugins/compiz-plugins-unsupported
-x11-plugins/cputnik
-x11-plugins/docker
-x11-plugins/epplets
-#x11-plugins/fsviewer
-x11-plugins/gkrellaclock
-x11-plugins/gkrellfire
-x11-plugins/gkrellflynn
-x11-plugins/gkrellkam
-x11-plugins/gkrellm-bgchanger
-x11-plugins/gkrellm-bluez
-x11-plugins/gkrellm-countdown
-x11-plugins/gkrellm-cpupower
-x11-plugins/gkrellm-imonc
-x11-plugins/gkrellmlaunch
-x11-plugins/gkrellm-leds
-x11-plugins/gkrellm-mailwatch
-x11-plugins/gkrellmoon
-x11-plugins/gkrellm-radio
-x11-plugins/gkrellmss
-x11-plugins/gkrellm-trayicons
-x11-plugins/gkrellm-volume
-x11-plugins/gkrellmwireless
-x11-plugins/gkrellm-xkb
-x11-plugins/gkrellshoot
-x11-plugins/gkrellstock
-x11-plugins/gkrellsun
-x11-plugins/gkrelltop
-x11-plugins/gkrellweather
-x11-plugins/gkwebmon
-x11-plugins/guifications
-#x11-plugins/hexchat-javascript
-x11-plugins/monto
-x11-plugins/pidgin-birthday-reminder
-x11-plugins/pidgin-bot-sentry
-x11-plugins/pidgin-encryption
-x11-plugins/pidgin-extprefs
-x11-plugins/pidgin-gnome-keyring
-x11-plugins/pidgin-gpg
-x11-plugins/pidgin-hotkeys
-x11-plugins/pidgin-indicator
-x11-plugins/pidgin-latex
-x11-plugins/pidgin-led-notification
-x11-plugins/pidgin-libnotify
-x11-plugins/pidgin-mbpurple
-x11-plugins/pidgin-mpris
-x11-plugins/pidgin-musictracker
-x11-plugins/pidgin-opensteamworks
-x11-plugins/pidgin-otr
-x11-plugins/pidgin-privacy-please
-x11-plugins/pidgin-rhythmbox
-x11-plugins/pidgin-sipe
-x11-plugins/pidgin-skypeweb
-x11-plugins/pidgintex
-x11-plugins/pidgin-window_merge
-x11-plugins/pidgin-xmpp-receipts
-x11-plugins/purple-facebook
-x11-plugins/purple-libnotify-plus
-x11-plugins/purple-plugin_pack
-x11-plugins/qled
-x11-plugins/thinkhdaps
-x11-plugins/vicious
-x11-plugins/wmacpi
-x11-plugins/wmacpiload-ac
-x11-plugins/wmail
-x11-plugins/wmapm
-x11-plugins/wmapmload
-x11-plugins/wmappl
-x11-plugins/wmbattery
-x11-plugins/wmbiff
-x11-plugins/wmbinclock
-x11-plugins/wmbio
-x11-plugins/wmblob
-x11-plugins/wmbluecpu
-x11-plugins/wmbutton
-x11-plugins/wmcalc
-x11-plugins/wmCalClock
-x11-plugins/wmcalendar
-x11-plugins/wmcdplay
-x11-plugins/wmcliphist
-x11-plugins/wmclock
-x11-plugins/wmclockmon
-x11-plugins/wmcms
-x11-plugins/wmcoincoin
-x11-plugins/wmcp
-x11-plugins/wmcpuload
-x11-plugins/wmcube
-x11-plugins/wmdate
-x11-plugins/wmdf
-x11-plugins/wmdiskmon
-x11-plugins/wmdl
-x11-plugins/wmdots
-x11-plugins/wmDownload
-x11-plugins/wmdrawer
-x11-plugins/wmfire
-x11-plugins/wmfishtime
-x11-plugins/wmforkplop
-x11-plugins/wmfortune
-x11-plugins/wmfrog
-x11-plugins/wmfsm
-x11-plugins/wmget
-x11-plugins/wmgrabimage
-x11-plugins/wmgtemp
-x11-plugins/wmhdplop
-x11-plugins/wmifinfo
-x11-plugins/wmifs
-x11-plugins/wminet
-x11-plugins/wmitime
-x11-plugins/wmix
-x11-plugins/wmlaptop
-x11-plugins/wmlife
-x11-plugins/wmload
-x11-plugins/wmlpq
-x11-plugins/wmmaiload
-x11-plugins/wmmand
-x11-plugins/wmMatrix
-x11-plugins/wmmemfree
-x11-plugins/wmmemload
-x11-plugins/wmmemmon
-x11-plugins/wmmenu
-x11-plugins/wmmisc
-x11-plugins/wmmldonkey
-x11-plugins/wmmon
-x11-plugins/wmmon+smp
-x11-plugins/wmMoonClock
-x11-plugins/wmmp
-x11-plugins/wmmp3
-x11-plugins/wmmsg
-x11-plugins/wmnd
-x11-plugins/wmnet
-#x11-plugins/wmnetload
-x11-plugins/wmnetselect
-x11-plugins/wmpager
-x11-plugins/wmpasman
-x11-plugins/wmpinboard
-x11-plugins/wmping
-x11-plugins/wmpop3
-x11-plugins/wmpop3lb
-x11-plugins/wmpower
-x11-plugins/wmppp
-x11-plugins/wmrack
-x11-plugins/wmsmixer
-x11-plugins/wmSMPmon
-x11-plugins/wmSpaceWeather
-x11-plugins/wmstickynotes
-x11-plugins/wmSun
-x11-plugins/wmswallow
-x11-plugins/wmsysmon
-x11-plugins/wmsystemtray
-x11-plugins/wmsystray
-x11-plugins/wmtime
-x11-plugins/wmtimer
-x11-plugins/wmtop
-x11-plugins/wmtz
-x11-plugins/wmudmount
-x11-plugins/wmupmon
-x11-plugins/wmweather
-x11-plugins/wmweather+
-x11-plugins/wmwifi
-x11-plugins/wmwork
-x11-plugins/wmxkb
-x11-plugins/wmxres
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/printer b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/printer
deleted file mode 100644
index 3a41a27b6..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/printer
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-media-gfx/xsane
-net-print/cnijfilter
-net-print/cups
-net-print/epson-inkjet-printer-escpr
-net-print/gutenprint
-net-print/hplip
-net-print/hplip-plugin
-net-print/splix
-net-print/xerox-drivers
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/sci-libs b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/sci-libs
deleted file mode 100644
index 331c3943b..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/sci-libs
+++ /dev/null
@@ -1,102 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-sci-libs/adolc
-sci-libs/alglib
-sci-libs/amd
-sci-libs/armadillo
-sci-libs/arpack
-sci-libs/blas-reference
-sci-libs/camd
-sci-libs/cbflib
-sci-libs/cblas-reference
-sci-libs/ccfits
-sci-libs/ccolamd
-sci-libs/cdd+
-sci-libs/cddlib
-sci-libs/cdf
-sci-libs/cfitsio
-sci-libs/cgcode
-sci-libs/cholmod
-sci-libs/cifparse-obj
-sci-libs/clapack
-sci-libs/clashscore-db
-sci-libs/cln
-sci-libs/colamd
-sci-libs/colpack
-sci-libs/cqrlib
-sci-libs/cxsparse
-sci-libs/djbfft
-sci-libs/exodusii
-sci-libs/fetk
-sci-libs/fftw
-sci-libs/flann
-sci-libs/gamer
-sci-libs/gdal
-sci-libs/geos
-sci-libs/gsl
-sci-libs/gts
-sci-libs/hdf
-sci-libs/hdf5
-sci-libs/htslib
-sci-libs/inchi
-sci-libs/indilib
-sci-libs/io_lib
-sci-libs/itpp
-sci-libs/lapack-reference
-sci-libs/ldl
-sci-libs/libcerf
-sci-libs/libctl
-sci-libs/libdap
-sci-libs/libgeotiff
-sci-libs/libghemical
-sci-libs/libint
-sci-libs/libnova
-sci-libs/liborigin
-sci-libs/libqalculate
-sci-libs/libspatialindex
-sci-libs/libsvm
-sci-libs/linux-gpib
-sci-libs/lrslib
-#sci-libs/magma
-sci-libs/mc
-#sci-libs/metis
-#sci-libs/mkl
-sci-libs/mpfi
-sci-libs/mpir
-sci-libs/neartree
-sci-libs/netcdf
-sci-libs/netcdf-cxx
-sci-libs/nlopt
-sci-libs/ogdi
-sci-libs/opencascade
-sci-libs/openfoam
-sci-libs/parmetis
-sci-libs/parmgridgen
-sci-libs/pastix
-sci-libs/pgplot
-sci-libs/plotmm
-sci-libs/plplot
-sci-libs/primegen
-sci-libs/proj
-sci-libs/punc
-sci-libs/pymmlib
-sci-libs/qrupdate
-sci-libs/scipy
-sci-libs/scotch
-sci-libs/shapelib
-sci-libs/spqr
-sci-libs/suitesparseconfig
-sci-libs/superlu
-sci-libs/szip
-sci-libs/tamu_anova
-sci-libs/udunits
-sci-libs/ufconfig
-sci-libs/umfpack
-sci-libs/voro++
-sci-libs/votca-tools
-sci-libs/vtk
-sci-libs/vtkdata
-#sci-libs/xdmf2
-sci-libs/xkaapi
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/science b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/science
deleted file mode 100644
index effd2d5bc..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/science
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-sci-astronomy/celestia
-sci-geosciences/qgis
-#sci-libs/openfoam
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/server b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/server
deleted file mode 100644
index b4da52eb1..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/server
+++ /dev/null
@@ -1,42 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-net-fs/netatalk
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-dev-db/mongodb
-dev-db/pg_top
-dev-db/postgresql
-dev-db/redis
-dev-lang/php
-dev-vcs/gitolite
-mail-filter/clamsmtp
-mail-filter/opendkim
-mail-filter/postgrey
-mail-filter/procmail
-mail-filter/spamassassin
-mail-mta/nullmailer
-net-dns/bind
-net-fs/netatalk
-net-fs/samba
-net-ftp/ftp
-net-ftp/lftp
-net-ftp/proftpd
-net-ftp/vsftpd
-net-im/ejabberd
-net-irc/unrealircd
-net-mail/fetchmail
-#net-proxy/havp
-net-proxy/privoxy
-net-proxy/squid
-net-proxy/squidguard
-net-wireless/hostapd
-#in#
-
-#?in(os_linux_pkglist, server)!=#
-dev-db/mariadb
-mail-mta/postfix
-net-mail/dovecot
-sys-apps/calculate-server
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/sys-apps b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/sys-apps
deleted file mode 100644
index 5fe500b46..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/sys-apps
+++ /dev/null
@@ -1,171 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-sys-apps/accountsservice
-sys-apps/ack
-sys-apps/apmd
-sys-apps/apply-default-acl
-sys-apps/arrayprobe
-sys-apps/attr
-sys-apps/audio-entropyd
-sys-apps/baobab
-sys-apps/bar
-sys-apps/baselayout
-sys-apps/baselayout-java
-sys-apps/biosdevname
-sys-apps/bleachbit
-sys-apps/busybox
-sys-apps/cciss_vol_status
-sys-apps/checkpolicy
-sys-apps/clrngd
-sys-apps/collectl
-sys-apps/coreutils
-sys-apps/cpuid
-sys-apps/cracklib-words
-sys-apps/daemonize
-sys-apps/dbus
-sys-apps/dcfldd
-sys-apps/debianutils
-sys-apps/diffutils
-sys-apps/dmapi
-sys-apps/dmidecode
-sys-apps/dnotify
-sys-apps/dog
-sys-apps/dstat
-sys-apps/dtc
-sys-apps/ed
-sys-apps/elfix
-sys-apps/epoch
-sys-apps/etckeeper
-sys-apps/ethtool
-sys-apps/fakechroot
-sys-apps/fakeroot
-sys-apps/fbset
-sys-apps/file
-sys-apps/findutils
-sys-apps/flashrom
-sys-apps/fxload
-sys-apps/gawk
-sys-apps/gentoo-functions
-sys-apps/gnome-disk-utility
-sys-apps/gptfdisk
-sys-apps/gradm
-sys-apps/grep
-sys-apps/groff
-sys-apps/gscanbus
-sys-apps/gsmartcontrol
-sys-apps/haveged
-sys-apps/hdparm
-sys-apps/help2man
-sys-apps/hexdump-esr
-sys-apps/hotplug2stdout
-sys-apps/hwdata-gentoo
-sys-apps/hwids
-sys-apps/hwinfo
-sys-apps/hwloc
-sys-apps/hwsetup
-sys-apps/i2c-tools
-sys-apps/input-utils
-sys-apps/install-xattr
-sys-apps/inxi
-sys-apps/iotools
-sys-apps/ipmitool
-sys-apps/ipmiutil
-sys-apps/iproute2
-sys-apps/irqbalance
-sys-apps/isapnptools
-sys-apps/iucode_tool
-sys-apps/kbd
-sys-apps/kexec-tools
-sys-apps/keyutils
-sys-apps/kmod
-sys-apps/lm_sensors
-sys-apps/lnxhc
-sys-apps/logwatch
-sys-apps/lomoco
-sys-apps/lsb-release
-sys-apps/makedev
-#sys-apps/man
-sys-apps/man-db
-sys-apps/man-pages
-sys-apps/man-pages-posix
-sys-apps/mawk
-sys-apps/memtest86
-sys-apps/memtest86+
-sys-apps/memtester
-sys-apps/microcode-ctl
-sys-apps/miscfiles
-sys-apps/mlocate
-#sys-apps/modutils
-sys-apps/moreutils
-sys-apps/most
-sys-apps/msr-tools
-sys-apps/netkit-base
-sys-apps/netplug
-sys-apps/net-tools
-sys-apps/nvme-cli
-sys-apps/openrc
-sys-apps/paludis
-sys-apps/paxctl
-sys-apps/pciutils
-sys-apps/pcmciautils
-sys-apps/pcsc-lite
-sys-apps/pkgcore
-sys-apps/pmount
-sys-apps/policycoreutils
-sys-apps/portage
-sys-apps/preload
-sys-apps/progress
-sys-apps/proot
-sys-apps/pv
-sys-apps/qdiskusage
-sys-apps/qingy
-sys-apps/raidutils
-sys-apps/readahead-list
-sys-apps/rename
-sys-apps/renameutils
-sys-apps/rescan-scsi-bus
-sys-apps/rng-tools
-sys-apps/s6
-sys-apps/s6-portable-utils
-sys-apps/sandbox
-sys-apps/sdparm
-sys-apps/secilc
-sys-apps/sed
-sys-apps/setserial
-sys-apps/sg3_utils
-sys-apps/shadow
-sys-apps/smartmontools
-sys-apps/syscriptor
-sys-apps/syslog-notify
-sys-apps/sysvinit
-sys-apps/tcp-wrappers
-sys-apps/texinfo
-sys-apps/the_silver_searcher
-sys-apps/timer_entropyd
-sys-apps/tuxonice-userui
-sys-apps/uam
-sys-apps/ucspi-ssl
-sys-apps/ucspi-tcp
-sys-apps/ucspi-unix
-sys-apps/udevil
-sys-apps/unscd
-sys-apps/usb_modeswitch
-sys-apps/usbredir
-sys-apps/usbutils
-sys-apps/usermode-utilities
-#sys-apps/utempter
-sys-apps/util-linux
-sys-apps/v86d
-sys-apps/vbetool
-sys-apps/watchdog
-sys-apps/which
-sys-apps/x86info
-sys-apps/xinetd
-sys-apps/xmbmon
-sys-apps/yum
-#in#
-
-#?in(os_linux_pkglist, desktop)!=&&os_arch_machine==x86_64#
-sys-apps/firejail
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/tools b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/tools
deleted file mode 100644
index c90487a61..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/tools
+++ /dev/null
@@ -1,279 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-app-misc/mc
-dev-util/ccache
-net-analyzer/mtr
-sys-apps/acl
-sys-apps/lshw
-sys-block/fio
-sys-fs/cryptsetup
-sys-kernel/calculate-sources:4.4.37
-sys-power/powertop
-
-# magic dependence with sys-apps/hwinfo
-sys-fs/ntfs3g
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-app-admin/conky
-app-admin/conkyforecast
-app-admin/gamin
-app-admin/gtkdiskfree
-app-admin/hardinfo
-app-admin/hddtemp
-app-admin/keepass
-app-admin/keepassx
-app-admin/logrotate
-app-admin/makepasswd
-app-admin/packagekit-qt
-app-admin/sudo
-app-admin/sysstat
-app-admin/testdisk
-app-admin/webmin
-app-antivirus/clamav
-app-arch/afio
-app-arch/alien
-app-arch/arc
-app-arch/arj
-app-arch/bloscpack
-app-arch/bsdsfv
-app-arch/cfv
-app-arch/cksfv
-app-arch/deb2targz
-app-arch/dpkg
-app-arch/dump
-app-arch/funzix
-app-arch/ipkg-utils
-app-arch/lbzip2
-app-arch/lcab
-app-arch/lha
-app-arch/lrzip
-app-arch/lz4
-app-arch/lzip
-app-arch/lziprecover
-app-arch/lzma
-app-arch/lzop
-app-arch/p7zip
-app-arch/pbzip2
-app-arch/pigz
-app-arch/pixz
-app-arch/plzip
-app-arch/pxz
-app-arch/rar
-app-arch/rpm
-app-arch/rzip
-app-arch/star
-app-arch/unlzx
-app-arch/unrar
-app-arch/unzip
-app-arch/xar
-app-arch/zoo
-app-arch/zopfli
-app-backup/qt4-fsarchiver
-app-benchmarks/bootchart2
-app-benchmarks/bootchart2
-app-benchmarks/stress
-app-crypt/pgpdump
-app-forensics/rkhunter
-app-i18n/enca
-app-i18n/nabi
-app-laptop/tpb
-app-laptop/tp_smapi
-app-misc/anki
-app-misc/dvorakng
-app-misc/emelfm2
-app-misc/gtypist
-app-misc/klavaro
-app-misc/neofetch
-app-misc/qlcplus
-app-misc/ranger
-app-misc/screen
-app-misc/screenfetch
-app-misc/screenfetch
-app-misc/tmux
-app-misc/vlock
-app-misc/workrave
-app-mobilephone/qtadb
-app-mobilephone/wammu
-app-pda/usbmuxd
-app-shells/bash-completion
-app-shells/ccsh
-app-shells/dsh
-app-shells/esh
-app-shells/gentoo-zsh-completions
-app-shells/hstr
-app-shells/mksh
-app-shells/rrs
-app-shells/sash
-app-shells/tcsh
-app-shells/zsh
-app-shells/zsh-completions
-app-text/apvlv
-app-text/texlive
-app-text/xournal
-dev-db/mysql-workbench
-dev-db/sqlitebrowser
-dev-embedded/arduino
-dev-lang/mono
-dev-lang/vala:0.30
-dev-lang/vala:0.32
-dev-libs/klibc
-dev-libs/libcgroup
-dev-qt/qt-creator
-dev-util/android-sdk-update-manager
-dev-util/android-tools
-dev-util/codeblocks
-dev-util/geany
-dev-util/geany-plugins
-dev-util/gource
-dev-util/pida
-dev-util/schroot
-dev-util/strace
-dev-vcs/bzr
-dev-vcs/cvs
-dev-vcs/mercurial
-dev-vcs/qgit
-dev-vcs/subversion
-gnome-base/dconf-editor
-gnome-base/gnome-menus
-mail-client/evolution
-mail-client/mutt
-mail-client/sylpheed
-media-gfx/cellwriter
-media-gfx/wally
-media-radio/fldigi
-media-sound/gimmix
-media-sound/mac
-media-sound/picard
-media-video/gaupol
-net-analyzer/iftop
-net-analyzer/iftop
-net-analyzer/jnettop
-net-analyzer/mbrowse
-net-analyzer/nethogs
-net-analyzer/nload
-net-analyzer/speedtest-cli
-net-fs/davfs2
-net-fs/sshfs
-sys-apps/keyexec
-net-nds/shelldap
-net-news/quiterss
-net-p2p/bitcoin-qt
-sys-auth/nss_ldap
-sys-auth/pam_ldap
-sys-auth/pam_update
-sys-auth/thinkfinger
-sys-block/fio
-sys-block/gparted
-sys-block/parted
-sys-block/partitionmanager
-sys-block/tw_cli
-sys-devel/prelink
-sys-fs/avfs
-sys-fs/btrfs-progs
-sys-fs/clamfs
-sys-fs/cramfs
-sys-fs/ddrescue
-sys-fs/dmraid
-sys-fs/dosfstools
-sys-fs/e4rat
-sys-fs/encfs
-sys-fs/exfat-utils
-sys-fs/ext3grep
-sys-fs/ext4magic
-sys-fs/f2fs-tools
-sys-fs/fatsort
-sys-fs/fuse-exfat
-sys-fs/jfsutils
-sys-fs/ldapfuse
-sys-fs/lxcfs
-sys-fs/mdadm
-sys-fs/mtools
-sys-fs/mtpfs
-sys-fs/nilfs-utils
-sys-fs/quota
-sys-fs/reiser4progs
-sys-fs/reiserfs-defrag
-sys-fs/reiserfsprogs
-sys-fs/simple-mtpfs
-sys-fs/xfsdump
-sys-fs/xfsprogs
-sys-power/acpi
-sys-power/apcupsd
-sys-power/cpupower
-sys-power/powernowd
-sys-power/upower-pm-utils
-sys-process/atop
-sys-process/glances
-sys-process/htop
-sys-process/iotop
-sys-process/lsof
-sys-process/nmon
-sys-process/vixie-cron
-www-plugins/adobe-flash
-x11-libs/gksu
-x11-misc/cdm
-x11-misc/devilspie
-x11-misc/dmenu
-x11-misc/gcolor2
-x11-misc/i3lock
-x11-misc/i3status
-x11-misc/idesk
-x11-misc/idesk-extras
-x11-misc/ktsuss
-x11-misc/numlockx
-x11-misc/obmenu
-x11-misc/openbox-menu
-x11-misc/oroborus-desklaunch
-x11-misc/oroborus-deskmenu
-x11-misc/oroborus-keylaunch
-x11-misc/pypanel
-x11-misc/qlipper
-x11-misc/qxkb
-x11-misc/redshift
-x11-misc/slim
-x11-misc/spacefm
-x11-misc/sunflower
-x11-misc/wmctrl
-x11-misc/xautomation
-x11-misc/xclip
-x11-misc/xcompmgr
-x11-misc/xdotool
-x11-misc/xrestop
-x11-misc/xscreensaver
-x11-misc/xsnow
-x11-misc/xvkbd
-#x11-terms/aterm
-#x11-terms/eterm
-x11-terms/evilvte
-x11-terms/guake
-#x11-terms/hanterm
-#x11-terms/kterm
-x11-terms/lilyterm
-x11-terms/mrxvt
-x11-terms/multi-aterm
-x11-terms/pangoterm
-x11-terms/root-tail
-x11-terms/roxterm
-x11-terms/rxvt
-x11-terms/rxvt-unicode
-x11-terms/sakura
-#x11-terms/st
-x11-terms/terminator
-#x11-terms/terminology
-x11-terms/tilda
-x11-terms/valaterm
-x11-terms/xvt
-#x11-terms/yeahconsole
-x11-themes/geany-themes
-x11-themes/gtk-theme-switch
-#in#
-
-#?in(os_linux_pkglist, desktop)!=&&os_arch_machine==x86_64#
-www-plugins/chrome-binary-plugins
-#in#
-
-#?in(os_linux_pkglist, server)!=#
-sys-process/cronie
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/vim b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/vim
deleted file mode 100644
index 44e2345ea..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/vim
+++ /dev/null
@@ -1,167 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-vim/ackvim
-app-vim/airline
-app-vim/align
-app-vim/alternate
-app-vim/ansiesc
-app-vim/ant_menu
-app-vim/autoalign
-app-vim/bash-support
-app-vim/bnf-syntax
-app-vim/brainfuck-syntax
-app-vim/breakpts
-app-vim/bufexplorer
-app-vim/calendar
-app-vim/cctree
-app-vim/cecutil
-app-vim/cfengine-syntax
-app-vim/checkattach
-app-vim/closetag
-app-vim/cmdalias
-app-vim/colorschemes
-app-vim/colorsel
-app-vim/cream
-app-vim/csound-syntax
-app-vim/csscomplete
-app-vim/csv
-app-vim/ctrlp
-app-vim/curcmdmode
-app-vim/cvsmenu
-app-vim/dbext
-app-vim/detectindent
-app-vim/dhcpd-syntax
-app-vim/diffchar
-app-vim/dirdiff
-app-vim/easy-align
-app-vim/easytags
-app-vim/ebnf-syntax
-app-vim/emmet
-app-vim/enhancedcommentify
-app-vim/errsign
-app-vim/eruby-syntax
-app-vim/eselect-syntax
-app-vim/exheres-syntax
-app-vim/extra-syntax
-app-vim/fluxbox-syntax
-app-vim/foldutil
-app-vim/fugitive
-app-vim/fuzzyfinder
-app-vim/genindent
-app-vim/gentoo-syntax
-app-vim/genutils
-app-vim/gist
-app-vim/gitgutter
-app-vim/gitlog
-app-vim/gitolite-syntax
-app-vim/git-patch-tags
-app-vim/gitv
-app-vim/gnupg
-app-vim/greputils
-app-vim/gtk-syntax
-app-vim/gundo
-app-vim/help-extra-syntax
-app-vim/html5
-app-vim/increment
-app-vim/indentpython
-app-vim/info
-app-vim/json
-app-vim/l9
-app-vim/languagetool
-app-vim/locateopen
-app-vim/matrix
-app-vim/merginal
-app-vim/minibufexpl
-app-vim/multiplesearch
-app-vim/multvals
-app-vim/nagios-syntax
-app-vim/neocomplcache
-app-vim/nerdcommenter
-app-vim/nerdtree
-app-vim/nerdtree-tabs
-app-vim/nginx-syntax
-app-vim/notes
-app-vim/ntp-syntax
-app-vim/omnicppcomplete
-app-vim/pam-syntax
-app-vim/pathogen
-app-vim/pdv
-app-vim/perlomni
-app-vim/pgn-syntax
-app-vim/phpdocs
-app-vim/project
-app-vim/puppet-syntax
-app-vim/pushpop
-app-vim/pyclewn
-app-vim/pydiction
-app-vim/pydoc
-app-vim/pytest
-app-vim/python-mode
-app-vim/rails
-app-vim/rainbow_parentheses
-app-vim/recover
-app-vim/reload
-app-vim/repeat
-app-vim/ri-browser
-app-vim/rust-vim
-app-vim/salt-vim
-app-vim/scala-syntax
-app-vim/screen
-app-vim/searchcomplete
-app-vim/securemodelines
-app-vim/selinux-syntax
-app-vim/session
-app-vim/showmarks
-app-vim/sleuth
-app-vim/snipmate
-app-vim/sudoedit
-app-vim/supertab
-app-vim/surround
-app-vim/syntastic
-app-vim/tagbar
-app-vim/taglist
-app-vim/tasklist
-app-vim/tcomment
-app-vim/thlnk
-app-vim/tlib
-app-vim/tmpl
-app-vim/toggle
-app-vim/tt2-syntax
-app-vim/udev-syntax
-app-vim/undotree
-app-vim/uptime
-app-vim/vcscommand
-app-vim/vim-addon-mw-utils
-app-vim/vimbuddy
-app-vim/vimclojure
-app-vim/vimcommander
-app-vim/vim-flake8
-app-vim/vim-latex
-app-vim/vim-misc
-app-vim/vimoutliner
-app-vim/vimpython
-app-vim/vim-r
-app-vim/vim-rest-console
-app-vim/vim-spell-cs
-app-vim/vim-spell-da
-app-vim/vim-spell-de
-app-vim/vim-spell-el
-app-vim/vim-spell-en
-app-vim/vim-spell-es
-app-vim/vim-spell-fr
-app-vim/vim-spell-he
-app-vim/vim-spell-hu
-app-vim/vim-spell-it
-app-vim/vim-spell-nl
-app-vim/vim-spell-pl
-app-vim/vim-spell-pt
-app-vim/vim-spell-ru
-app-vim/vim-tmux
-app-vim/webapi
-app-vim/wikipedia-syntax
-app-vim/xquery-syntax
-app-vim/xsl-syntax
-app-vim/yankring
-app-vim/zoomwin
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/wireless b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/wireless
deleted file mode 100644
index a2c46ac83..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/wireless
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-net-wireless/aircrack-ng
-net-wireless/blueman
-net-wireless/broadcom-sta
-net-wireless/wireless-tools
-net-wireless/wpa_supplicant
-sys-firmware/b43-firmware
-sys-firmware/ipw2100-firmware
-sys-firmware/ipw2200-firmware
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/wm b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/wm
deleted file mode 100644
index 4d5687c2d..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/wm
+++ /dev/null
@@ -1,27 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-x11-libs/compizconfig-backend-gconf
-x11-libs/compizconfig-backend-kconfig4
-x11-misc/simple-ccsm
-x11-themes/emerald-themes
-x11-wm/afterstep
-x11-wm/awesome
-x11-wm/blackbox
-x11-wm/compiz-fusion
-x11-wm/dwm
-x11-wm/emerald
-x11-wm/enlightenment
-x11-wm/enlightenment:0.17
-x11-wm/evilwm
-x11-wm/fluxbox
-x11-wm/fvwm
-x11-wm/i3
-x11-wm/icewm
-x11-wm/jwm
-x11-wm/oroborus
-x11-wm/pekwm
-x11-wm/twm
-x11-wm/windowmaker
-#in#
-
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/www-client b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/www-client
deleted file mode 100644
index 0be7c0b91..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/www-client
+++ /dev/null
@@ -1,40 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop, server)!=#
-www-client/elinks
-www-client/links
-www-client/w3m
-#in#
-
-#?in(os_linux_pkglist, desktop)!=#
-www-client/chromium
-www-client/conkeror
-www-client/dillo
-www-client/dooble
-www-client/epiphany
-www-client/fetch
-www-client/firefox
-www-client/firefox-bin
-www-client/httrack
-www-client/lynx
-www-client/midori
-www-client/netrik
-#www-client/netsurf
-www-client/opera
-www-client/otter
-www-client/phantomjs
-www-client/pybugz
-www-client/qtweb
-www-client/qupzilla
-www-client/qutebrowser
-www-client/seamonkey
-www-client/seamonkey-bin
-www-client/surf
-www-client/surfraw
-www-client/uget
-www-client/vivaldi
-#www-client/w3mir
-#www-client/w3mmee
-#www-client/weboob
-www-client/xombrero
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/x11-apps b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/x11-apps
deleted file mode 100644
index 31cf1cd04..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/x11-apps
+++ /dev/null
@@ -1,92 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-x11-apps/amlc
-x11-apps/appres
-x11-apps/bdftopcf
-x11-apps/beforelight
-x11-apps/bitmap
-x11-apps/copyq
-x11-apps/editres
-x11-apps/fonttosfnt
-x11-apps/fslsfonts
-x11-apps/fstobdf
-x11-apps/fusion-icon
-x11-apps/iceauth
-x11-apps/ico
-x11-apps/intel-gpu-tools
-x11-apps/listres
-x11-apps/luit
-x11-apps/mesa-progs
-x11-apps/mkfontdir
-x11-apps/mkfontscale
-x11-apps/oclock
-x11-apps/rgb
-x11-apps/rstart
-x11-apps/scripts
-x11-apps/sessreg
-x11-apps/setxkbmap
-x11-apps/showfont
-x11-apps/smproxy
-x11-apps/transset
-x11-apps/viewres
-x11-apps/x11perf
-x11-apps/xauth
-x11-apps/xbacklight
-x11-apps/xbiff
-x11-apps/xcalc
-x11-apps/xclipboard
-x11-apps/xclock
-x11-apps/xcmsdb
-x11-apps/xconsole
-x11-apps/xcursorgen
-x11-apps/xdbedizzy
-x11-apps/xditview
-x11-apps/xdm
-x11-apps/xdpyinfo
-x11-apps/xdriinfo
-x11-apps/xedit
-x11-apps/xev
-x11-apps/xeyes
-x11-apps/xf86dga
-x11-apps/xfd
-x11-apps/xfontsel
-x11-apps/xgamma
-x11-apps/xgc
-x11-apps/xhost
-x11-apps/xinit
-x11-apps/xinput
-x11-apps/xinput_calibrator
-x11-apps/xkbcomp
-x11-apps/xkbevd
-x11-apps/xkbprint
-x11-apps/xkbutils
-x11-apps/xkill
-x11-apps/xload
-x11-apps/xlogo
-x11-apps/xlsatoms
-x11-apps/xlsclients
-x11-apps/xlsfonts
-x11-apps/xmag
-#x11-apps/xman
-x11-apps/xmessage
-x11-apps/xmodmap
-x11-apps/xmore
-x11-apps/xpr
-x11-apps/xprop
-x11-apps/xrandr
-x11-apps/xrdb
-x11-apps/xrectsel
-x11-apps/xrefresh
-x11-apps/xset
-x11-apps/xsetroot
-x11-apps/xsm
-x11-apps/xstdcmap
-x11-apps/xtrap
-x11-apps/xvidtune
-x11-apps/xvinfo
-x11-apps/xwarppointer
-x11-apps/xwd
-x11-apps/xwininfo
-x11-apps/xwud
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/x11-drivers b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/x11-drivers
deleted file mode 100644
index a0da080ea..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/x11-drivers
+++ /dev/null
@@ -1,62 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-x11-drivers/nvidia-drivers
-x11-drivers/xf86-input-acecad
-x11-drivers/xf86-input-aiptek
-x11-drivers/xf86-input-elographics
-x11-drivers/xf86-input-evdev
-x11-drivers/xf86-input-fpit
-x11-drivers/xf86-input-hyperpen
-x11-drivers/xf86-input-joystick
-x11-drivers/xf86-input-keyboard
-x11-drivers/xf86-input-libinput
-x11-drivers/xf86-input-mouse
-x11-drivers/xf86-input-mtrack
-x11-drivers/xf86-input-mutouch
-x11-drivers/xf86-input-penmount
-x11-drivers/xf86-input-synaptics
-x11-drivers/xf86-input-tslib
-x11-drivers/xf86-input-vmmouse
-x11-drivers/xf86-input-void
-x11-drivers/xf86-input-wacom
-x11-drivers/xf86-video-amdgpu
-x11-drivers/xf86-video-apm
-#x11-drivers/xf86-video-ark
-x11-drivers/xf86-video-ast
-x11-drivers/xf86-video-ati
-x11-drivers/xf86-video-chips
-x11-drivers/xf86-video-cirrus
-x11-drivers/xf86-video-dummy
-x11-drivers/xf86-video-fbdev
-x11-drivers/xf86-video-glint
-x11-drivers/xf86-video-i128
-x11-drivers/xf86-video-i740
-x11-drivers/xf86-video-intel
-x11-drivers/xf86-video-ivtv
-x11-drivers/xf86-video-mach64
-x11-drivers/xf86-video-mga
-#x11-drivers/xf86-video-modesetting
-x11-drivers/xf86-video-neomagic
-x11-drivers/xf86-video-nouveau
-x11-drivers/xf86-video-nv
-x11-drivers/xf86-video-openchrome
-x11-drivers/xf86-video-qxl
-x11-drivers/xf86-video-r128
-x11-drivers/xf86-video-rendition
-x11-drivers/xf86-video-s3
-x11-drivers/xf86-video-s3virge
-x11-drivers/xf86-video-savage
-x11-drivers/xf86-video-siliconmotion
-x11-drivers/xf86-video-sis
-x11-drivers/xf86-video-sisusb
-x11-drivers/xf86-video-tdfx
-x11-drivers/xf86-video-tga
-x11-drivers/xf86-video-trident
-x11-drivers/xf86-video-tseng
-#x11-drivers/xf86-video-v4l
-x11-drivers/xf86-video-vesa
-x11-drivers/xf86-video-virtualbox
-x11-drivers/xf86-video-vmware
-x11-drivers/xf86-video-voodoo
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/xfce b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/xfce
deleted file mode 100644
index c56b62aeb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/xfce
+++ /dev/null
@@ -1,65 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-arch/xarchiver
-dev-util/catfish
-media-sound/pavucontrol
-media-sound/volumeicon
-x11-misc/light-locker
-x11-misc/sw-notify-send
-x11-terms/xfce4-terminal
-xfce-base/xfce4-meta
-xfce-extra/thunar-archive-plugin
-xfce-extra/thunar-media-tags-plugin
-xfce-extra/thunar-volman
-xfce-extra/tumbler
-xfce-extra/xfce4-battery-plugin
-xfce-extra/xfce4-cellmodem-plugin
-xfce-extra/xfce4-clipman-plugin
-xfce-extra/xfce4-cpufreq-plugin
-xfce-extra/xfce4-cpugraph-plugin
-xfce-extra/xfce4-datetime-plugin
-xfce-extra/xfce4-dict
-xfce-extra/xfce4-diskperf-plugin
-xfce-extra/xfce4-embed-plugin
-xfce-extra/xfce4-equake-plugin
-xfce-extra/xfce4-eyes-plugin
-xfce-extra/xfce4-fsguard-plugin
-xfce-extra/xfce4-genmon-plugin
-xfce-extra/xfce4-gvfs-mount
-xfce-extra/xfce4-hdaps
-xfce-extra/xfce4-kbdleds-plugin
-xfce-extra/xfce4-linelight-plugin
-xfce-extra/xfce4-mailwatch-plugin
-xfce-extra/xfce4-messenger-plugin
-xfce-extra/xfce4-mixer
-xfce-extra/xfce4-modemlights-plugin
-xfce-extra/xfce4-mount-plugin
-xfce-extra/xfce4-mpc-plugin
-xfce-extra/xfce4-netload-plugin
-xfce-extra/xfce4-netspeed-plugin
-xfce-extra/xfce4-notes-plugin
-xfce-extra/xfce4-notifyd
-xfce-extra/xfce4-places-plugin
-xfce-extra/xfce4-playercontrol-plugin
-xfce-extra/xfce4-power-manager
-xfce-extra/xfce4-pulseaudio-plugin
-xfce-extra/xfce4-quicklauncher-plugin
-xfce-extra/xfce4-screenshooter
-xfce-extra/xfce4-sensors-plugin
-xfce-extra/xfce4-smartbookmark-plugin
-xfce-extra/xfce4-soundmenu-plugin
-xfce-extra/xfce4-taskmanager
-xfce-extra/xfce4-time-out-plugin
-xfce-extra/xfce4-timer-plugin
-xfce-extra/xfce4-verve-plugin
-xfce-extra/xfce4-volumed
-xfce-extra/xfce4-volumed-pulse
-xfce-extra/xfce4-wavelan-plugin
-xfce-extra/xfce4-weather-plugin
-xfce-extra/xfce4-whiskermenu-plugin
-xfce-extra/xfce4-windowck-plugin
-xfce-extra/xfce4-wmdock-plugin
-xfce-extra/xfce4-xkb-plugin
-xfce-extra/xfdashboard
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/xorg b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/xorg
deleted file mode 100644
index a2a5b106f..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/grp/xorg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate name=world format=world
-
-#?in(os_linux_pkglist, desktop)!=#
-app-misc/xorg-meta
-x11-base/xorg-server
-x11-misc/lightdm
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/.calculate_directory b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/.calculate_directory
deleted file mode 100644
index 06d907590..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_update_world!=merge&&cl_update_world!=rebuild
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/02 b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/02
deleted file mode 100644
index 175b43dc3..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/02
+++ /dev/null
@@ -1,10 +0,0 @@
-# Calculate format=world name=world ini(overlay-calculate.world)<2
-
-#-ini(overlay-calculate.world,2)-#
-
-#?in(os_linux_pkglist, calculate)!=#
-!sys-apps/calculate-utilities:0
-!sys-apps/calculate-utilities:3
-sys-apps/calculate-utils:0
-sys-apps/calculate-utils:3
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/03 b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/03
deleted file mode 100644
index 51a81eafb..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/03
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-calculate.world)<3
-
-#-ini(overlay-calculate.world,3)-#
-
-#?in(os_linux_pkglist, calculate)!=&&pkg(sys-apps/systemd)==#
-sys-fs/eudev
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/05 b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/05
deleted file mode 100644
index 03bdca63a..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/05
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-calculate.world)<5
-
-#-ini(overlay-calculate.world,5)-#
-
-#?in(os_linux_pkglist, calculate)!=#
-!sys-boot/calcboot
-media-gfx/gfxboot-themes-calculate
-#in#
diff --git a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/06 b/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/06
deleted file mode 100644
index d5432ae89..000000000
--- a/profiles/templates/deprecated/3.4/6_ac_update_sync/world/update/06
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-calculate.world)<6
-
-#-ini(overlay-calculate.world,6)-#
-
-#?in(os_linux_pkglist, calculate)!=#
-!sys-apps/calculate-utils:0
-#in#
diff --git a/profiles/templates/deprecated/3.4/9_ac_install_merge/.calculate_directory b/profiles/templates/deprecated/3.4/9_ac_install_merge/.calculate_directory
deleted file mode 100644
index 6aa20846c..000000000
--- a/profiles/templates/deprecated/3.4/9_ac_install_merge/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip env=install ac_install_merge==on
diff --git a/profiles/templates/deprecated/3.4/9_ac_install_merge/README-eng.txt b/profiles/templates/deprecated/3.4/9_ac_install_merge/README-eng.txt
deleted file mode 100644
index 92d938fcb..000000000
--- a/profiles/templates/deprecated/3.4/9_ac_install_merge/README-eng.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate append=skip
-
-The ac_install_merge event:
-- package installation
-- package removal
-- system setup*
-- system installation
-- Portages syncing
-
-*When cl-setup-system is run with the defaul '--live=off' option.
-
-Action: package configuration
-env: install
diff --git a/profiles/templates/deprecated/3.4/9_ac_install_merge/README-rus.txt b/profiles/templates/deprecated/3.4/9_ac_install_merge/README-rus.txt
deleted file mode 100644
index d1af3c74a..000000000
--- a/profiles/templates/deprecated/3.4/9_ac_install_merge/README-rus.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Calculate append=skip
-
-Событие ac_install_merge:
-- у�тановка пакета
-- удаление пакета
-- на�тройка �и�темы*
-- у�тановка �и�темы
-- обновление портежей
-
-*При выполнении команды cl-setup-system �о значением по умолчанию '--live=off'.
-
-Дей�твие: на�тройка пакета
-env: install
\ No newline at end of file
diff --git a/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/.calculate_directory
deleted file mode 100644
index 720d52e47..000000000
--- a/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
deleted file mode 100644
index 86c94d1d5..000000000
--- a/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate merge()!=&&pkg()!= path=/etc name=calculate
diff --git a/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/calculate-utils/ini.env b/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/calculate-utils/ini.env
deleted file mode 100644
index 730a598ca..000000000
--- a/profiles/templates/deprecated/3.4/9_ac_install_merge/sys-apps/calculate-utils/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[merge-calculate]
-utils = #-pkg(sys-apps/calculate-utils)-#
-desktop = #-pkg(sys-apps/calculate-utils[desktop])-#
-client = #-pkg(sys-apps/calculate-utils[client])-#
-qt4 = #-pkg(sys-apps/calculate-utils[qt4])-#
diff --git a/profiles/templates/deprecated/3.4/README-eng.txt b/profiles/templates/deprecated/3.4/README-eng.txt
deleted file mode 100644
index ba206af7a..000000000
--- a/profiles/templates/deprecated/3.4/README-eng.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-# Calculate append=skip
-
-Templates for new Calculate Utilities are stored in this directory.
-
-Calculate templates were specifically designed for setting up your system at
-any moment, should you be building your own system or simply tuning your
-desktop.
-
-Technically templates are files and directories. The properties of these files
-are defined in the first header line, while the properties of the directories
-are defined in the '.calculate_directory' file header, located inside the
-directory. The file you are reading now is a template too, but this one is not
-for configuration purposes and therefore will not be processed by utilities:
-the ' append=skip' header says the system to skip it. This line is placed at
-the beginning of the template file and must start with '# Calculate'.
-
-Here are some more useful header options:
-* env=<module> - pick the variables set from the specified module
-* merge=package[,package2, ...] - call the configuration event for the package
-
-The templates header may also contain conditionals with variables and
-functions. Variables consist of two words or more, underline-separated: the
-first part is the name, the second specifies the utility package it belongs
-to, the third specifies the action, the fourth, if applicable, is the type of
-value.
-
-For instance:
-
-os_install_lvm_set if LVM partitioning is to be used. 'set' in the variable's
-name means that the variable returns either 'on' or 'off'.
-
-To list all variables, run 'cl-core-variables-show'.
-
-Functions, unlike variables, have arguments. Here are some examples of
-frequently used functions:
-* pkg(category/package[:slot]) returns the version of an installed package.
-* merge([package]) returns '1' or '' depending on whether the package must be
-configured. If the argument is missing, the package name will be fetched from
-the name of the template. If the entire system is being set up, this function
-will always return 1 anyway. Keep in mind that the merge() function is not a
-header option (see above).
-
-As for now, several versions of templates - the same as the Calculate
-Utilities' ones, in fact - are supported: 2.0, 2.2, 3.0 and 3.1. Templates
-v2.0 are for server configuration and stored within packages. Templates v2.2
-are deprecated and only used for building a system. Templates v3.0 have been
-used by the new Calculate installer since CL12. Templates v3.1 are now the
-current version and will be supported in all utilities packages someday soon.
-
-Whenever you create your own templates based on those, yours will have the
-priority over the default ones. Standard paths for storing user-defined
-templates are /var/calculate/templates and
-/var/calculate/remote/templates. Note that there are also clt template files,
-stored directly in /etc.
-
-Please visit this page for more details:
-http://www.calculate-linux.org/main/en/calculate_utilities_templates
-
-We hope you enjoy using Calculate Linux!
-
diff --git a/profiles/templates/deprecated/3.4/README-rus.txt b/profiles/templates/deprecated/3.4/README-rus.txt
deleted file mode 100644
index 48341b7fd..000000000
--- a/profiles/templates/deprecated/3.4/README-rus.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-# Calculate append=skip
-
-В �той директории наход�т�� шаблоны дл� новых утилит Calculate, разработанных
-дл� ди�трибутивов Calculate Linux.
-
-Шаблоны - универ�альное �ред�тво на�тройки �и�темы и и�пользуют�� на в�ех
-�тапах, начина� от �борки ди�трибутива и заканчива� на�тройкой рабочего �тола
-пользовател�.
-
-Шаблоны пред�тавл�ют �обой файлы и директории. Свой�тва файлов опи�ывают��
-параметрами в первой �троке заголовка, �вой�тва директорий опи�ывают�� в
-заголовке �лужебного файла '.calculate_directory', размещённого внутри
-директории. Файл, который вы читаете - тоже шаблон, но он не и�пользует�� дл�
-на�тройки �и�темы, т.к. в заголовке �воём �одержит параметр 'append' �о
-значением 'skip', указывающий утилитам пропу�кать его. Служебна� �трока
-заголовка размещает�� в начале файла и начинает�� �о �лова '# Calculate'.
-
-Другие ча�то в�тречаемые параметры заголовка:
-* env=<модуль> - и�пользование набора переменных указанного модул�
-* merge=пакет[,пакет2, ...] - вызов �обыти� на�тройки пакета
-
-Помимо параметров, заголовок шаблона может включать у�ловные выражени�. В
-выражени�х могут уча�твовать переменные и функции утилит. Переменные �о�то�т
-из двух и более �лов, разделённых �имволом подчеркивани�. Первое �лово
-обозначает назначение переменной, второе, как правило указывает на пакет
-утилит, третье на дей�твие, по�леднее �лово может указывать на тип значени�.
-Пример:
-
-os_install_lvm_set - �и�тема и�пользует LVM разделы. Зде�ь 'set' в имени
-переменной указывает на то, что переменна� возвращает значение 'on' или
-'off'.
-
-Спи�ок переменных можно по�мотреть при помощи утилиты
-'cl-core-variables-show'.
-
-В отличие от переменных, функции имеют аргументы. Пример ча�то в�тречаемых
-функций:
-* pkg(категори�/пакет[:�лот]) - функци� возвращает вер�ию у�тановленного
-пакета.
-* merge([пакет]) - функци� возвращает '1' или '' в зави�имо�ти от
-необходимо�ти на�тройки пакета. Е�ли аргумент у функции пропущен, им� пакета
-берёт�� из имени шаблона. В �лучае выполнени� на�тройки в�ей �и�темы, функци�
-в�егда будет будет возвращать положительный результат. �е путайте функцию
-merge() � параметром заголовка, �м. выше.
-
-В на�то�щее врем� и�пользуют�� не�колько вер�ий шаблонов, �овпадающих по
-нумерации � вер�и�ми утилит Calculate: 2.0, 2.2, 3.0 и 3.1. Шаблоны 2.0
-и�пользуют�� дл� на�тройки �ервера и хран�т�� в пакетах утилит. Шаблоны 2.2
-в на�то�щее врем� и�пользуют�� только при �борке �и�темы. Шаблоны 3.0
-и�пользует у�тановщик Calculate Linux 12. Шаблоны 3.1 на данный момент
-�вл�ют�� текущей актуальной вер�ией, поддержка которых �о временем должна
-по�вить�� во пакетах утилит.
-
-Вы можете и�пользовать �вои шаблоны по образу и подобию �тих. Ваши шаблоны
-будут иметь преоритетное значение. Стандартные пути дл� хранени�
-пользователь�ких шаблонов: /var/calculate/templates и
-/var/calculate/remote/templates. Суще�твуют также clt-файлы шаблонов,
-ра�полагаемые непо�ред�твенно в директории /etc.
-
-Подробнее можно почитать зде�ь:
-http://www.calculate-linux.ru/main/ru/calculate_utilities_templates
-
-У�пешной работы!
diff --git a/profiles/templates/3.5/.calculate_directory b/profiles/templates/deprecated/3.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/.calculate_directory
rename to profiles/templates/deprecated/3.5/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_unmerge/x11-drivers/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/.calculate_directory
diff --git a/profiles/templates/3.5/9_ac_install_merge/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/9_ac_install_merge/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.crt
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.key
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/server.pem
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.crt
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.key
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/server.pem
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/mail-mta/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.crt
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.key
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/server.pem
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-im/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy_wifi b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy_wifi
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy_wifi
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/networkmanager/copy_wifi
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-down.sh
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/ip-up.sh
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/manager-settings.conf
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wired-settings.conf
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-misc/wicd/wireless-settings.conf
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-mail/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/net-wireless/wpa_supplicant/wpa_supplicant.conf
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/id_rsa.pub
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/calculate-utils/ini.env
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/conf.d/net
diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/net-wireless/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/mdadm/mdadm.conf
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules b/profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/1-migrate/sys-fs/udev/70-persistent-net.rules
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/calculate.env b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/calculate.env
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/calculate.env
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/linux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/00-calculate-install/lxc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/1-migrate/sys-fs/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/baselayout/fstab b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/fstab
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/baselayout/motd b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/motd
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/baselayout/motd
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/baselayout/motd
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_install_flash/calculate-utils/linux/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/6_ac_install_flash/calculate-utils/linux/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/net
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh b/profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/2-system/sys-boot/os-prober/common.sh
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/README-eng.txt b/profiles/templates/deprecated/3.5/1_ac_install_disk/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/README-eng.txt
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/README-rus.txt b/profiles/templates/deprecated/3.5/1_ac_install_disk/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/README-rus.txt
rename to profiles/templates/deprecated/3.5/1_ac_install_disk/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/breeze b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/breeze
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/breeze
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/breeze
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/breeze-icons b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/breeze-icons
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/breeze-icons
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/breeze-icons
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-icon-theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-icon-theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-icon-theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-icon-theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-server b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-server
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-server
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-server
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-utils b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-utils
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-utils
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-utils
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-wallpapers b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-wallpapers
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/calculate-wallpapers
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/calculate-wallpapers
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/catfish b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/catfish
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/catfish
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/catfish
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/cinnamon-session b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/cinnamon-session
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/cinnamon-session
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/cinnamon-session
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/colorschemes b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/colorschemes
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/colorschemes
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/colorschemes
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/consolekit b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/consolekit
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/consolekit
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/consolekit
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/dm-themes-calculate b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/dm-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/dm-themes-calculate
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/dm-themes-calculate
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/droid b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/droid
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/droid
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/droid
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/ecryptfs-utils b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/ecryptfs-utils
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/ecryptfs-utils
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/ecryptfs-utils
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/elementary-icon-theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/elementary-icon-theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/elementary-icon-theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/elementary-icon-theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/elogind b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/elogind
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/elogind
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/elogind
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/gnome-icon-theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/gnome-icon-theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/gnome-icon-theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/gnome-icon-theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/gnome-session b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/gnome-session
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/gnome-session
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/gnome-session
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/greybird b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/greybird
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/greybird
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/greybird
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/grub b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/grub
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/grub
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/grub
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/grub-splashes-calculate b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/grub-splashes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/grub-splashes-calculate
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/grub-splashes-calculate
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/gwenview b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/gwenview
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/gwenview
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/gwenview
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/hardinfo b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/hardinfo
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/hardinfo
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/hardinfo
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/iputils b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/iputils
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/iputils
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/iputils
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/kodi b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/kodi
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/kodi
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/kodi
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/ksmserver b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/ksmserver
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/ksmserver
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/ksmserver
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lightdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lightdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lightdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lightdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lightdm-gtk-greeter b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lightdm-gtk-greeter
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lightdm-gtk-greeter
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lightdm-gtk-greeter
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lightdm-themes-calculate b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lightdm-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lightdm-themes-calculate
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lightdm-themes-calculate
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lxdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lxdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lxdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lxdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lxdm-themes-calculate b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lxdm-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lxdm-themes-calculate
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lxdm-themes-calculate
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lxqt-session b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lxqt-session
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/lxqt-session
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/lxqt-session
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/mate-icon-theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/mate-icon-theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/mate-icon-theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/mate-icon-theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/mate-screensaver b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/mate-screensaver
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/mate-screensaver
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/mate-screensaver
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/mate-session-manager b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/mate-session-manager
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/mate-session-manager
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/mate-session-manager
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/modem-manager-gui b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/modem-manager-gui
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/modem-manager-gui
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/modem-manager-gui
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/nemo b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/nemo
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/nemo
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/nemo
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/nss_ldap b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/nss_ldap
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/nss_ldap
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/nss_ldap
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/openbox b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/openbox
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/openbox
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/openbox
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/openldap b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/openldap
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/openldap
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/openldap
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/oxygen-icons b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/oxygen-icons
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/oxygen-icons
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/oxygen-icons
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/pam_client b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/pam_client
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/pam_client
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/pam_client
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/pam_keystore b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/pam_keystore
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/pam_keystore
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/pam_keystore
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/pam_update b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/pam_update
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/pam_update
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/pam_update
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/plasma b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/plasma
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/plasma
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/plasma
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/plasma-workspace b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/plasma-workspace
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/plasma-workspace
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/plasma-workspace
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/qpdfview b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/qpdfview
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/qpdfview
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/qpdfview
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/qt5ct b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/qt5ct
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/qt5ct
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/qt5ct
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/rpcbind b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/rpcbind
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/rpcbind
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/rpcbind
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/sddm b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/sddm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/sddm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/sddm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/slim b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/slim
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/slim
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/slim
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/smplayer b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/smplayer
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/smplayer
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/smplayer
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/splash-themes-calculate b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/splash-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/splash-themes-calculate
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/splash-themes-calculate
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/splashutils b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/splashutils
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/splashutils
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/splashutils
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/systemd b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/systemd
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/systemd
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/systemd
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/terminus-font b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/terminus-font
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/terminus-font
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/terminus-font
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/xbmc b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/xbmc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/xbmc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/xbmc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/xfce4-session b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/xfce4-session
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/xfce4-session
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/xfce4-session
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Depends/xorg-server b/profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/xorg-server
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Depends/xorg-server
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Depends/xorg-server
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/README-eng.txt b/profiles/templates/deprecated/3.5/2_ac_install_merge/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/README-eng.txt
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/README-rus.txt b/profiles/templates/deprecated/3.5/2_ac_install_merge/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/README-rus.txt
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/client-3.3.0_alpha2 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/client-3.3.0_alpha2
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/client-3.3.0_alpha2
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/client-3.3.0_alpha2
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/desktop-3.3.0_alpha2
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.0_alpha1 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha1
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.0_alpha2 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha2
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.0_alpha3 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.0_alpha3
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.2.5 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.2.5
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.3.2.5
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.3.2.5
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.4.6.15 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.4.6.15
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.4.6.15
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.4.6.15
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.4.6.19 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.4.6.19
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.4.6.19
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.4.6.19
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.4.6.6 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.4.6.6
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.4.6.6
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.4.6.6
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha25 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha25
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha38 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha38
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha38-1
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha39 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha39
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha39-1
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha43/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-1
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-2
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-3
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4 b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_alpha44-4
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/Remerge/utils-3.5.0_beta2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-gnome.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo-hicolor.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/hardinfo/hardinfo.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/sudo/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/sudo/default b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/sudo/default
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/sudo/default
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/sudo/default
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/syslog-ng/boot/syslog-ng
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/system-config-printer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/webapp-config/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/webapp-config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/webapp-config/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/webapp-config/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/webapp-config/webapp-config b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/webapp-config/webapp-config
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/webapp-config/webapp-config
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-admin/webapp-config/webapp-config
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/Remerge/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/rsnapshot.d/rsnapshot.filter
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/run-rsnapshot.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-backup/rsnapshot/snapshots/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-cdr/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-admin/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-cdr/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-cdr/cdrtools/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-backup/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru.aff b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.aff
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru.dic b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru.dic
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.aff
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-dicts/myspell-ru/ru_RU.dic
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-cdr/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-cdr/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/vim/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/vim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/vim/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/vim/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/vim/99editor b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/vim/99editor
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/vim/99editor
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/vim/99editor
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/vim/vimrc.local b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/vim/vimrc.local
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/vim/vimrc.local
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-editors/vim/vimrc.local
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-dicts/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxc/lxc.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxc/lxc.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxc/lxc.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxc/lxc.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxc/lxc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxd/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxd/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxd/init.d/lxd b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxd/init.d/lxd
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/lxd/init.d/lxd
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/lxd/init.d/lxd
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-emulation/virtualbox-modules/loadmodules.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-editors/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/screen/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/screen/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/screen/screenrc b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/screen/screenrc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/screen/screenrc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/screen/screenrc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/tmux/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/tmux/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/tmux/tmux.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/tmux/tmux.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-emulation/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-office/libreoffice/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-office/libreoffice/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/libreoffice/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-office/libreoffice/draw.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/libreoffice/draw.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-office/libreoffice/draw.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/libreoffice/draw.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-office/libreoffice/math.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/libreoffice/math.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-office/libreoffice/math.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/libreoffice/math.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-office/scribus/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/scribus/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-office/scribus/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/scribus/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-office/scribus/scribus.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/scribus/scribus.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-office/scribus/scribus.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-office/scribus/scribus.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/50-calculate b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/50-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/50-calculate
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/50-calculate
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/eix-sync.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/eix-sync.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/eix-sync.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/eix-sync.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/eixrc b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/eixrc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/eixrc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/eixrc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/eixrc.backup.0000 b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/eix/eixrc.backup.0000
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/layman/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/layman/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/layman/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/layman/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/layman/layman.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/layman/layman.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/layman/layman.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/layman/layman.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/mainwindow.py.32 b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.32
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/mainwindow.py.32
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.32
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/mainwindow.py.64 b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.64
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/mainwindow.py.64
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/mainwindow.py.64
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/preferences.py.32 b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.32
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/preferences.py.32
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.32
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/preferences.py.64 b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.64
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/porthole/preferences.py.64
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-portage/porthole/preferences.py.64
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-office/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-office/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/evince/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/evince/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/evince/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/evince/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/evince/evince.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/evince/evince.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/evince/evince.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/evince/evince.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/mupdf/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/mupdf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/mupdf/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/mupdf/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/mupdf/mupdf.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/mupdf/mupdf.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/mupdf/mupdf.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/mupdf/mupdf.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/qpdfview.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/qpdfview.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/update-desktop-database b/profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/update-desktop-database
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/qpdfview/update-desktop-database
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/app-text/qpdfview/update-desktop-database
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/dev-python/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-shells/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/dev-python/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/dev-python/pexpect/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/dev-python/pexpect/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/dev-python/pexpect/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/dev-python/pexpect/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing b/profiles/templates/deprecated/3.5/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/app-text/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/app-text/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gconf/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gconf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gconf/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gconf/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-pkcs11.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-secrets.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gnome-keyring/gnome-keyring-ssh.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gvfs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gvfs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gvfs/network.mount b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gvfs/network.mount
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/gvfs/network.mount
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/gvfs/network.mount
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/nautilus/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/nautilus/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus-autostart.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-base/nautilus/nautilus.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/dev-python/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/dev-python/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-extra/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-extra/cinnamon/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/gnome-extra/cinnamon/cinnamon-onscreen-keyboard.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde-l10n/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde-l10n/fix b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde-l10n/fix
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde-l10n/fix
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde-l10n/fix
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde4-l10n/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1 b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-15.12.3-r1
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1 b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kde4-l10n/fix-4.14.3-r1
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kdepim-l10n/fix b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/fix
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/kdepim-l10n/fix
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/kdepim-l10n/fix
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/konsole/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/konsole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/konsole/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/konsole/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-apps/konsole/Calculate.colorscheme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/gnome-extra/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/gnome-extra/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/colors
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/dialogs
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/icons
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/metadata.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/opaque
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdebase-desktoptheme/Calculate/widgets
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdelibs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdelibs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdelibs/kdeglobals b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdelibs/kdeglobals
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdelibs/kdeglobals
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdelibs/kdeglobals
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/kdeplasma-addons/Calculate/lancelot
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/konqueror/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/konqueror/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/konqueror/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/konqueror/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/konqueror/Home.desktop.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/marble/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/marble/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/marble/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/marble/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/marble/marble-touch.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/marble/marble-touch.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/marble/marble-touch.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-base/marble/marble-touch.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze-dark/places/16/start-here-kde.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/remove-start-here/breeze/places/16/start-here-kde.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-dark.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small-dark.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde-small.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/breeze-icons/start-here-kde.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here-kde.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/128x128/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here-kde.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here-kde.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here-kde.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/256x256/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here-kde.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here-kde.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here-kde.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/remove-start-here/64x64/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here-kde.svg.old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/oxygen-icons/start-here.svg.old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-frameworks/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/breeze/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/breeze/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/breeze/Breeze.colors b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/breeze/Breeze.colors
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/breeze/menu-line-h.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kinfocenter/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kinfocenter/kcm-about-distrorc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/ksshaskpass/org.kde.ksshaskpass.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kwin/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kwin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/kwin/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kwin/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/kde-plasma/kwin/cubecap.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kwin/cubecap.png
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/kde-plasma/kwin/cubecap.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/kwin/cubecap.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/systemsettings/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/systemsettings/CategoriesPage.qml
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml b/profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/kde-plasma/systemsettings/SubCategoryPage.qml
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-misc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/90lxdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/90lxdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/pam-lxdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/lxdm/pam-lxdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/kde-plasma/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-about/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-about/lxqt-about.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-hibernate.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-leave.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-lockscreen.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-logout.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-reboot.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-shutdown.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/lxqt-base/lxqt-session/applications/lxqt-suspend.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxde-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/claws-mail/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/claws-mail/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/claws-mail/claws-mail.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/trojita/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/trojita/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/trojita/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/trojita/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/trojita/trojita.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/trojita/trojita.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/trojita/trojita.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/mail-client/trojita/trojita.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/lxqt-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/terminus-font/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/terminus-font/change-unifont b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/terminus-font/change-unifont
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/terminus-font/change-unifont
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-fonts/terminus-font/change-unifont
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/mail-client/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/feh/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/feh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/feh/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/feh/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/feh/feh.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/feh/feh.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/feh/feh.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/feh/feh.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/fontforge/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/fontforge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/back.jpg.old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gimp/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gimp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gimp/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gimp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gimp/99gimp b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gimp/99gimp
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/gimp/99gimp
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/gimp/99gimp
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/lximage-qt/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt-screenshot.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/lximage-qt/lximage-qt.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/defaults
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/plasma-themes-calculate/windowswitcher/WindowSwitcher.qml
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/14/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/15/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/17/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splash-themes-calculate/calculate/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/conf.d/splash b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7 b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/init.d/fbcondecor-1.5.4.4-r7
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate.remove/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.silent
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/0-images.verbose
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown.remove/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/0-images.shutdown
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x576.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x600.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1024x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1200x800.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x1024.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x720.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1280x800.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1360x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1366x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1368x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1400x1050.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1440x900.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x1200.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x768.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1600x900.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x1050.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1680x945.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1080.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/1920x1200.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2048x1152.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1440.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/2560x1600.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/640x480.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x480.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/800x600.cfg.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/DroidSans.ttf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/template.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-fonts/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/libsdl/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/libsdl/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/libsdl/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/libsdl/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/libsdl/99sdl b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/libsdl/99sdl
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/libsdl/99sdl
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/libsdl/99sdl
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/openimageio/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/openimageio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/openimageio/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/openimageio/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-libs/openimageio/OpenImageIO/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-gfx/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/changemixer b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/changemixer
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/changemixer
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/changemixer
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/default/alsasound b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/alsa-utils/default/alsasound
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/pulseaudio/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/pulseaudio/daemon.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-sound/pulseaudio/daemon.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-libs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/kodi/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/kodi/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/kodi/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/kodi/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/kodi/xbmc.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/kodi/xbmc.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/kodi/xbmc.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/kodi/xbmc.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/50-restart-xbmc.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/metadata.albums.allmusic.com/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/metadata.artists.allmusic.com/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/metadata.yahoomusic.com/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-tv/xbmc/service.xbmc.versioncheck/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-sound/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/gtk-recordmydesktop/gtk-recordmydesktop.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/mplayer/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/mplayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/mplayer/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/mplayer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/mplayer/mplayer.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/mplayer/mplayer.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/mplayer/mplayer.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/mplayer/mplayer.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/qt-recordmydesktop/qt-recordmydesktop.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/smtube/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/smtube/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/smtube/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/smtube/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/smtube/smtube.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/smtube/smtube.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/smtube/smtube.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/media-video/smtube/smtube.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-tv/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/bind/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/bind/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/bind/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/bind/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/bind/init.d.named b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/bind/init.d.named
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/bind/init.d.named
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/bind/init.d.named
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/bind/named b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/bind/named
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/bind/named
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-dns/bind/named
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/media-video/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/media-video/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-fs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-fs/samba/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-fs/samba/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-fs/samba/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-fs/samba/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-fs/samba/smb.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-fs/samba/smb.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-fs/samba/smb.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-fs/samba/smb.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-dns/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-im/ejabberd/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-im/ejabberd/ejabberd b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/ejabberd/ejabberd
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-im/ejabberd/ejabberd
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/ejabberd/ejabberd
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-im/skype/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/skype/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-im/skype/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/skype/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-im/skype/99skype b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/skype/99skype
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-im/skype/99skype
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-im/skype/99skype
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-fs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-fs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/dhcp/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/dhcp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/dhcp/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/dhcp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/dhcp/dhclient.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/dhcp/dhclient.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/dhcp/dhclient.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/dhcp/dhclient.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-gnome.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui-hicolor.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modem-manager-gui/modem-manager-gui.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modemmanager/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modemmanager/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/modemmanager/fix_systemd_binding/org.freedesktop.ModemManager1.service
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/01_unpack_net.example
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/02_link_net.example b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/02_link_net.example
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/02_link_net.example
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/02_link_net.example
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/dhclient.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/dhclient.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/netifrc/dhclient.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/netifrc/dhclient.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/ssh/ssh_config b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/ssh/ssh_config
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/ssh/sshd_config b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-im/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-im/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/portmap/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/portmap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/portmap/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/portmap/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/portmap/default/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/portmap/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/portmap/default/portmap b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/portmap/default/portmap
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/portmap/default/portmap
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-nds/portmap/default/portmap
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-print/cups/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/cups/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-print/cups/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/cups/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-print/cups/default/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/cups/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-print/cups/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/cups/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-print/cups/default/cupsd b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/cups/default/cupsd
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-print/cups/default/cupsd
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/cups/default/cupsd
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-print/hplip/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/hplip/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-print/hplip/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/hplip/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-print/hplip/hplip-systray.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/hplip/hplip-systray.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-print/hplip/hplip-systray.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/hplip/hplip-systray.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-print/hplip/hplip.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/hplip/hplip.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-print/hplip/hplip.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-print/hplip/hplip.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-nds/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0 b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/init.d/net.wimax0
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/net-wireless/madwimax/rules.d/60_madwimax.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-print/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-print/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/filesystems b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/filesystems
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/filesystems
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/filesystems
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/gentoo-release b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/gentoo-release
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/gentoo-release
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/gentoo-release
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/issue b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/issue
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/issue
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/issue
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/os-release b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/os-release
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/os-release
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/os-release
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/sysctl.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/baselayout/sysctl.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/login.d/00init
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-desktop/logout.d/00init
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/calculate.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/conf.d/client
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/30-update-cache
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-fix-packages
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/40-skip-configure
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-patch-package
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-post-setup-package
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-distfiles
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-server-protect
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/50-setup-package
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6 b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/profile.bashrc.d/60-fix-libdb_6
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/calculate-utils/updateSymlinks
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/boot/dbus b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/boot/dbus
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/boot/dbus
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/boot/dbus
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/default/dbus.del b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/default/dbus.del
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/dbus/default/dbus.del
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/dbus/default/dbus.del
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/hdparm/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/hdparm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/hdparm/hdparm b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/hdparm/hdparm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/hdparm/hdparm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/hdparm/hdparm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/memtest86+/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/memtest86+/memtest.netbsd.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/boot.runlevels/consolefont
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/cache/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/.calculate_directory
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/hostname b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/hostname
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/netmount b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/swap b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/swap
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/conf.d/swap
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/conf.d/swap
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/consolefont b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/consolefont
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/consolefont
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/consolefont
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/init.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/init.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/init.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/init.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/killprocs b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/killprocs
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/killprocs
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/killprocs
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/modules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/modules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/modules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/modules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/modules-load.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/mtab b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/mtab
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/mtab
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/mtab
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/rc.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/rc.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/rc.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/rc.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/runlevels.mtab b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/openrc/runlevels.mtab
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/depgraph.py
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.14/main.py b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.14/main.py
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/alpha190/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/alpha190/01repos.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/alpha190/02gentoo.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/depgraph.py b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/depgraph.py
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/depgraph.py
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/depgraph.py
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/make.conf.base b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/make.conf.base
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/portage/make.conf.base
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/portage/make.conf.base
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sandbox/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sandbox/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sandbox/sandbox.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/login.defs b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/login.defs
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/login.defs
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/login.defs
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/subgid b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/subgid
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/subgid
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/subgid
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/subuid b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/subuid
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/shadow/subuid
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/shadow/subuid
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/sysvinit/inittab
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/net-wireless/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/boot/consolekit b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/boot/consolekit
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/consolekit b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/consolekit
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/consolekit
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/consolekit
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/dbus.system.d/ConsoleKit.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/consolekit/rules.d/40-consolekit.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/elogind/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/elogind/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/elogind/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/elogind/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/elogind/73-seat-late.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/su b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/su
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/su
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/su
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/system-auth b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/system-auth
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/system-auth
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/system-auth
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/system-login b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/system-login
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/pambase/system-login
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-auth/pambase/system-login
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/background/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/default.grub b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/default.grub
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/default.grub
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/default.grub
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/00_header b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/00_header
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/00_header
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/00_header
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/05_theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/05_theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/05_theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/05_theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/07_passwd.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/10_linux b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/10_linux
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/10_linux
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/10_linux
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-boot/grub/grub.d/30_os-prober
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-auth/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/binutils/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/binutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/binutils/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/binutils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/binutils/binutils_drop_old b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/binutils/binutils_drop_old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/binutils/binutils_drop_old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/binutils/binutils_drop_old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/gcc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/gcc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/gcc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/gcc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/gcc/gcc_default_set b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/gcc/gcc_default_set
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/gcc/gcc_default_set
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/gcc/gcc_default_set
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/prelink/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/prelink/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/prelink/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/prelink/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/50-firmware.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/50-firmware.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/50-firmware.rules.del
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/60-persistent-storage.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/75-persistent-net-generator.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/80-net-name-slot.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/80-net-setup-link.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/90-id-lxc-all.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/99-lxc-devfs.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/blacklist-calculate.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/lxc-udev-trigger
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/write_net_rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/write_net_rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/eudev/write_net_rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/eudev/write_net_rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/fuse/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/fuse/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/fuse/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/fuse/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/fuse/fuse b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/fuse/fuse
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/fuse/fuse
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/fuse/fuse
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/mtools/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/mtools/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/mtools/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/mtools/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/mtools/mtools.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/mtools/mtools.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/mtools/mtools.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/mtools/mtools.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/conf.d.udev
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/init.d/udev-trigger
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev-init-scripts/sysinit/udev
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/75-cd-aliases-generator.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/80-net-name-slot.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/80-net-setup-link.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/90-id-lxc-all.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/99-lxc-devfs.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/blacklist-calculate.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udev/lxc-udev-trigger
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/actions/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/actions/org.freedesktop.udisks.policy
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-fs/udisks/mount-usb.pkla
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-devel/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/Module.symvers
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10i18n/module-setup.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/select-video.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/10video/system-video-blacklist.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan-rootok.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/iso-scan.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-fallback.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/live-scan.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/mount-squashfs.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/nfsroot.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-live-root.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/80calculate/scratch-mount-root.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95nfs/module-setup.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/module-setup.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-lvmfix.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-prepare.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/95tuxonice/tuxonice-resumecheck.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut-lib.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/20-gentoo.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-kernel/dracut/dracut.conf.d/gentoo.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-fs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/conf.d.nscd b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/conf.d.nscd
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/locale.gen b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/locale.gen
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/locale.gen
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/locale.gen
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nscd-cache.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nscd-refresh b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nscd-refresh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nscd-refresh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nscd-refresh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nscd.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nscd.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nscd.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nscd.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nsswitch.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/glibc/nsswitch.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/gpm/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/gpm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/gpm/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/gpm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/gpm/gpm b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/gpm/gpm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/gpm/gpm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/gpm/gpm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/pam/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/pam/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/pam/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/pam/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/pam/CDS.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/pam/CDS.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-kernel/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/cronie/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/cronie/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/cronie/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/cronie/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/cronie/default/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/cronie/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/cronie/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/cronie/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/cronie/default/cronie b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/cronie/default/cronie
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/cronie/default/cronie
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/cronie/default/cronie
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/htop/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/htop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/htop/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/htop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/htop/htop.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/htop/htop.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/htop/htop.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/htop/htop.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/vixie-cron/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/vixie-cron/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron b/profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/sys-process/vixie-cron/default/vixie-cron
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-libs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/env.d/90xsession b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xmessage/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xmessage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xmessage/Xmessage b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xmessage/Xmessage
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/xmessage/Xmessage
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-apps/xmessage/Xmessage
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/sys-process/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/X11/xorg.conf.d/touchpad.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/boot/xdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/boot/xdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/default/xdm.del b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/init.d/xdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/init.d/xdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm.remove/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/metadata.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash.remove/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/metadata.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux.remove/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/metadata.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.start
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/gtk+/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/gtk+/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/gtk+/gtkrc b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/gtk+/gtkrc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/gtk+/gtkrc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/gtk+/gtkrc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/99libX11 b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/99libX11
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/99libX11
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/99libX11
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/Compose b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/Compose
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/Compose
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/Compose
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/libX11/Compose.remove_empty_strings
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/pango/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/pango/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/pango/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/pango/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/pango/pango.modules b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/pango/pango.modules
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/pango/pango.modules
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/pango/pango.modules
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/qtermwidget/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/qtermwidget/Calculate.colorscheme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/wxGTK/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/wxGTK/select-default b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/wxGTK/select-default
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/wxGTK/select-default
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-libs/wxGTK/select-default
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-drivers/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/99lightdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/99lightdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/99lightdm.remove
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/lightdm b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/lightdm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/lightdm.conf b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/lightdm/lightdm.conf
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/lightdm/lightdm.conf
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/qt5ct/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/qt5ct/qt5ct.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/group b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/group
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/group
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/group
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogin
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xlogout
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/Xstop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xstop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/scripts/Xstop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/scripts/Xstop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/sddm b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/sddm
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/sddm
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/sddm
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/sddm-0.15 b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/sddm-0.15
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/sddm-0.15
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/sddm-0.15
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/sddm-greeter b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/sddm-greeter
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/sddm/sddm-greeter
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/sddm/sddm-greeter
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86 b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-misc/xkeyboard-config/xfree86
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-terms/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-libs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-terms/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-terms/qterminal/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-terms/qterminal/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-terms/qterminal/qterminal_drop.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/24x24/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/20-index.theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/40-update-icons-cache
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/50-breeze-faces
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/51-oxygen-faces
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/52-gnome-faces
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/calculate-icon-theme/avatar-default.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/22/start-here.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/remove-start-here/24/start-here.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start-here.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/elementary-icon-theme/start.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/24x24/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-icon-theme/start-here.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/combo-entry-border-bg-solid.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/entry-border-bg-solid.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/Others/white_bg.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-2.0/gtkrc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0 b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/apps/lightdm-gtk-greeter.css
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk-dark.css
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/gtk-3.0/gtk.css
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/index-highcontrast.theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/gnome-themes-standard/metacity-theme-3.xml
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/greybird/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/greybird/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/greybird/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/greybird/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/greybird/apps/lightdm-gtk-greeter.css
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/greybird/gtk.css b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/greybird/gtk.css
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/greybird/gtk.css
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/greybird/gtk.css
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/hicolor-icon-theme/update-icons-cache
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/index-contrasthigh.theme
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/16x16/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/22x22/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/24x24/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/32x32/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/48x48/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/16x16/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/22x22/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/24x24/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/32x32/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/remove-start-here/menta/48x48/places/start-here.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-calculate.svg.old
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-fog.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here-menta.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/x11-themes/mate-icon-theme/start-here.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-terms/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-terms/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-file-manager.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-mail-reader.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-terminal-emulator.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/applications/exo-web-browser.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/helpers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/exo/helpers/chromium-chromium.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/libxfce4ui/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/thunar/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/thunar/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/thunar/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/thunar/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/thunar/uca.xml b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/thunar/uca.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/thunar/uca.xml
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/thunar/uca.xml
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-session/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-session/xfce.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-session/xflock4 b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-session/xflock4
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfce4-session/xflock4
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfce4-session/xflock4
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfdesktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfdesktop/kioskrc b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfdesktop/kioskrc
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/x11-themes/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-extra/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/xfce-extra/xfce4-xkb-plugin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/firefox-10.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/10-firefox/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/chromium-11.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/20-chromium/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/install/qupzilla.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/30-qupzilla/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/install/opera-12.11.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/40-opera/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/epiphany.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/50-epiphany/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/install/qutebrowser-0.8.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/60-qutebrowser/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/100-Browser/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/xfce-extra/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/xfce-extra/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail-16.12.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/org.kde.kmail2-17.08.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/evolution-2.32.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/20-evolution/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/claws-mail-3.7.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/30-claws-mail/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/install/trojita-0.7.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/40-trojita/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/100-Browser/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.4.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/konversation-1.6.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/10-konversation/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/kvirc-4.99.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/30-kvirc/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/install/org.gnome.Polari-3.18.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/40-polari/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/120-Chat/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/110-Mail/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/kopete-4.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/10-kopete/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/install/org.kde.ktpcontactlist-16.12.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/11-kde-telepathy/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/install/pidgin-2.10.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/20-pidgin/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/install/qutim-0.3.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/30-qutim/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/gajim-0.16.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/40-gajim/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/130-IM/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/120-Chat/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/install/writer-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/10-libreoffice/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/install/writer-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/15-libreoffice-bin/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/200-Writer/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/130-IM/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/calc-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/10-libreoffice/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64 b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/calc-3.6.3.desktop.amd64
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/15-libreoffice-bin/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/210-Calc/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/200-Writer/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/kcalc-4.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/install/org.kde.kcalc-15.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/10-kcalc/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mate-calc-1.8.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/20-mate-calc/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/galculator-1.3.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/30-galculator/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/install/speedcrunch.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/40-speedcrunch/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/gnome-calculator.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/50-gnome-calculator/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/220-Calculator/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/210-Calc/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/gimp-2.8.2.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/10-gimp/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/krita-3.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/20-krita/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/300-ImageEdit/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/220-Calculator/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/digikam-2.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/10-digikam/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/install/shotwell-0.13.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/20-shotwell/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/310-PhotoManager/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/300-ImageEdit/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/gwenview-4.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/install/org.kde.gwenview-15.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/10-gwenview/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/eom-1.8.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/20-eom/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/eog-2.30.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/30-eog/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/install/nomacs-1.6.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/40-nomacs/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/geeqie-1.0.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/50-geeqie/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/lximage-qt.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/60-lximage-qt/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/install/mirage-0.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/70-mirage/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/320-ImageView/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/310-PhotoManager/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/amarok-2.5.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/10-amarok/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/clementine-1.2.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/20-clementine/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/audacious-2.5.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/30-audacious/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/40-rhythmbox/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/320-ImageView/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/org.gnome.Totem-3.18.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/install/totem-2.30.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/10-totem/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/gnome-mplayer-1.0.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/30-gnome-mplayer/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/400-AudioPlayer/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/k3b-2.0.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/10-k3b/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/brasero-2.30.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/20-brasero/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/install/xfburn-0.4.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/30-xfburn/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/600-ImageBurn/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-15.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/kwrite-4.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/10-kwrite/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-2.30.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/gedit-3.18.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/20-gedit/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/install/pluma-1.8.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/30-pluma/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/leafpad-0.8.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/40-leafpad/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/800-TextEdit/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/600-ImageBurn/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-15.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/konsole-4.9.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/10-konsole/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-2.30.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/gnome-terminal-3.20.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/20-gnome-terminal/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/terminal-0.4.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/install/xfce4-terminal.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/40-xfce4-terminal/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/800-TextEdit/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/install
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/10-qpdfview/uninstall
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/999-PDFReader/mimeapps.list
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update b/profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
rename to profiles/templates/deprecated/3.5/2_ac_install_merge/zzz-Desktop/MimeCache/mimecache-update
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/900-Terminal/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/2_ac_install_merge/zzz-Desktop/999-PDFReader/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/calculate b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/calculate
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/calculate
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/domain b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/domain
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/domain.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/domain.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/domain.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/livecd b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/livecd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/sudo/livecd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/sudo/livecd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/app-admin/syslog-ng/syslog-ng.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-base/gnome-keyring/prepare_gnome_keyring_caps
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/app-admin/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-applet.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/gnome-extra/nm-applet/nm-connection-editor.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default.desktop.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/gnome-extra/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/kdebase-startkde/startkde
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-base/khotkeys/media.khotkeys
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/networkmanagement/plasma-applet-networkmanagement.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-misc/plasma-nm/plasma-applet-networkmanagement.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxde-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxde-base/lxdm/lxdm.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-plasma/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/kde-plasma/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/arrow-right.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/left-arrow.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/calendar-popup/right-arrow.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd.qss
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-notificationd/cancel.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-panel.qss
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner.qss
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/close.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/lxqt-runner/down-arrow.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/mainmenu.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/preview.png
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-dots.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/spacer-plugin/spacer-line.svg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.cfg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/lxqt-base/lxqt-common/calculate/wallpaper.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxde-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxde-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.clr b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.clr
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.crt b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.crt
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.key b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.key
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.key
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.key
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.pem b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/mail-mta/postfix/server.pem
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/lxqt-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 11 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 12 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Green.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 13 Magenta.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux 14.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.livecd/Calculate Linux.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Green.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux 14.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/cinnamon/Calculate Linux.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Green
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.livecd/Calculate Linux 14
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Green
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate/Calculate Linux 14
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Green
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 14
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce.livecd/Calculate Linux 15
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 14
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 15
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/plasma-themes-calculate/background.jpg.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/conf.d/splash
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/restart_fbcondecor
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate/fb.cfg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-gfx/splashutils/splash-themes/calculate_shutdown/fb.cfg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/mail-mta/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pavucontrol/pavucontrol.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasconfig.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/qashctl.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/qastools/qasmixer.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/media-sound/volumeicon/volumeicon.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-gfx/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.clr b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.clr
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.crt b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.crt
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.key b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.key
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.key
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.key
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.pem b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-im/ejabberd/server.pem
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-irc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/media-sound/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-irc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-irc/hexchat/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-irc/hexchat/hexchat-2.9.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-im/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.clr b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.clr
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.crt b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.crt
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.key b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.key
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.key
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.key
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.pem b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-mail/dovecot/server.pem
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-irc/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-irc/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/minidlna.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/minidlna/server/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/NetworkManager.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/default/NetworkManager.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-down.sh
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/dispatcher.d/ip-up.sh
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-mail/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/runservice/restartNetworkManager
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth0
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth1
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth2
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/system-connections/Auto_eth3
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/ntp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/ntp/clocksync b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/ntp/clocksync
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/default/sshd b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/default/sshd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/init.d/sshd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/ssh_config b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/ssh_config
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/openssh/ssh_config
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/openssh/ssh_config
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/wget/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/wget/wgetrc b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/wget/wgetrc
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/wget/wgetrc
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-misc/wget/wgetrc
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/2-unix/slapd.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/5-samba/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/9-ldap/slapd.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/slapd b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/slapd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/openldap/slapd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-nds/openldap/slapd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-nds/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/bluez/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/bluez/bluetooth
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/bluez/main.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/net-wireless/bluez/main.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/net-wireless/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/hosts b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/hosts
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/localtime b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/localtime
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.en
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/motd.ru
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/timezone b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/baselayout/timezone
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/cron.d/calculate-update
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/default/client.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/0-example
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/1-example.system
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/3-example.profile
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/4-example.container
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hostname
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/hwclock
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/keymaps
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/local.start
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/conf.d/net
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/default.runlevels/numlock
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale
diff --git a/profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/1_ac_install_disk/2-system/sys-apps/openrc/conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/.calculate_directory
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth0.del
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth1.del
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth2.del
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/init.d/net.eth3.del
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/local.d/fixsystemtime.start
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/lxc-desktop.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/rc.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcLocale
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/openrc/runservice/restartOpenrcNetwork
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/portage/make.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/portage/make.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/portage/make.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/portage/make.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/boot/preload b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/boot/preload
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default.remove/preload
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default/preload b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/preload
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/default/preload
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/default/preload
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/preload b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/preload
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/preload/preload
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/preload/preload
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.client
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf.unix
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/pambase/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/pambase/su b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/pambase/su
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/pambase/su
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/pambase/su
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/pambase/system-auth b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/background/grub-calculate.png.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/35_calculate.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/livemenu/90_calculate.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/menu.lst b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/menu.lst
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
similarity index 100%
rename from profiles/templates/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/update-grub b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/update-grub
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-boot/grub/update-grub.old
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/prelink/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/eudev/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/eudev/70-persistent-net.rules.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/lvm2/lvm b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/lvm2/lvm
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/mdadm/mdadm
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-fs/udev-init-scripts/udev
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-kernel/dracut/dracut.conf.d/50-calculate.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/boot/nscd.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/cron.hourly/refresh-nscd.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/client/local.d/nscd-restart.start.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/org.freedesktop.upower.policy
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.d/keyboard.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/X11/xorg.conf.default
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/dm-background.png.remove
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/calculate.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 11 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 12 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Blue.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Brown.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Green.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 13 Magenta.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 14.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux 15.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/cinnamon/Calculate Linux.jpg
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Green
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 14
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/mate/Calculate Linux 15
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 11 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 12 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Blue
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Brown
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Green
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 13 Magenta
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 14
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15 b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-base/xorg-server/wallpapers/xfce/Calculate Linux 15
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/light-locker/light-locker.desktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/greeter.ui
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm-gtk-greeter/wallpapers/calculate-logo.png
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/dbus.system.d/org.freedesktop.DisplayManager.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/lightdm/lightdm.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/breeze/theme.conf.user
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/circles/theme.conf.user
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/elarun/theme.conf.user
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maldives/theme.conf.user
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-misc/sddm/themes/maui/theme.conf.user
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old b/profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old
rename to profiles/templates/deprecated/3.5/3_ac_install_live/1-merge/x11-themes/mate-backgrounds/Stripes.png.old
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/asustek/UX305CA/sys-boot/grub/default.grub
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/app-admin/sudo/lenovo
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/%gconf-tree.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/gnome-base/gconf/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/hibernate.khotkeys
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/kde-base/khotkeys/togglewifi.khotkeys
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/bin/wifi_toggle
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/init.d/laptopd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-apps/calculate-utils/runlevels/default/laptopd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/eudev/blacklist.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-fs/udev/blacklist.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/sys-kernel/calculate-sources/psmouse.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/lenovo/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/app-admin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/app-admin/sudo/samsung
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/%gconf-tree.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/gnome-base/gconf/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightdown.khotkeys
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/brightup.khotkeys
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglebacklight.khotkeys
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/kde-base/khotkeys/togglecpu.khotkeys
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/backlight
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_kde
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/bin/cpufreq_toggle_osd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/init.d/laptopd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/sys-apps/calculate-utils/runlevels/default/laptopd
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/x11-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/x11-base/xorg-server/samsung.conf
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/deprecated/3.5/3_ac_install_live/2-laptop/samsung/xfce-base/libxfcegui4/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/calculate-server b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/calculate-server
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/calculate-server
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/calculate-server
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/calculate-wallpapers b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/calculate-wallpapers
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/calculate-wallpapers
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/calculate-wallpapers
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/cinnamon-session b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/cinnamon-session
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/cinnamon-session
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/cinnamon-session
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/dhcp b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/dhcp
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/dhcp
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/dhcp
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/dm-themes-calculate b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/dm-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/dm-themes-calculate
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/dm-themes-calculate
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/dracut b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/dracut
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/dracut
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/dracut
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/droid b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/droid
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/droid
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/droid
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/gnome-backgrounds b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/gnome-backgrounds
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/gnome-backgrounds
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/gnome-backgrounds
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/greybird b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/greybird
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/greybird
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/greybird
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/grub-splashes-calculate b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/grub-splashes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/grub-splashes-calculate
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/grub-splashes-calculate
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/gtkplus b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/gtkplus
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/gtkplus
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/gtkplus
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/kdelibs b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/kdelibs
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/kdelibs
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/kdelibs
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/kmix b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/kmix
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/kmix
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/kmix
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/kodi b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/kodi
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/kodi
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/kodi
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/light-locker b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/light-locker
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/light-locker
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/light-locker
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/lightdm b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lightdm
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/lightdm
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lightdm
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/lightdm-themes-calculate b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lightdm-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/lightdm-themes-calculate
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lightdm-themes-calculate
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/lxdm b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lxdm
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/lxdm
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lxdm
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/lxqt-session b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lxqt-session
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/lxqt-session
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/lxqt-session
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/mate-session-manager b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/mate-session-manager
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/mate-session-manager
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/mate-session-manager
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/openrc b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/openrc
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/openrc
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/openrc
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/sddm b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/sddm
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/sddm
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/sddm
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/slim b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/slim
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/slim
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/slim
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/splash-themes-calculate b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/splash-themes-calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/splash-themes-calculate
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/splash-themes-calculate
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/util-linux b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/util-linux
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/util-linux
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/util-linux
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/xbmc b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/xbmc
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/xbmc
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/xbmc
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/xfce4-session b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/xfce4-session
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/xfce4-session
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/xfce4-session
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Depends/xfdesktop b/profiles/templates/deprecated/3.5/3_ac_install_live/Depends/xfdesktop
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Depends/xfdesktop
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Depends/xfdesktop
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/.calculate_directory b/profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/.calculate_directory
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/calculate-sources b/profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/calculate-sources
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/calculate-sources
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/calculate-sources
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/calculate-utils b/profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/calculate-utils
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/calculate-utils
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/calculate-utils
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/file b/profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/file
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/Postmerge/file
rename to profiles/templates/deprecated/3.5/3_ac_install_live/Postmerge/file
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/README-eng.txt b/profiles/templates/deprecated/3.5/3_ac_install_live/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/README-eng.txt
rename to profiles/templates/deprecated/3.5/3_ac_install_live/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/3_ac_install_live/README-rus.txt b/profiles/templates/deprecated/3.5/3_ac_install_live/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/3_ac_install_live/README-rus.txt
rename to profiles/templates/deprecated/3.5/3_ac_install_live/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/5_ac_client_configure/.calculate_directory b/profiles/templates/deprecated/3.5/5_ac_client_configure/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/5_ac_client_configure/.calculate_directory
rename to profiles/templates/deprecated/3.5/5_ac_client_configure/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/5_ac_client_configure/README-eng.txt b/profiles/templates/deprecated/3.5/5_ac_client_configure/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/5_ac_client_configure/README-eng.txt
rename to profiles/templates/deprecated/3.5/5_ac_client_configure/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/5_ac_client_configure/README-rus.txt b/profiles/templates/deprecated/3.5/5_ac_client_configure/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/5_ac_client_configure/README-rus.txt
rename to profiles/templates/deprecated/3.5/5_ac_client_configure/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/5_ac_client_configure/calculate.env b/profiles/templates/deprecated/3.5/5_ac_client_configure/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/5_ac_client_configure/calculate.env
rename to profiles/templates/deprecated/3.5/5_ac_client_configure/calculate.env
diff --git a/profiles/templates/3.6_alpha/5_ac_client_configure/nscd.start b/profiles/templates/deprecated/3.5/5_ac_client_configure/nscd.start
similarity index 100%
rename from profiles/templates/3.6_alpha/5_ac_client_configure/nscd.start
rename to profiles/templates/deprecated/3.5/5_ac_client_configure/nscd.start
diff --git a/profiles/templates/3.6_alpha/5_ac_client_configure/nscd.stop b/profiles/templates/deprecated/3.5/5_ac_client_configure/nscd.stop
similarity index 100%
rename from profiles/templates/3.6_alpha/5_ac_client_configure/nscd.stop
rename to profiles/templates/deprecated/3.5/5_ac_client_configure/nscd.stop
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_create/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/NetworkManager/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/NetworkManager/dispatcher.d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/NetworkManager/system-connections/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/calculate/calculate.env b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/calculate/calculate.env
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.env
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/calculate/calculate.ldap b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.ldap
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/calculate/calculate.ldap
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/calculate/calculate.ldap
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/conf.d/hostname b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/conf.d/hostname
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/conf.d/hostname
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/conf.d/modules b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/conf.d/modules
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/conf.d/modules
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/conf.d/modules
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/conf.d/net b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/conf.d/net
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/conf.d/net
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/conf.d/net
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/resolv.conf b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/resolv.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/resolv.conf
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/resolv.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/udev/rules.d/70-persistent-net.rules
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/etc/wpa_supplicant/wpa_supplicant.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/var.lib.calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/var.lib.calculate/calculate.env b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/var.lib.calculate/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/var.lib.calculate/calculate.env
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/var.lib.calculate/calculate.env
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_create/1-root/var.lib.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/var.lib.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_create/1-root/var.lib.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_backup_create/1-root/var.lib.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_restore/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_restore/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_restore/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_restore/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_backup_service/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_backup_service/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_backup_service/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_backup_service/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_container/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_builder_container/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_builder_container/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/lxd/metadata.yaml b/profiles/templates/deprecated/3.5/6_ac_builder_container/lxd/metadata.yaml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/lxd/metadata.yaml
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/lxd/metadata.yaml
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/lxd/templates/hostname.tpl b/profiles/templates/deprecated/3.5/6_ac_builder_container/lxd/templates/hostname.tpl
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/lxd/templates/hostname.tpl
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/lxd/templates/hostname.tpl
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/lxd/templates/hosts.tpl b/profiles/templates/deprecated/3.5/6_ac_builder_container/lxd/templates/hosts.tpl
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/lxd/templates/hosts.tpl
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/lxd/templates/hosts.tpl
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/meta/config b/profiles/templates/deprecated/3.5/6_ac_builder_container/meta/config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/meta/config
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/meta/config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/meta/config-user b/profiles/templates/deprecated/3.5/6_ac_builder_container/meta/config-user
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/meta/config-user
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/meta/config-user
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/meta/create-message b/profiles/templates/deprecated/3.5/6_ac_builder_container/meta/create-message
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/meta/create-message
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/meta/create-message
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/meta/excludes-user b/profiles/templates/deprecated/3.5/6_ac_builder_container/meta/excludes-user
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/meta/excludes-user
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/meta/excludes-user
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/meta/expiry b/profiles/templates/deprecated/3.5/6_ac_builder_container/meta/expiry
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/meta/expiry
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/meta/expiry
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_container/meta/templates b/profiles/templates/deprecated/3.5/6_ac_builder_container/meta/templates
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_container/meta/templates
rename to profiles/templates/deprecated/3.5/6_ac_builder_container/meta/templates
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/0-bootparam.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/0-bootparam.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/0-bootparam.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/0-bootparam.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/desktop.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/desktop.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/desktop.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/desktop.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/keymap.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/keymap.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/keymap.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/keymap.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/lang.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/lang.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/lang.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/lang.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/server.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/server.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/server.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/server.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/timezone.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/timezone.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/timezone.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/timezone.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/vga.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/vga.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/vga.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/vga.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/video.config b/profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/video.config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/0_bootmenu/video.config
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/0_bootmenu/video.config
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/16x16.fnt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/back.jpg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/be.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bg.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/bs.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/chain.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/cs.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/da.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/de.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/en.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/es.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/et.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fi.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/fr.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hr.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/hu.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/init
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/is.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/isolinux.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/it.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/kk.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/langlist
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ldlinux.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libcom32.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/libutil.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lt.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/lv.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/menu.cfg.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nn.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pl.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/pt_BR.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ro.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/ru.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sk.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sl.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sq.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sr.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/sv.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/uk.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/16x16.fnt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/back.jpg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/be.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bg.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bootlogo
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/bs.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/chain.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/cs.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/da.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/de.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/en.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/es.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/et.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fi.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/fr.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/gfxboot.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hr.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/hu.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/init
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/is.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/it.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/kk.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/langlist
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ldlinux.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libcom32.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/libutil.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lt.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/lv.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/menu.cfg.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_BE.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nl_NL.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/nn.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pl.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/pt_BR.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ro.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/ru.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sk.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sl.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sq.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sr.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/sv.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/syslinux.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/uk.tr
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/calculate-utils/livecd
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/isolinux/memtest
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-apps/memtest86+/syslinux/memtest
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/efi/bootx64.efi
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub-calculate.png
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/install_x86_64-efi
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/keymap_nogfx.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/lang_nogfx.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/timezone.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/uefi_isohibryd
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2 b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/unicode.pf2
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/vga.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/grub/video.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/isolinux/isolinux.bin
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-boot/syslinux/syslinux/isolinux.bin
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/initrd
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz b/profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/5_setup/sys-kernel/calculate-sources/vmlinuz
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/9_bootmenu/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_iso/9_bootmenu/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/9_bootmenu/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/9_bootmenu/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_builder_iso/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_iso/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_builder_iso/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_iso/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_iso/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/baselayout/localtime b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/baselayout/localtime
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/baselayout/localtime
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/baselayout/localtime
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/openrc/resolv.conf b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/portage/builder b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/portage/builder
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/portage/builder
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/portage/builder
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_prepare/sys-apps/portage/tmp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_builder_setup/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_builder_setup/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/app-portage/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_setup/app-portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/app-portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/app-portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/app-portage/gentoolkit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/etc-update.conf b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/etc-update.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/etc-update.conf
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/etc-update.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/0-base
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/make.conf/builder
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.keywords/custom
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.mask/custom
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.unmask/custom
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/package.use/custom
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/profile/package.provided
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/sets/custom b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/portage/sets/custom
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/world_sets b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/world_sets
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/portage/world_sets
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/portage/world_sets
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/shadow/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/shadow/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/shadow/login.defs b/profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_setup/sys-apps/shadow/login.defs
rename to profiles/templates/deprecated/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/0-boot.boot b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/0-boot.boot
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/0-boot.boot
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/0-boot.boot
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/0-usr.src.linux b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/0-usr.src.linux
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/0-usr.src.linux
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/0-usr.src.linux
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/boot/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/calculate.server/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/calculate.tmp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/distfiles/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/distfiles/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/elog/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/elog/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/elog/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/elog/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/etc/config-archive/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/etc/portage.make.conf.binhost
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/log.calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/log.clamav/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.bash_history b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.bash_history
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.bash_history
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.bash_history
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.lesshst b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.lesshst
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.lesshst
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.lesshst
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.ssh/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.subversion/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.viminfo b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.viminfo
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/root/.viminfo
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/root/.viminfo
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/tmp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/tmp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/tmp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/usr.src/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/usr.src/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/usr.src/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/usr.src/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.cache.edb.binhost/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.cache.revdep-rebuild/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var.lib.calculate.calculate-update/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/.locks b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/.locks
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/.locks
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/.locks
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/.svn-src b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/.svn-src
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/.svn-src
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/.svn-src
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/emerge-fetch.log
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/emerge.log b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/emerge.log
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/emerge.log
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/emerge.log
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/genkernel.log b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/genkernel.log
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/genkernel.log
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/genkernel.log
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/lastlog b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/lastlog
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/lastlog
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/lastlog
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/prelink.log b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/prelink.log
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/prelink.log
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/prelink.log
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/wtmp b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/wtmp
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/log/wtmp
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/log/wtmp
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/var/tmp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/boot.keep b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/boot.keep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/boot.keep
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/boot.keep
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/root.keep b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/root.keep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/root.keep
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/root.keep
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/tmp.keep b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/tmp.keep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/tmp.keep
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/tmp.keep
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/usr.src.keep b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/usr.src.keep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/usr.src.keep
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/usr.src.keep
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.edb.binhost.keep
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/var.cache.revdep-rebuild.keep
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep b/profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/0_clean/z-keep/var.tmp.keep
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/0-shadow.lxc
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow- b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow-
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow-
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/baselayout/shadow-
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/init.d/calculate
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/boot/calculate
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/runlevels/default/calculate-core.del
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/man-db/var.cache.man/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
similarity index 100%
rename from profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hostname
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/conf.d/hwclock
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0 b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/net.eth0.remove
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/rc.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/resolv.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/openrc/sysctl.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/etc-update.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/assemble
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/portage/make.conf/builder
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2 b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab.lxc.2
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab b/profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/1_setup/sys-apps/util-linux/fstab
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_builder_squash/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_builder_squash/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_builder_squash/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_builder_squash/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_builder_squash/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/1ini_res_def.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/2ini_res.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Documents/.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Downloads/.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Music/.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Pictures/.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Public/.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Templates/.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/empty_dir/Videos/.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/full_dir/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/full_dir/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/full_dir/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/1-user-init/full_dir/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/1-user-init/full_dir/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/modarcon16root-defbg.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-misc/mc-4.8/panels.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.bash_profile
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/app-shells/bash-4.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-qt/qtgui-4.8/Trolltech.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/dev-vcs/git-1.7.0/.gitconfig
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0 b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-base/xorg-server/.gtkrc-2.0
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.Xresources
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-terms/rxvt-unicode-9.16/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-root/x11-wm/openbox-3.5/.xinitrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-35/konsolerc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-36/kwalletrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-37/kscreenlockerrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-38/settings.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-39/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/FTP.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/ftp.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/homedir.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/lockscreen.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/poweroff.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-40/panel-launchers/share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/FTP.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/ftp.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/homedir.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/lockscreen.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/poweroff.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-41/panel-launchers/share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/0_Patch/patch-42/kwinrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/domain/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_face.icon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/domain/plasma_create_symlink.icon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/0_copy
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/0_lightdm_migrate_for_ecrypt/1_remove
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/0_face.icon.symlink
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_ecrypt_face.icon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/1_lightdm_create_icon/1_create_face.icon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_face.icon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/1_Face/local/plasma_create_symlink.icon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-editors/leafpad-0.8/leafpadrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/VirtualBox.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-emulation/virtualbox/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/modarcon16-defbg.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-misc/mc-4.8/panels.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bash_profile
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.bashrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-shells/bash-3.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/external.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/network.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/options.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/system.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/FBReader/ui.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/fbreader-0.12/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/app-text/qpdfview-0.4/qpdfview.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-qt/qtgui-4.8/Trolltech.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-util/geany-1.22/.config/geany/geany.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/dev-vcs/git-1.7.0/.gitconfig
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/Default_keyring.keyring
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-base/gnome-keyring-3.18/keyrings/default
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/FTP.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/README.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/Share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/Desktop/gparted.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/cinnamon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gnome-terminal
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/gvfs-metadata/domain
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/index.theme
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/keyboard@cinnamon.org/10.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/ftp.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/homedir.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/lockscreen.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/poweroff.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers/share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/1.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/12.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panel-launchers@cinnamon.org/13.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/panels
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/user-folders.lst
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/window-list@cinnamon.org/4.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/Trolltech.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0 b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agent_config_akonadi_imap_resource_0
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/agentsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi/akonadiserverrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/akonadi_imap_resource_0rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/autostart/calculate-im.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/baloofilerc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/dolphinrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emaildefaults
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/emailidentities
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/gtk-3.0/settings.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kactivitymanagerdrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kcminputrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kdeglobals
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kglobalshortcutsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kmail2rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/konsolerc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kscreenlockerrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/ksmserverrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kwinrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/kxkbrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/mailtransports
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasma-org.kde.plasma.desktop-appletsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmarc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/plasmashellrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powerdevilrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/powermanagementprofilesrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0 b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.gtkrc-2.0
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.local/dolphin
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/FTP.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home-remote.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/README.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/Share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/partitionmanager.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/Desktop/trash.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/konsole/Shell.profile
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/breeze-icons/remove.icon-cache.kcache
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.kwl
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/kde-frameworks/kwallet-5.21/kwalletd/kdewallet.salt
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/globalkeyshortcuts.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-config-locale.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt-powermanagement.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/lxqt.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/notifications.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/panel.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/lxqt/session.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/openbox/lxqt-rc.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/desktop-items-0.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/pcmanfm-qt/lxqt/settings.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/.config/qterminal.org/qterminal.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/FTP.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home-nodomain.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/README.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/Share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/Desktop/gparted.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/lxqt-base/LXQt-0.10/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10-3.14/.claws-mail/accountrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/accountrc.tmpl
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.claws-mail/clawsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.10/.signature
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/accountrc.tmpl
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.claws-mail/clawsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.14/.signature
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7-3.10/.claws-mail/clawsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/accountrc.tmpl
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.claws-mail/clawsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/claws-mail-3.7/.signature
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/calculate@local.source
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/evolution
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mail-client/evolution-3.20/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/FTP.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/README.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/Share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/Desktop/gparted.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/autostart-pidgin.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/eom
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/gvfs-metadata
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/index.theme
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-ftp.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/launcher-share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings-system.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate-settings.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/terminal
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/digikamrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/digikam-1.5/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.6/.local/share/applications/gimp.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.gimp-2.8/sessionrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gimp-2.8/.local/share/applications/gimp.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/gqview-2.1/gqviewrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/index.theme.old
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/mate-themes-calculate-17/mate.old
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-gfx/nomacs-1.6/Image Lounge.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/dngconverter.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-plugins/kipi-plugins/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amarokrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/amzdownloader.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/amarok-2.3/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/config
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/audacious-3.2/plugin-registry
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/qastools-0.21/qasmixer.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.4/volumeicon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-sound/volumeicon-0.5/volumeicon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/guisettings.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/kodi-14.1/sources.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/guisettings.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-tv/xbmc-10.0/sources.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/kdenlive-0.7.8/kdenliverc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smplayer-0.6/smplayer.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/media-video/smtube-15.5/smtube2.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/config
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-0.16/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/gajim/config
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/httpupload
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/image
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/gajim-httpupload-20171025/pluginsconfig/url_image_preview
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accels
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/accounts.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0 b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/gtkrc-2.0
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-2.6/.purple/prefs.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/pidgin-always/sortblist.py
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/skype-2.2/Logs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/telegramdesktop.desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-im/telegram-desktop-bin-1.1/tupdates
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/.config/hexchat/hexchat.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/apps/konversation/scripts/gog
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversation.notifyrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/konversation-1.2/.kde4/share/config/konversationrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/customtoolbars.kvc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/default.kvc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/events.kvc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/main.kvc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/popups.kvc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/serverdb.kvc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/config/toolbarpos.kvc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/kvirc-4.99/kvirc4.rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/accounts.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/dconf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-irc/polari-3.18/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/cm_socket/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/.ssh/config
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-misc/openssh/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-en
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.7/feedlist.opml-ru
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-en
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-news/liferea-1.7/.liferea_1.8/feedlist.opml-ru
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/core.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/gtkui.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/deluge-1.2/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/DCPlusPlus.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/EiskaltDC++_Qt.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/eiskaltdcpp-2.1/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/net-p2p/transmission-1.8/.config/transmission/settings.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.en
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Bookmarks.ru
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/Preferences
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/Default/install-ublock.sh
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/First Run
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/chromium-41/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/dconf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/epiphany-3.18/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/extensions/uBlock0@raymondhill.net.xpi
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/prefs.js
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore-52.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/calculate.default/xulstore.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/firefox-52/profiles.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/midori-0.4/midori/config
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/operaprefs.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-en
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/opera-11.5/.opera/speeddial.ini-ru
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/bookmarks.json
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/customlist.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/profiles.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qupzilla-1.8/settings.ini
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/www-client/qutebrowser-0.8/qutebrowser.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/.gtk-bookmarks
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-base/xorg-server-1.7/user-dirs.dirs
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/parcellite-1.1/parcelliterc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/desktop-items-0.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/libfm.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-1.2.3/pcmanfm.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/qt5ct-0.35/qt5ct.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/x11vnc/x11vnc.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.Xdefaults
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-misc/xscreensaver-5.15/.xscreensaver
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/%gconf.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/%gconf.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/general/%gconf.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/%gconf.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/gconf-apps/guake/style/font/%gconf.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/guake-0.8/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.Xresources
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/rxvt-unicode-9.15/urxvt-rxvt-unicode.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/accels.scm
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/uxterm.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-terms/xterm-314/xterm.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/plasma-desktop-appletsrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-icon-theme-14-r2/login/xfce4-panel.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/index.theme
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-themes/calculate-xcursors-14/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/x11-wm/openbox-3.6/rc.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/Thunar/thunarrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/pidgin.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-clipman-plugin-autostart.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/autostart/xfce4-tips-autostart.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/menus/xfce-applications.menu
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/mousepad/mousepadrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/helpers.rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/datetime-5.rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-30/browser.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-31/mail.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-32/chat.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-33/im.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-34/writer.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-35/calc.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-36/calculator.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-37/imageedit.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-38/imageview.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-39/audioplayer.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-40/videoplayer.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-41/imageburn.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-43/textedit.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-44/terminal.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/launcher-7/lock.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/panel/xkb-plugin-10.rc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfce4-screenshooter
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/Thunar.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/gparted.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce-keyboard-settings.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-about.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-run.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xfce4-taskmanager.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-accessories.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-multimedia.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/desktop-directories/xfce-network.directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/xfce4/helpers/chromium-browser-chromium.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.mailcap
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/FTP.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Home.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/README.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/Share.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-community.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/calculate-install.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/Desktop/gparted.desktop
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/xfce-base/XFCE-always/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/.dmrc b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/.dmrc.xfce
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/domain/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/2-user/zzz_Final/undomain/ini.env
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/icons/usericon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/users/user
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/lightdm-gtk-greeter-1.6.0/zzz-kill-account-manager
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/faces/usericon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/3-system/x11-misc/sddm/icons/usericon
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_desktop_profile/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_desktop_profile/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_desktop_profile/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_desktop_profile/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_configure/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_install_configure/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_install_configure/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/audio b/profiles/templates/deprecated/3.5/6_ac_install_configure/audio
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/audio
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/audio
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/boot b/profiles/templates/deprecated/3.5/6_ac_install_configure/boot
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/boot
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/boot
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/locale b/profiles/templates/deprecated/3.5/6_ac_install_configure/locale
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/locale
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/locale
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/network b/profiles/templates/deprecated/3.5/6_ac_install_configure/network
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/network
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/network
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/session b/profiles/templates/deprecated/3.5/6_ac_install_configure/session
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/session
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/session
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/themes b/profiles/templates/deprecated/3.5/6_ac_install_configure/themes
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/themes
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/themes
diff --git a/profiles/templates/3.6_alpha/6_ac_install_configure/video b/profiles/templates/deprecated/3.5/6_ac_install_configure/video
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_configure/video
rename to profiles/templates/deprecated/3.5/6_ac_install_configure/video
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_flash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_install_flash/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_install_flash/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_flash/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/calculate-utils/linux/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_flash/calculate-utils/linux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/calculate-utils/linux/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/calculate-utils/linux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/chain.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/gfxboot.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/ldlinux.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libcom32.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/isolinux/libutil.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/chain.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/gfxboot.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/ldlinux.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libcom32.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32 b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/libutil.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg b/profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/gfxboot-themes-calculate/syslinux/menu.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/grub/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_flash/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/grub/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/grub/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/grub/grub.cfg b/profiles/templates/deprecated/3.5/6_ac_install_flash/grub/grub.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/grub/grub.cfg
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/grub/grub.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/syslinux/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_flash/syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/syslinux/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/syslinux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/syslinux/isolinux/isolinux.bin b/profiles/templates/deprecated/3.5/6_ac_install_flash/syslinux/isolinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/syslinux/isolinux/isolinux.bin
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/syslinux/isolinux/isolinux.bin
diff --git a/profiles/templates/3.6_alpha/6_ac_install_flash/syslinux/syslinux/isolinux.bin b/profiles/templates/deprecated/3.5/6_ac_install_flash/syslinux/syslinux/isolinux.bin
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_flash/syslinux/syslinux/isolinux.bin
rename to profiles/templates/deprecated/3.5/6_ac_install_flash/syslinux/syslinux/isolinux.bin
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_install_patch/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_install_patch/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/app-office/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/app-office/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/disable_scroll_lock.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/drop-check-if-root.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/app-office/libreoffice/fix_date_xlsx_export-5.4.2.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-lang/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-lang/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-lang/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-lang/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-lang/erlang/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-lang/erlang/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-lang/erlang/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-lang/erlang/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-lang/erlang/erlang-15-ncurses.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-libs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-libs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-libs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-libs/dietlibc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-libs/dietlibc/dietlib-0.34_pre20140729-r1-fix_pic.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-python/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-python/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-python/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-python/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-python/python-twitter/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/dev-python/python-twitter/message_len.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/dev-python/python-twitter/message_len.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/dev-python/python-twitter/message_len.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/dev-python/python-twitter/message_len.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/kdelibs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-frameworks/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-frameworks/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-frameworks/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-frameworks/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-frameworks/kiconthemes/inherit_generic_fallback.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-plasma/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-plasma/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-plasma/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-plasma/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-plasma/kwin/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-plasma/kwin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-plasma/kwin/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-plasma/kwin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/kde-plasma/kwin/kwin-5.10.5-fix_import.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/lxqt-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/lxqt-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/lxqt-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/lxqt-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/lxqt-base/lxqt-config/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/lxqt-base/lxqt-config/lxqt-config-0.9.0.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/mail-filter/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/mail-filter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/mail-filter/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/mail-filter/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/mail-filter/clamsmtp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/mail-filter/clamsmtp/include_order.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/digikam/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/digikam/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/digikam/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/digikam/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/digikam/digikam_i686.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/gimp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/gimp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/gimp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/gimp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.6.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/inkscape/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/inkscape/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/inkscape/inkscape-gdm_ptr_fix.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/nomacs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/nomacs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/00-get_splash.c
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/50-theme_shutdown.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/98-push_splash.c
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/99-remove_splash.c
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/fix_mtab.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/text_align.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/text_align.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/text_align.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/text_align.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-gfx/splashutils/theme_shutdown.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-sound/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-sound/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-sound/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-sound/clementine/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-sound/clementine/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-sound/clementine/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-sound/clementine/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-sound/clementine/compile_error.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-sound/clementine/compile_error.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-sound/clementine/compile_error.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-sound/clementine/compile_error.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-video/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-video/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-video/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-video/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-video/vdr/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-video/vdr/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-video/vdr/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-video/vdr/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/media-video/vdr/vdr-2.2.0-gcc72.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/choqok/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/choqok/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/choqok/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/choqok/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/choqok/branding.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/choqok/branding.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/choqok/branding.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/choqok/branding.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/README.txt b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/README.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/README.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/README.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.01.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.02.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.04.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml-16.09.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/gajim/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/gajim/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/gajim/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/gajim/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-im/gajim/gajim-fix_trayclose.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/libproxy/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/libproxy/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/libproxy/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/libproxy/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/libproxy/libproxy-disable-webkit.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/webkit-gtk/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-JSStringRef.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-libs/webkit-gtk/webkit-gtk-WKString.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-misc/openconnect/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-misc/openconnect/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-misc/openconnect/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-misc/openconnect/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-misc/openconnect/openconnect-disable-lz4.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-print/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-print/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-print/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-print/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-print/cnijfilter/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-print/cnijfilter/libpng15.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/broadcom-sta/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-3.10.0.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/broadcom-sta/0009-add-support-for-linux-4.4.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/00-src.symlink
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/50-wpa_supplicant-2.4_fix.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove b/profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/net-wireless/wpa_supplicant/99-src.symlink.remove
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/openrc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/openrc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/openrc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/openrc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/openrc/branding.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/openrc/branding.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/openrc/branding.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/openrc/branding.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/portage/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/portage/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/portage/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/portage/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/portage/portage-2.2.20-fix_binpkg_fetcher.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/v86d/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/v86d/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/v86d/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/v86d/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-apps/v86d/v86d-0.1.10-atomic.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-chroot.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2-lvm.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00/grub2_fix_loadvideo.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2-initrd.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.00_p5107/grub2_fix_loadvideo.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.02/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2-initrd.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/grub/2.02/grub2_fix_loadvideo.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/40grub2 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/40grub2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/40grub2
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/40grub2
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/chroot.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/chroot.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/chroot.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/chroot.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/10-calculate-x86_64
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-fbcondecor
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/20-pae
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/30-server
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4200_fbcondecor.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4500_uksm.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4501_muqss.patch-4.14.15
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.14/4502-objtool.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/10-calculate-x86_64
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-fbcondecor
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/20-pae
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/30-server
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4200_fbcondecor.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4500_uksm.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.17/4501_muqss.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/0004-Turn-into-BFQ-v8r6-for-4.9.0.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64 b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/10-calculate-x86_64
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-bfq
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-fbcondecor
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/20-pae
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4200_fbcondecor.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4500_uksm.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/4501_muqss.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-blk_dev
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-card_reader
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-checkpoint-restore
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-hyperv
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-iommu
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-netfilter
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-pci
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-scsi
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/50-update-touchscreen
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/90-server
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/calculate-sources/4.9/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-038.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-040.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink-044.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut-prelink.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-kernel/dracut/dracut_fallback_mdadm.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-libs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-libs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-libs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-libs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-skip-testsuite-build.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340-kernel-4.9+.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.10.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.102-kernel-4.11.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.11+.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.104-kernel-4.14.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-340.106-kernel-4.14.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-drivers/nvidia-drivers/nvidia-390.42-kernel-4.16.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/light-locker/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/light-locker/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-translate.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/light-locker/light-locker-1.4.0-waiting.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1-translate.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-cursor_theme.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-kill-on-sigterm.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.18-cleanup-script.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/lightdm/lightdm-1.8.5-cleanup-script.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.11.0-login-logout.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.12.0-login-logout.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/sddm/sddm-0.14.0-login-logout.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/xscreensaver/branding.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/garcon/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/garcon/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/garcon/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/garcon/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/garcon/garcon-0.3.0-cache_invalidate.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfdesktop/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfdesktop/xfdesktop-default_path.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfwm4/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfwm4/black_background.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-base/xfwm4/black_background.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch b/profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font-flag-patch-0.7.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_install_pxe/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_install_pxe/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/default/nfs b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/default/nfs
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/exports b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/exports
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-fs/nfs-utils/exports
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-fs/nfs-utils/exports
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/default/in.tftpd
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-ftp/tftp-hpa/in.tftpd
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/default/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/default/dhcpd b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/default/dhcpd
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf b/profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/net-misc/dhcp/dhcpd.conf
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/bootlogo b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/bootlogo
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/bootlogo
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/bootlogo
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/chain.c32 b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/chain.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/chain.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/chain.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32 b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/gfxboot.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32 b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/ldlinux.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32 b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/libcom32.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/libutil.c32 b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/libutil.c32
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/libutil.c32
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/libutil.c32
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/menu.cfg b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.cfg
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/menu.cfg
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.cfg
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/menu.patch b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.patch
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/menu.patch
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/menu.patch
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0 b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.0
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default b/profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/sys-boot/syslinux/pxelinux.cfg/default
diff --git a/profiles/templates/3.6_alpha/6_ac_install_pxe/zzz_Final/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_pxe/zzz_Final/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_pxe/zzz_Final/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_pxe/zzz_Final/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/clean_runlevels b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/clean_runlevels
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/clean_runlevels
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/clean_runlevels
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/media-sound/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/media-sound/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/media-sound/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/media-sound/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/media-sound/pulseaudio/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/60-thinkfinger.rules
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/recreate_initrd b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/recreate_initrd
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/restartUdev b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/restartUdev
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-fs/udev/restartUdev
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-fs/udev/restartUdev
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-kernel/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-kernel/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-kernel/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-kernel/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-kernel/calculate-sources/clear b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/sys-kernel/calculate-sources/clear
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.start
diff --git a/profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop b/profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
rename to profiles/templates/deprecated/3.5/6_ac_install_unmerge/x11-drivers/nvidia-drivers/nvidia-remove.stop
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/README-eng.txt b/profiles/templates/deprecated/3.5/6_ac_update_sync/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/README-eng.txt
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/README-rus.txt b/profiles/templates/deprecated/3.5/6_ac_update_sync/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/README-rus.txt
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/binhost/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/binhost/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/binhost/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/binhost/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/binhost/binhost b/profiles/templates/deprecated/3.5/6_ac_update_sync/binhost/binhost
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/binhost/binhost
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/binhost/binhost
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/0-ini b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/0-ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/0-ini
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/0-ini
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/104 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/104
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/104
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/104
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/107 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/107
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/107
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/107
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/110 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/110
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/110
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/110
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/113 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/113
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/113
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/113
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/116 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/116
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/116
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/116
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/119 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/119
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/119
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/119
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/120 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/120
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/120
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/120
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/121 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/121
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/121
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/121
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/123 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/123
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/123
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/123
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/124 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/124
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/124
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/124
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/127 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/127
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/127
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/127
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/128 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/128
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/128
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/128
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/129 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/129
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/129
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/129
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/133 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/133
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/133
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/133
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/135 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/135
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/135
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/135
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/136 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/136
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/136
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/136
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/138 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/138
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/138
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/138
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/140 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/140
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/140
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/140
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/142 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/142
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/142
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/142
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/143 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/143
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/143
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/143
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/145 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/145
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/145
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/145
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/148 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/148
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/148
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/148
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/149 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/149
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/149
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/149
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/152 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/152
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/152
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/152
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/155 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/155
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/155
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/155
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/157 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/157
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/157
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/157
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/159 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/159
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/159
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/159
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/161 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/161
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/161
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/161
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/163 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/163
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/163
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/163
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/164 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/164
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/164
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/164
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/166 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/166
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/166
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/166
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/167 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/167
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/167
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/167
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/168 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/168
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/168
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/168
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/174 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/174
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/174
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/174
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/175 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/175
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/100-old/175
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/100-old/175
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161213 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161213
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161213
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161213
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161219 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161219
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161219
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161219
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161221 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161221
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161221
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161221
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161222 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161222
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161222
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161222
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161222.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161222.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161222.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161222.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161222.2 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161222.2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161222.2
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161222.2
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161223 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161223
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161223
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161223
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161226 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161226
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161226
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161226
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161226.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161226.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161226.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161226.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161227 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161227
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161227
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161227
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161229 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161229
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2016/20161229
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2016/20161229
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170110 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170110
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170110
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170110
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170111 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170111
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170111
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170111
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170112 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170112
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170112
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170112
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170119 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170119
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170119
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170119
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170119.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170119.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170119.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170119.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170119.2 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170119.2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170119.2
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170119.2
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170125 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170125
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170125
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170125
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170201 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170201
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170201
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170201
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170207 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170207
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170207
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170207
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170215 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170215
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170215
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170215
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170217 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170217
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170217
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170217
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170218 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170218
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170218
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170218
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170301 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170301
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170301
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170301
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170302 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170302
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170302
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170302
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170317 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170317
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170317
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170317
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170320 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170320
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170320
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170320
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170329 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170329
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170329
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170329
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170405 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170405
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170405
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170405
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170411 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170411
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170411
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170411
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170417 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170417
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170417
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170417
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170418 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170418
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170418
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170418
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170418.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170418.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170418.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170418.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170426 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170426
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170426
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170426
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170522 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170522
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170522
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170522
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170522.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170522.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170522.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170522.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170523 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170523
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170523
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170523
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170525 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170525
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170525
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170525
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170626 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170626
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170626
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170626
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170629 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170629
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170629
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170629
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170630.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170630.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170630.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170630.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170704 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170704
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170704
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170704
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170804 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170804
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170804
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170804
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170915 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170915
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20170915
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20170915
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171107 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171107
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171107
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171107
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171107.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171107.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171107.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171107.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171107.2 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171107.2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171107.2
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171107.2
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171114 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171114
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171114
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171114
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171206 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171206
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171206
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171206
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171207.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171207.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171207.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171207.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171209 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171209
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171209
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171209
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171215.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171215.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171215.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171215.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171215.2 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171215.2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171215.2
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171215.2
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171223 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171223
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171223
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171223
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171226 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171226
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171226
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171226
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171228 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171228
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2017/20171228
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2017/20171228
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180111 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180111
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180111
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180111
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180116.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180116.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180116.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180116.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180118 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180118
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180118
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180118
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180202 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180202
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180202
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180202
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180213 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180213
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180213
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180213
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180214 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180214
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180214
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180214
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180216.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180216.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180216.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180216.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180216.2 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180216.2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180216.2
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180216.2
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180226 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180226
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180226
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180226
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180301 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180301
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180301
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180301
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180302.1 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180302.1
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180302.1
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180302.1
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180302.2 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180302.2
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180302.2
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180302.2
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180307 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180307
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180307
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180307
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180327 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180327
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180327
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180327
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180409 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180409
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180409
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180409
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180412 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180412
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180412
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180412
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180507 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180507
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180507
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180507
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180514 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180514
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180514
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180514
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180530 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180530
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180530
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180530
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180601 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180601
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180601
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180601
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180608 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180608
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180608
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180608
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180618 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180618
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180618
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180618
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180621 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180621
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180621
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180621
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180625 b/profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180625
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/remerge/2018/20180625
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/remerge/2018/20180625
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8 b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/64-rebuild_for_libdb_4.8
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0 b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/65-remove_libdb_6.0
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/67-rebuild_bash b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/67-rebuild_bash
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/67-rebuild_bash
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/67-rebuild_bash
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/68-fix_amdgpu-ucode
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/69-fix_breeze b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/69-fix_breeze
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/69-fix_breeze
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/69-fix_breeze
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/70-revert_prelink b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/70-revert_prelink
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/70-revert_prelink
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/70-revert_prelink
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/71-fix_kde4-l10n
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/73-change_profile b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/73-change_profile
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/73-change_profile
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/73-change_profile
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/74-fix_imageview b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/74-fix_imageview
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/74-fix_imageview
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/74-fix_imageview
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/75-change_profile b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/75-change_profile
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/75-change_profile
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/75-change_profile
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/76-change_python b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/76-change_python
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/76-change_python
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/76-change_python
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/77-apply_calculate_env b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/77-apply_calculate_env
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/77-apply_calculate_env
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/77-apply_calculate_env
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/78-rebuild_kiconthemes
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/79-fix_kde_dirs b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/79-fix_kde_dirs
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/79-fix_kde_dirs
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/79-fix_kde_dirs
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/80-fix_rc_conf b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/80-fix_rc_conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/80-fix_rc_conf
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/80-fix_rc_conf
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/81-fix_localmount_conf b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/81-fix_localmount_conf
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/81-fix_localmount_conf
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/81-fix_localmount_conf
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/84-fix_gnome-icon-theme
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/85-fix_calculate-sources b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/85-fix_calculate-sources
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/85-fix_calculate-sources
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/85-fix_calculate-sources
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/86-fix_eudev b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/86-fix_eudev
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/86-fix_eudev
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/86-fix_eudev
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/87-fix-udev-init-scripts
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/88-rescan_mirrors b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/88-rescan_mirrors
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/88-rescan_mirrors
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/88-rescan_mirrors
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/89-rebuild_sddm b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/89-rebuild_sddm
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/89-rebuild_sddm
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/89-rebuild_sddm
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/90-clear-outdated b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/90-clear-outdated
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/90-clear-outdated
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/90-clear-outdated
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/91-rebuild_openconnect_libproxy
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/92-locale_gen b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/92-locale_gen
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/92-locale_gen
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/92-locale_gen
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/94-fix-openrc-baselayout-util
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/95-fix-shadow b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/95-fix-shadow
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/95-fix-shadow
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/95-fix-shadow
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/98-fix_ati-drivers b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/98-fix_ati-drivers
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/98-fix_ati-drivers
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/98-fix_ati-drivers
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/100-old/99-rebuild_openrc_exo
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161212-rebuild_ntfs3g
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161215-fix-utils-migration b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161215-fix-utils-migration
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161215-fix-utils-migration
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161215-fix-utils-migration
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161221-rebuild_themes b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161221-rebuild_themes
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161221-rebuild_themes
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161221-rebuild_themes
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161221.1-rebuild_gccdep
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161223-rebuild_sip b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161223-rebuild_sip
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161223-rebuild_sip
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161223-rebuild_sip
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161223.1-rebuild_lightdm
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161228-rebuild_libx11 b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161228-rebuild_libx11
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2016/20161228-rebuild_libx11
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2016/20161228-rebuild_libx11
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170119-fix_automagic b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170119-fix_automagic
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170119-fix_automagic
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170119-fix_automagic
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170119.1-fix_automagic b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170119.1-fix_automagic
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170119.1-fix_automagic
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170119.1-fix_automagic
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170120-fix_gmp b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170120-fix_gmp
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170120-fix_gmp
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170120-fix_gmp
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170120.1-fix_dep b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170120.1-fix_dep
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170120.1-fix_dep
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170120.1-fix_dep
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170125-fix_klibc b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170125-fix_klibc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170125-fix_klibc
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170125-fix_klibc
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170201-fix_ejabberd b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170201-fix_ejabberd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170201-fix_ejabberd
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170201-fix_ejabberd
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170207-add_autodeps_set b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170207-add_autodeps_set
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170207-add_autodeps_set
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170207-add_autodeps_set
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170215.1-fix_repos b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170215.1-fix_repos
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170215.1-fix_repos
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170215.1-fix_repos
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170215.2-fix_repos b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170215.2-fix_repos
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170215.2-fix_repos
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170215.2-fix_repos
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170310-fix_splashutils b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170310-fix_splashutils
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170310-fix_splashutils
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170310-fix_splashutils
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170313-fix_bdeps_param
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170314-fix_backgrounds b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170314-fix_backgrounds
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170314-fix_backgrounds
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170314-fix_backgrounds
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170327-rebuild_adobe-flash
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170330-rebuild_klibc b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170330-rebuild_klibc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170330-rebuild_klibc
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170330-rebuild_klibc
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170331-rebuild-consolekit
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170403-rebuild-splashutils
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170403-rebuild_caja_nemo
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170405-rebuild_mate_cinnamon_settings-daemon
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170411.1-fix_fontconfig
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170411.2-fix_fontconfig
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170412-set_binutils b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170412-set_binutils
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170412-set_binutils
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170412-set_binutils
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170412.2-fix_fontconfig
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417-rebuild_perl_packages
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417.1-rebuild_perl_packages
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417.2-rebuild_perl_packages
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170417.3-rebuild_po4a
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170429-rebuild-broken-by-gcc
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170525-fix_calculate-update b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170525-fix_calculate-update
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170525-fix_calculate-update
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170525-fix_calculate-update
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170620-set_binutils b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170620-set_binutils
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170620-set_binutils
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170620-set_binutils
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170623.0-update_group_right b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170623.0-update_group_right
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170623.0-update_group_right
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170623.0-update_group_right
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170623.1-add_sudo_group
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170623.2-fix_core_server_permissions
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170627.0-fix_grub_d_memtest
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170627.1-rebuild_memtest
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170629-rebuild_nemo b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170629-rebuild_nemo
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170629-rebuild_nemo
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170629-rebuild_nemo
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170817-fix_calculate_utils
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170824-fix_postgresql b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170824-fix_postgresql
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20170824-fix_postgresql
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20170824-fix_postgresql
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171107.1-fix_porthole b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171107.1-fix_porthole
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171107.1-fix_porthole
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171107.1-fix_porthole
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171107.2-rebuild_gtk
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171214-rebuild_dracut b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171214-rebuild_dracut
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171214-rebuild_dracut
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171214-rebuild_dracut
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171215-fix_calculate-core b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171215-fix_calculate-core
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171215-fix_calculate-core
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171215-fix_calculate-core
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171215-rebuild_libreoffice
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171220-rebuild_lightdm_gtk_greeter
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171227-rebuild_gajim b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171227-rebuild_gajim
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171227-rebuild_gajim
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171227-rebuild_gajim
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2017/20171229-rebuild_for_capabilities
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180110-rebuild_gajim b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180110-rebuild_gajim
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180110-rebuild_gajim
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180110-rebuild_gajim
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180111-rebuild_chroot_calculate_sources
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180118-fix_grub_passwd
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180119.1-rebuild_chroot_clean
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180119.2-fix_chroot_clean
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180126-rescan_mirrors b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180126-rescan_mirrors
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180126-rescan_mirrors
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180126-rescan_mirrors
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180216-fix_broken_runlevel
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180226-rebuild_lxqt_broken
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180306-rebuild_shorewall
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180407.1-fix-cinnamon
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180504-fix_calculate_utils
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180607-shorewall_rebuild
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180621-kernel_rebuild b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180621-kernel_rebuild
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180621-kernel_rebuild
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180621-kernel_rebuild
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180701-firefox_rebuild b/profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180701-firefox_rebuild
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/revision/2018/20180701-firefox_rebuild
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/revision/2018/20180701-firefox_rebuild
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/0-ini b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/0-ini
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/0-ini
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/0-ini
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/create/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/create/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/create/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/create/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/create/0-world b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/create/0-world
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/create/0-world
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/create/0-world
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/create/base b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/create/base
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/create/base
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/create/base
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/02 b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/02
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/02
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/02
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/03 b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/03
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/03
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/03
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/05 b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/05
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/05
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/05
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/06 b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/06
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/06
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/06
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/07 b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/07
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/100-old/07
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/100-old/07
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2017/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2017/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2017/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2017/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2017/20170329 b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2017/20170329
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2017/20170329
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2017/20170329
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2018/.calculate_directory b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2018/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2018/.calculate_directory
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2018/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2018/20180626 b/profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2018/20180626
similarity index 100%
rename from profiles/templates/3.6_alpha/6_ac_update_sync/world/update/2018/20180626
rename to profiles/templates/deprecated/3.5/6_ac_update_sync/world/update/2018/20180626
diff --git a/profiles/templates/3.6_alpha/7_ac_server_ldif/.calculate_directory b/profiles/templates/deprecated/3.5/7_ac_server_ldif/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_ldif/.calculate_directory
rename to profiles/templates/deprecated/3.5/7_ac_server_ldif/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/7_ac_server_ldif/base.ldif b/profiles/templates/deprecated/3.5/7_ac_server_ldif/base.ldif
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_ldif/base.ldif
rename to profiles/templates/deprecated/3.5/7_ac_server_ldif/base.ldif
diff --git a/profiles/templates/3.6_alpha/7_ac_server_ldif/unix_base.ldif b/profiles/templates/deprecated/3.5/7_ac_server_ldif/unix_base.ldif
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_ldif/unix_base.ldif
rename to profiles/templates/deprecated/3.5/7_ac_server_ldif/unix_base.ldif
diff --git a/profiles/templates/3.6_alpha/7_ac_server_ldif/unix_group.ldif b/profiles/templates/deprecated/3.5/7_ac_server_ldif/unix_group.ldif
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_ldif/unix_group.ldif
rename to profiles/templates/deprecated/3.5/7_ac_server_ldif/unix_group.ldif
diff --git a/profiles/templates/3.6_alpha/7_ac_server_ldif/unix_user.ldif b/profiles/templates/deprecated/3.5/7_ac_server_ldif/unix_user.ldif
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_ldif/unix_user.ldif
rename to profiles/templates/deprecated/3.5/7_ac_server_ldif/unix_user.ldif
diff --git a/profiles/templates/3.6_alpha/7_ac_server_setup/.calculate_directory b/profiles/templates/deprecated/3.5/7_ac_server_setup/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_setup/.calculate_directory
rename to profiles/templates/deprecated/3.5/7_ac_server_setup/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/7_ac_server_setup/ldap b/profiles/templates/deprecated/3.5/7_ac_server_setup/ldap
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_setup/ldap
rename to profiles/templates/deprecated/3.5/7_ac_server_setup/ldap
diff --git a/profiles/templates/3.6_alpha/7_ac_server_setup/ldap.pre b/profiles/templates/deprecated/3.5/7_ac_server_setup/ldap.pre
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_setup/ldap.pre
rename to profiles/templates/deprecated/3.5/7_ac_server_setup/ldap.pre
diff --git a/profiles/templates/3.6_alpha/7_ac_server_setup/unix b/profiles/templates/deprecated/3.5/7_ac_server_setup/unix
similarity index 100%
rename from profiles/templates/3.6_alpha/7_ac_server_setup/unix
rename to profiles/templates/deprecated/3.5/7_ac_server_setup/unix
diff --git a/profiles/templates/3.6_alpha/9_ac_install_merge/.calculate_directory b/profiles/templates/deprecated/3.5/9_ac_install_merge/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/9_ac_install_merge/.calculate_directory
rename to profiles/templates/deprecated/3.5/9_ac_install_merge/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/9_ac_install_merge/README-eng.txt b/profiles/templates/deprecated/3.5/9_ac_install_merge/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/9_ac_install_merge/README-eng.txt
rename to profiles/templates/deprecated/3.5/9_ac_install_merge/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/9_ac_install_merge/README-rus.txt b/profiles/templates/deprecated/3.5/9_ac_install_merge/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/9_ac_install_merge/README-rus.txt
rename to profiles/templates/deprecated/3.5/9_ac_install_merge/README-rus.txt
diff --git a/profiles/templates/3.6_alpha/9_ac_install_merge/sys-apps/.calculate_directory b/profiles/templates/deprecated/3.5/9_ac_install_merge/sys-apps/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/9_ac_install_merge/sys-apps/.calculate_directory
rename to profiles/templates/deprecated/3.5/9_ac_install_merge/sys-apps/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory b/profiles/templates/deprecated/3.5/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6_alpha/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
rename to profiles/templates/deprecated/3.5/9_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
diff --git a/profiles/templates/3.6_alpha/9_ac_install_merge/sys-apps/calculate-utils/ini.env b/profiles/templates/deprecated/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env
similarity index 100%
rename from profiles/templates/3.6_alpha/9_ac_install_merge/sys-apps/calculate-utils/ini.env
rename to profiles/templates/deprecated/3.5/9_ac_install_merge/sys-apps/calculate-utils/ini.env
diff --git a/profiles/templates/3.6_alpha/README-eng.txt b/profiles/templates/deprecated/3.5/README-eng.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/README-eng.txt
rename to profiles/templates/deprecated/3.5/README-eng.txt
diff --git a/profiles/templates/3.6_alpha/README-rus.txt b/profiles/templates/deprecated/3.5/README-rus.txt
similarity index 100%
rename from profiles/templates/3.6_alpha/README-rus.txt
rename to profiles/templates/deprecated/3.5/README-rus.txt