diff --git a/templates/.calculate_directory b/templates/.calculate_directory
deleted file mode 100644
index 57d1be7..0000000
--- a/templates/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip cl_name==calculate-install&&cl_pass_action==install||cl_name==calculate-install&&cl_pass_action==template
diff --git a/templates/system/.calculate_directory b/templates/system/.calculate_directory
deleted file mode 100644
index 720d52e..0000000
--- a/templates/system/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/templates/system/acpid/.calculate_directory b/templates/system/acpid/.calculate_directory
deleted file mode 100644
index f6fc756..0000000
--- a/templates/system/acpid/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-power/acpid)!= path=/etc name=acpi
-
diff --git a/templates/system/acpid/default.sh b/templates/system/acpid/default.sh
deleted file mode 100644
index 5dc8186..0000000
--- a/templates/system/acpid/default.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-# Calculate comment=# hr_laptop!=
-#!/bin/sh
-# /etc/acpi/default.sh
-# Default acpi script that takes an entry for all actions
-
-set $*
-
-group=${1%%/*}
-action=${1#*/}
-device=$2
-id=$3
-value=$4
-
-BACKLIGHT_DIR=/sys/devices/virtual/backlight/acpi_video0
-
-# increase backlight
-inc_backlight() {
- local cur_backlight=$(cat $BACKLIGHT_DIR/actual_brightness)
- local max_backlight=$(cat $BACKLIGHT_DIR/max_brightness)
- [[ $cur_backlight -lt $max_backlight ]] &&
- echo $(($cur_backlight + 1)) >$BACKLIGHT_DIR/brightness
-}
-
-# decrease backlight
-dec_backlight() {
- local cur_backlight=$(cat $BACKLIGHT_DIR/actual_brightness)
- local max_backlight=$(cat $BACKLIGHT_DIR/max_brightness)
-
- [[ $cur_backlight -gt 0 ]] &&
- echo $(($cur_backlight - 1)) >$BACKLIGHT_DIR/brightness
-}
-
-FREQLIST=(2530000 1600000)
-# increase cpu freq
-inc_freq() {
- cpufreq-set -c0 -f ${FREQLIST[0]}
- cpufreq-set -c1 -f ${FREQLIST[0]}
- #cpufreq-set -g performance
-}
-
-# decrease cpu freq
-dec_freq() {
- cpufreq-set -c0 -f ${FREQLIST[1]}
- cpufreq-set -c1 -f ${FREQLIST[1]}
- #cpufreq-set -g powersave
-}
-
-log_unhandled() {
- logger "ACPI event unhandled: $*"
-}
-
-case "$group" in
- button)
- case "$action" in
- power)
- /sbin/init 0
- ;;
-
- # if your laptop doesnt turn on/off the display via hardware
- # switch and instead just generates an acpi event, you can force
- # X to turn off the display via dpms. note you will have to run
- # 'xhost +local:0' so root can access the X DISPLAY.
- #lid)
- # xset dpms force off
- # ;;
-
- *) log_unhandled $* ;;
- esac
- ;;
-
- ac_adapter)
- case "$value" in
- # Add code here to handle when the system is unplugged
- # (maybe change cpu scaling to powersave mode). For
- # multicore systems, make sure you set powersave mode
- # for each core!
- *0)
- dec_freq
- ;;
-
- # Add code here to handle when the system is plugged in
- # (maybe change cpu scaling to performance mode). For
- # multicore systems, make sure you set performance mode
- # for each core!
- *1)
- inc_freq
- ;;
-
- *) log_unhandled $* ;;
- esac
- ;;
- sony)
- case "$action" in
- hotkey)
- case "$device" in
- SNC)
- case "$id" in
- *01)
- case "$value" in
- *010)
- dec_backlight
- ;;
- *011)
- inc_backlight
- ;;
- *020)
- dec_freq
- ;;
- *021)
- inc_freq
- ;;
- *040)
- eject
- ;;
- *) log_unhandled $* ;;
- esac ;;
- *) log_unhandled $* ;;
- esac
- ;;
- *) log_unhandled $* ;;
- esac
- ;;
- *) log_unhandled $* ;;
- esac
- ;;
-
- *) log_unhandled $* ;;
-esac
diff --git a/templates/system/acpid/default/.calculate_directory b/templates/system/acpid/default/.calculate_directory
deleted file mode 100644
index 0f7257b..0000000
--- a/templates/system/acpid/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/templates/system/acpid/default/acpid b/templates/system/acpid/default/acpid
deleted file mode 100644
index a7c84d2..0000000
--- a/templates/system/acpid/default/acpid
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove hr_laptop==
diff --git a/templates/system/baselayout/.calculate_directory b/templates/system/baselayout/.calculate_directory
deleted file mode 100644
index aaa5272..0000000
--- a/templates/system/baselayout/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/baselayout)!= name=etc
-
diff --git a/templates/system/baselayout/conf.d/hostname b/templates/system/baselayout/conf.d/hostname
deleted file mode 100644
index 77fb0ff..0000000
--- a/templates/system/baselayout/conf.d/hostname
+++ /dev/null
@@ -1 +0,0 @@
-HOSTNAME="#-os_install_net_hostname-#"
diff --git a/templates/system/baselayout/fstab b/templates/system/baselayout/fstab
deleted file mode 100644
index fb1041b..0000000
--- a/templates/system/baselayout/fstab
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate comment=# os_install_root_type!=livecd
-#-os_install_fstab_mount_info-#
-
-#-os_install_fstab_swap_info-#
-
-proc /proc proc defaults 0 0
-shm /dev/shm tmpfs nodev,nosuid,noexec 0 0
diff --git a/templates/system/baselayout/hosts b/templates/system/baselayout/hosts
deleted file mode 100644
index 9addcd2..0000000
--- a/templates/system/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/templates/system/baselayout/issue b/templates/system/baselayout/issue
deleted file mode 100644
index aef8ce6..0000000
--- a/templates/system/baselayout/issue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Welcome to \n.\O (#-os_install_linux_name-# #-os_install_linux_ver-#)
-
diff --git a/templates/system/baselayout/localtime b/templates/system/baselayout/localtime
deleted file mode 100644
index 3f370ff..0000000
--- a/templates/system/baselayout/localtime
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/usr/share/zoneinfo/#-os_install_clock_timezone-# symbolic
diff --git a/templates/system/baselayout/mtab b/templates/system/baselayout/mtab
deleted file mode 100644
index 685f12c..0000000
--- a/templates/system/baselayout/mtab
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate cl_pass_action==install
-
diff --git a/templates/system/baselayout/timezone b/templates/system/baselayout/timezone
deleted file mode 100644
index ac542fa..0000000
--- a/templates/system/baselayout/timezone
+++ /dev/null
@@ -1 +0,0 @@
-#-os_install_clock_timezone-#
diff --git a/templates/system/eix/.calculate_directory b/templates/system/eix/.calculate_directory
deleted file mode 100644
index b4591ee..0000000
--- a/templates/system/eix/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(app-portage/eix)!= name=etc
-
diff --git a/templates/system/eix/eix-sync.conf b/templates/system/eix/eix-sync.conf
deleted file mode 100644
index 16e96b4..0000000
--- a/templates/system/eix/eix-sync.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate comment=#
-calculate
diff --git a/templates/system/gnome-session/.calculate_directory b/templates/system/gnome-session/.calculate_directory
deleted file mode 100644
index bc86b18..0000000
--- a/templates/system/gnome-session/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(gnome-base/gnome-session)!= path=/etc name=env.d
-
diff --git a/templates/system/gnome-session/90xsession b/templates/system/gnome-session/90xsession
deleted file mode 100644
index 617e8a7..0000000
--- a/templates/system/gnome-session/90xsession
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate comment=#
-
-#?pkg(kde-base/kdebase-startkde)!=#
-XSESSION="KDE-4"
-#pkg#
-#?pkg(kde-base/kdebase-startkde)==&&pkg(gnome-base/gnome-session)!=#
-XSESSION="Gnome"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)!=#
-XSESSION="Xfce4"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)==&&pkg(x11-wm/openbox)!=#
-XSESSION="openbox"
-#pkg#
diff --git a/templates/system/gpm/.calculate_directory b/templates/system/gpm/.calculate_directory
deleted file mode 100644
index caa58e0..0000000
--- a/templates/system/gpm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-libs/gpm)!= path=/etc name=conf.d
-
diff --git a/templates/system/gpm/gpm b/templates/system/gpm/gpm
deleted file mode 100644
index e8b9f0f..0000000
--- a/templates/system/gpm/gpm
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSE=imps2
-MOUSEDEV=/dev/psaux
diff --git a/templates/system/grub/.calculate_directory b/templates/system/grub/.calculate_directory
deleted file mode 100644
index 7349bcb..0000000
--- a/templates/system/grub/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-boot/grub)!=&&cl_pass_action==install path=/boot
-
diff --git a/templates/system/grub/device.map b/templates/system/grub/device.map
deleted file mode 100644
index 468f0d3..0000000
--- a/templates/system/grub/device.map
+++ /dev/null
@@ -1 +0,0 @@
-#-os_install_grub_devicemap_info-#
diff --git a/templates/system/grub/grub.conf b/templates/system/grub/grub.conf
deleted file mode 100644
index e74258c..0000000
--- a/templates/system/grub/grub.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# Calculate comment=#
-timeout 5
-default 0
-fallback 1
-splashimage=(hd#-disk(/boot,grub)-#)/boot/grub/grub-calculate.xpm.gz
-
-#?os_install_linux_system==desktop&&os_install_linux_subname!=#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# #-os_install_linux_subname-#
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_subname==#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-#
-#os_install_linux_system#
-#?os_install_linux_system==server#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-#
-#os_install_linux_system#
-root (hd#-disk(/boot,grub)-#)
-#?os_install_linux_system==desktop#
-kernel /boot/#-os_install_kernel-# root=#-os_install_root_dev-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS#
-kernel /boot/#-os_install_kernel-# root=#-os_install_root_dev-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_shortname==CSS#
-kernel /boot/#-os_install_kernel-# root=#-os_install_root_dev-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_shortname#
-initrd /boot/#-os_install_initrd-#
-
-#?os_install_linux_system==desktop&&os_install_linux_subname!=#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# #-os_install_linux_subname-# Safemode
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_subname==#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Safemode
-#os_install_linux_system#
-#?os_install_linux_system==server#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Safemode
-#os_install_linux_system#
-root (hd#-disk(/boot,grub)-#)
-#?os_install_linux_system==desktop#
-kernel /boot/#-os_install_kernel-# root=#-os_install_root_dev-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS#
-kernel /boot/#-os_install_kernel-# root=#-os_install_root_dev-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_shortname==CSS#
-kernel /boot/#-os_install_kernel-# root=#-os_install_root_dev-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_shortname#
-initrd /boot/#-os_install_initrd_install-#
-
-#-grub()-#
-
-# Uncomment if you have Windows on hard disk
-# title Microsoft Windows
-# rootnoverify (hd0,0)
-# chainloader +1
diff --git a/templates/system/hal/.calculate_directory b/templates/system/hal/.calculate_directory
deleted file mode 100644
index 5c4fe37..0000000
--- a/templates/system/hal/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/hal)!= path=/usr/share/hal/fdi name=policy
-
diff --git a/templates/system/hal/10osvendor/10-ntfs-3g.fdi b/templates/system/hal/10osvendor/10-ntfs-3g.fdi
deleted file mode 100644
index 9440989..0000000
--- a/templates/system/hal/10osvendor/10-ntfs-3g.fdi
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-ntfs-3g
-ntfs-3g
-
-
-
-
diff --git a/templates/system/hal/10osvendor/10-x11-input.fdi b/templates/system/hal/10osvendor/10-x11-input.fdi
deleted file mode 100644
index 95429dd..0000000
--- a/templates/system/hal/10osvendor/10-x11-input.fdi
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
- keyboard
-
- evdev
- xorg
- #-os_install_locale_xkbname-#
- pc104
- grp:caps_toggle
- ,grp:switch
- ,grp_led:caps
-
-
-
-
-
-
- mouse
-
- evdev
- 5
- auto
-
- 4 5
-
-
-
-
-
diff --git a/templates/system/hal/10osvendor/11-x11-synaptics.fdi b/templates/system/hal/10osvendor/11-x11-synaptics.fdi
deleted file mode 100644
index 0ef4c4e..0000000
--- a/templates/system/hal/10osvendor/11-x11-synaptics.fdi
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- synaptics
- 1
-
-
-
-
-
diff --git a/templates/system/hal/10osvendor/15-x11-alps-touchpad.fdi b/templates/system/hal/10osvendor/15-x11-alps-touchpad.fdi
deleted file mode 100644
index f24419a..0000000
--- a/templates/system/hal/10osvendor/15-x11-alps-touchpad.fdi
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
- synaptics
- 130
- 840
- 130
- 640
- 25
- 30
- 180
- 220
- 75
- true
- 20
- true
- 20
- 0.60
- 1.10
- 0.030
- 200
- 200
- 1
- 1
- 0.1
- 2
- on
- 1
-
-
-
-
-
diff --git a/templates/system/hal/10osvendor/15-x11-apple-touchpad.fdi b/templates/system/hal/10osvendor/15-x11-apple-touchpad.fdi
deleted file mode 100644
index 23e613a..0000000
--- a/templates/system/hal/10osvendor/15-x11-apple-touchpad.fdi
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- synaptics
- 0
- 1
- 2
- 0
- 90
- off
- 1.10
- 1.30
- 0.08
- 2
- 3
- 1
- 0
-
-
-
-
-
diff --git a/templates/system/hal/10osvendor/15-x11-bcm5974-touchpad.fdi b/templates/system/hal/10osvendor/15-x11-bcm5974-touchpad.fdi
deleted file mode 100644
index e674818..0000000
--- a/templates/system/hal/10osvendor/15-x11-bcm5974-touchpad.fdi
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- synaptics
- 0
- 1280
- 0
- 800
- 1
- 3
- 2
- 1
- 0
- 1
- 1
- 0
- 40
- 10
- 16
- 80
- 256
- 0
- 10
- 200
- 0.8
- 1.2
- 0.10
- 25
- 223
- 200
- 1
- 3
- 2
- 0
- 0
- 0
- 0
-
-
-
-
-
diff --git a/templates/system/hal/10osvendor/15-x11-elantech-touchpad.fdi b/templates/system/hal/10osvendor/15-x11-elantech-touchpad.fdi
deleted file mode 100644
index 40e6d74..0000000
--- a/templates/system/hal/10osvendor/15-x11-elantech-touchpad.fdi
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
- synaptics
- on
- 0.0320
- 0.72
- on
- 1
- 1
- 1
- 2
- 60
- 1070
- 90
- 680
- 0.13
- 1
- 2
- 3
-
-
-
-
-
diff --git a/templates/system/hal/10osvendor/15-x11-input-bksp.fdi b/templates/system/hal/10osvendor/15-x11-input-bksp.fdi
deleted file mode 100644
index 06a769f..0000000
--- a/templates/system/hal/10osvendor/15-x11-input-bksp.fdi
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
- ,terminate:ctrl_alt_bksp
-
-
-
-
diff --git a/templates/system/hal/10osvendor/15-x11-synaptics-touchpad.fdi b/templates/system/hal/10osvendor/15-x11-synaptics-touchpad.fdi
deleted file mode 100644
index 0001cf3..0000000
--- a/templates/system/hal/10osvendor/15-x11-synaptics-touchpad.fdi
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
- synaptics
- 1700
- 5300
- 1700
- 4200
- 25
- 30
- 180
- 220
- 100
- 0.10
- 0.70
- 0.00150
- on
- 1
- 1
- 1
- 1
- 1
- 2
- 3
-
-
-
-
-
diff --git a/templates/system/hal/10osvendor/999-storage-policy-fixed-drives.fdi b/templates/system/hal/10osvendor/999-storage-policy-fixed-drives.fdi
deleted file mode 100644
index 76fb69d..0000000
--- a/templates/system/hal/10osvendor/999-storage-policy-fixed-drives.fdi
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
- false
-
-
-
-
diff --git a/templates/system/hal/policy/.calculate_directory b/templates/system/hal/policy/.calculate_directory
deleted file mode 100644
index eb862ea..0000000
--- a/templates/system/hal/policy/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/hal/fdi name=policy
-
diff --git a/templates/system/hal/policy/ntfs-3g.fdi b/templates/system/hal/policy/ntfs-3g.fdi
deleted file mode 100644
index 9440989..0000000
--- a/templates/system/hal/policy/ntfs-3g.fdi
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-ntfs-3g
-ntfs-3g
-
-
-
-
diff --git a/templates/system/hdparm/.calculate_directory b/templates/system/hdparm/.calculate_directory
deleted file mode 100644
index e40c583..0000000
--- a/templates/system/hdparm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/hdparm)!= path=/etc name=conf.d
-
diff --git a/templates/system/hdparm/hdparm b/templates/system/hdparm/hdparm
deleted file mode 100644
index 8c39501..0000000
--- a/templates/system/hdparm/hdparm
+++ /dev/null
@@ -1,3 +0,0 @@
-pata_all_args="-d1 -X69 -c1"
-sata_all_args=""
-all_args=""
diff --git a/templates/system/kdebase-startkde/.calculate_directory b/templates/system/kdebase-startkde/.calculate_directory
deleted file mode 100644
index 6edd9ae..0000000
--- a/templates/system/kdebase-startkde/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(kde-base/kdebase-startkde)!= path=/etc name=env.d
-
diff --git a/templates/system/kdebase-startkde/90xsession b/templates/system/kdebase-startkde/90xsession
deleted file mode 100644
index 617e8a7..0000000
--- a/templates/system/kdebase-startkde/90xsession
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate comment=#
-
-#?pkg(kde-base/kdebase-startkde)!=#
-XSESSION="KDE-4"
-#pkg#
-#?pkg(kde-base/kdebase-startkde)==&&pkg(gnome-base/gnome-session)!=#
-XSESSION="Gnome"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)!=#
-XSESSION="Xfce4"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)==&&pkg(x11-wm/openbox)!=#
-XSESSION="openbox"
-#pkg#
diff --git a/templates/system/kdm/.calculate_directory b/templates/system/kdm/.calculate_directory
deleted file mode 100644
index daf2a40..0000000
--- a/templates/system/kdm/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(kde-base/kdm)!= path=/usr/share/config
-
diff --git a/templates/system/kdm/backgroundrc b/templates/system/kdm/backgroundrc
deleted file mode 100644
index 9aee437..0000000
--- a/templates/system/kdm/backgroundrc
+++ /dev/null
@@ -1,20 +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
-Wallpaper=/usr/share/wallpapers/calculate-kdm.jpg
-WallpaperList=Custom
-WallpaperMode=Scaled
diff --git a/templates/system/kdm/kdmrc b/templates/system/kdm/kdmrc
deleted file mode 100644
index b4d891d..0000000
--- a/templates/system/kdm/kdmrc
+++ /dev/null
@@ -1,104 +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
-#?os_install_root_type!=livecd#
-AutoReLogin=false
-#os_install_root_type#
-#?os_install_root_type==livecd#
-AutoReLogin=true
-#os_install_root_type#
-ClientLogFile=.xsession-errors-%d
-Resources=/usr/share/wallpapers/fulmine.jpg
-SessionsDirs=/usr/share/xsessions
-
-[X-*-Greeter]
-AntiAliasing=true
-ColorScheme=Oxygen
-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#
-Theme=
-UseBackground=true
-UseTheme=false
-UserCompletion=true
-UserList=true
-
-[X-:*-Core]
-AllowNullPasswd=true
-AllowShutdown=All
-NoPassEnable=false
-NoPassUsers=
-ServerArgsLocal=-nolisten tcp -dpi 96
-ServerCmd=/usr/bin/X -br -novtswitch
-#?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#
-
-[X-:*-Greeter]
-AllowClose=false
-DefaultUser=cxz
-FocusPasswd=true
-LoginMode=DefaultLocal
-PreselectUser=Previous
-
-[X-:0-Core]
-#?os_install_root_type!=livecd#
-AutoLoginEnable=false
-AutoLoginUser=
-#os_install_root_type#
-#?os_install_root_type==livecd#
-AutoLoginEnable=true
-AutoLoginUser=guest
-#os_install_root_type#
-AutoLoginLocked=false
-ClientLogFile=.xsession-errors
-
-[Xdmcp]
-Enable=false
-Willing=/usr/share/config/kdm/Xwilling
diff --git a/templates/system/ntp/.calculate_directory b/templates/system/ntp/.calculate_directory
deleted file mode 100644
index f4fb793..0000000
--- a/templates/system/ntp/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(net-misc/ntp)!= path=/etc name=cron.hourly
-
diff --git a/templates/system/ntp/clocksync b/templates/system/ntp/clocksync
deleted file mode 100644
index e9ccfb0..0000000
--- a/templates/system/ntp/clocksync
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate os_install_ntp!=
-#!/bin/sh
-
-/usr/sbin/ntpdate -u #-os_install_ntp-# &>/dev/null
-
diff --git a/templates/system/openbox/.calculate_directory b/templates/system/openbox/.calculate_directory
deleted file mode 100644
index f2a3c02..0000000
--- a/templates/system/openbox/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(x11-wm/openbox)!= path=/etc name=env.d
-
diff --git a/templates/system/openbox/90xsession b/templates/system/openbox/90xsession
deleted file mode 100644
index 617e8a7..0000000
--- a/templates/system/openbox/90xsession
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate comment=#
-
-#?pkg(kde-base/kdebase-startkde)!=#
-XSESSION="KDE-4"
-#pkg#
-#?pkg(kde-base/kdebase-startkde)==&&pkg(gnome-base/gnome-session)!=#
-XSESSION="Gnome"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)!=#
-XSESSION="Xfce4"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)==&&pkg(x11-wm/openbox)!=#
-XSESSION="openbox"
-#pkg#
diff --git a/templates/system/openrc/.calculate_directory b/templates/system/openrc/.calculate_directory
deleted file mode 100644
index 95521c5..0000000
--- a/templates/system/openrc/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/openrc)!= name=etc
-
diff --git a/templates/system/openrc/conf.d/.calculate_directory b/templates/system/openrc/conf.d/.calculate_directory
deleted file mode 100644
index afec7e6..0000000
--- a/templates/system/openrc/conf.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate
diff --git a/templates/system/openrc/conf.d/consolefont b/templates/system/openrc/conf.d/consolefont
deleted file mode 100644
index 914e316..0000000
--- a/templates/system/openrc/conf.d/consolefont
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate comment=#
-
-CONSOLEFONT="#-os_install_locale_consolefont-#"
diff --git a/templates/system/openrc/conf.d/fbcondecor b/templates/system/openrc/conf.d/fbcondecor
deleted file mode 100644
index 14621fa..0000000
--- a/templates/system/openrc/conf.d/fbcondecor
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate os_install_linux_shortname!=CSS
-# On which TTYs should fbcondecor be enabled? Defaults to RC_TTY_NUMBER.
-FBCONDECOR_TTYS="1 2 3 4 5 6"
-
-# Allows to set different themes on different consoles
-# format: ": : (...)"
-FBCONDECOR_TTY_MAP="1:tty1 2:tty2 3:tty3 4:tty4 5:tty5 6:tty6"
-
diff --git a/templates/system/openrc/conf.d/keymaps b/templates/system/openrc/conf.d/keymaps
deleted file mode 100644
index 16a76a2..0000000
--- a/templates/system/openrc/conf.d/keymaps
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calculate comment=#
-
-KEYMAP="#-os_install_locale_keymap-#"
-SET_WINDOWSKEYS="yes"
-EXTENDED_KEYMAPS=""
-DUMPKEYS_CHARSET="#-os_install_locale_dumpkeys-#"
diff --git a/templates/system/openrc/conf.d/local.start b/templates/system/openrc/conf.d/local.start
deleted file mode 100644
index 2cc2a68..0000000
--- a/templates/system/openrc/conf.d/local.start
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate os_install_root_type==ram
-#переведем системное время на livecd
-hwclock --hctosys
-
diff --git a/templates/system/openrc/env.d/02locale b/templates/system/openrc/env.d/02locale
deleted file mode 100644
index 1408eea..0000000
--- a/templates/system/openrc/env.d/02locale
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=#
-
-LANG="#-os_install_locale_locale-#"
-LC_NUMERIC=POSIX
-
diff --git a/templates/system/openrc/init.d/net.eth0 b/templates/system/openrc/init.d/net.eth0
deleted file mode 100644
index 9750694..0000000
--- a/templates/system/openrc/init.d/net.eth0
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(net-misc/wicd)== link=net.lo symbolic
diff --git a/templates/system/openssh/.calculate_directory b/templates/system/openssh/.calculate_directory
deleted file mode 100644
index ed802ea..0000000
--- a/templates/system/openssh/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(net-misc/openssh)!= name=etc
-
diff --git a/templates/system/openssh/default/.calculate_directory b/templates/system/openssh/default/.calculate_directory
deleted file mode 100644
index 982ed77..0000000
--- a/templates/system/openssh/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate os_install_root_type!=livecd path=/etc/runlevels
-
diff --git a/templates/system/openssh/default/sshd b/templates/system/openssh/default/sshd
deleted file mode 100644
index 2594411..0000000
--- a/templates/system/openssh/default/sshd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/sshd symbolic
diff --git a/templates/system/openssh/ssh/ssh_config b/templates/system/openssh/ssh/ssh_config
deleted file mode 100644
index 3631fe2..0000000
--- a/templates/system/openssh/ssh/ssh_config
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=squid
-SendEnv LANG LC_*
-
diff --git a/templates/system/openssh/ssh/sshd_config b/templates/system/openssh/ssh/sshd_config
deleted file mode 100644
index b028bf8..0000000
--- a/templates/system/openssh/ssh/sshd_config
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=squid os_install_linux_system==desktop
-DenyUsers guest
-
diff --git a/templates/system/pambase/.calculate_directory b/templates/system/pambase/.calculate_directory
deleted file mode 100644
index ae1daf6..0000000
--- a/templates/system/pambase/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-auth/pambase)!= path=/etc name=pam.d
-
diff --git a/templates/system/pambase/system-login b/templates/system/pambase/system-login
deleted file mode 100644
index 73a8d56..0000000
--- a/templates/system/pambase/system-login
+++ /dev/null
@@ -1,20 +0,0 @@
-# Calculate comment=#
-
-auth required pam_tally.so file=/var/log/faillog onerr=succeed
-auth required pam_shells.so
-auth required pam_nologin.so
-auth include system-auth
-
-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 optional pam_lastlog.so
-session include system-auth
-#session optional pam_motd.so motd=/etc/motd
-session optional pam_mail.so
-
diff --git a/templates/system/portage/.calculate_directory b/templates/system/portage/.calculate_directory
deleted file mode 100644
index 80a6eed..0000000
--- a/templates/system/portage/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/portage)!= name=etc
-
diff --git a/templates/system/portage/make.conf b/templates/system/portage/make.conf
deleted file mode 100644
index 76d0feb..0000000
--- a/templates/system/portage/make.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Calculate comment=#
-#-------------------------
-# basic options assemblies
-#-------------------------
-#language support
-LINGUAS="#-os_install_linguas-#"
-#accept license packages net-wireless/broadcom-sta, dev-java/sun-jdk and other
-ACCEPT_LICENSE="*"
-#connect layman for include calculate overlay
-source /var/lib/layman/make.conf
-
-#-----------------------------------------------------------
-# optimized settings for compiling packages on your computer
-#-----------------------------------------------------------
-#CFLAGS="-O2 -march=native -pipe"
-#CXXFLAGS="${CFLAGS}"
-
-#----------------------------------
-# compile-time option to accelerate
-#----------------------------------
-MAKEOPTS="#-os_install_makeopts-#"
-EMERGE_DEFAULT_OPTS="--jobs=4"
-
diff --git a/templates/system/splashutils/.calculate_directory b/templates/system/splashutils/.calculate_directory
deleted file mode 100644
index 15cf2ba..0000000
--- a/templates/system/splashutils/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(media-gfx/splashutils)!= name=etc
-
diff --git a/templates/system/splashutils/conf.d/splash b/templates/system/splashutils/conf.d/splash
deleted file mode 100644
index a715a17..0000000
--- a/templates/system/splashutils/conf.d/splash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate format=procmail
-SPLASH_VERBOSE_ON_ERRORS="no"
diff --git a/templates/system/splashutils/default/.calculate_directory b/templates/system/splashutils/default/.calculate_directory
deleted file mode 100644
index 0f7257b..0000000
--- a/templates/system/splashutils/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/templates/system/splashutils/default/fbcondecor b/templates/system/splashutils/default/fbcondecor
deleted file mode 100644
index 8cbfc41..0000000
--- a/templates/system/splashutils/default/fbcondecor
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/fbcondecor symbolic
diff --git a/templates/system/sudo/.calculate_directory b/templates/system/sudo/.calculate_directory
deleted file mode 100644
index 1d3703f..0000000
--- a/templates/system/sudo/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(app-admin/sudo)!= name=etc
-
diff --git a/templates/system/sudo/sudoers b/templates/system/sudo/sudoers
deleted file mode 100644
index 04fa6e2..0000000
--- a/templates/system/sudo/sudoers
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate comment=#
-
-Defaults env_reset
-root ALL=(ALL) ALL
-%vboxusers ALL=NOPASSWD:/sbin/modprobe vboxdrv
diff --git a/templates/system/sysvinit/.calculate_directory b/templates/system/sysvinit/.calculate_directory
deleted file mode 100644
index 2e93993..0000000
--- a/templates/system/sysvinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/sysvinit)!=&&cl_pass_action==install name=etc
-
diff --git a/templates/system/sysvinit/inittab b/templates/system/sysvinit/inittab
deleted file mode 100644
index a6a04f3..0000000
--- a/templates/system/sysvinit/inittab
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# /etc/inittab: This file describes how the INIT process should set up
-# the system in a certain run-level.
-#
-# Author: Miquel van Smoorenburg,
-# Modified by: Patrick J. Volkerding,
-# Modified by: Daniel Robbins,
-# Modified by: Martin Schlemmer,
-# Modified by: Mike Frysinger,
-# Modified by: Robin H. Johnson,
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown
-l0s:0:wait:/sbin/halt -dhp
-l1:1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-l6r:6:wait:/sbin/reboot -dk
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/rc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# extra at boot if /etc/init.d/xdm is not added
-# to the "default" runlevel.
-x:a:once:/etc/X11/startDM.sh
-
diff --git a/templates/system/vim/.calculate_directory b/templates/system/vim/.calculate_directory
deleted file mode 100644
index de062e2..0000000
--- a/templates/system/vim/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(app-editors/vim)!= path=/etc name=env.d
-
diff --git a/templates/system/vim/99editor b/templates/system/vim/99editor
deleted file mode 100644
index 67150f5..0000000
--- a/templates/system/vim/99editor
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate comment=#
-
-EDITOR="/usr/bin/vim"
-
diff --git a/templates/system/vixie-cron/.calculate_directory b/templates/system/vixie-cron/.calculate_directory
deleted file mode 100644
index d5b4caf..0000000
--- a/templates/system/vixie-cron/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-process/vixie-cron)!= name=etc
-
diff --git a/templates/system/vixie-cron/default/.calculate_directory b/templates/system/vixie-cron/default/.calculate_directory
deleted file mode 100644
index 0f7257b..0000000
--- a/templates/system/vixie-cron/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/templates/system/vixie-cron/default/xdm b/templates/system/vixie-cron/default/xdm
deleted file mode 100644
index 775cf66..0000000
--- a/templates/system/vixie-cron/default/xdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/vixie-cron symbolic
diff --git a/templates/system/wicd/.calculate_directory b/templates/system/wicd/.calculate_directory
deleted file mode 100644
index ae0f873..0000000
--- a/templates/system/wicd/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(net-misc/wicd)!= path=/etc
-
diff --git a/templates/system/wicd/boot/.calculate_directory b/templates/system/wicd/boot/.calculate_directory
deleted file mode 100644
index 0f7257b..0000000
--- a/templates/system/wicd/boot/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/templates/system/wicd/boot/wicd b/templates/system/wicd/boot/wicd
deleted file mode 100644
index bce00e2..0000000
--- a/templates/system/wicd/boot/wicd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/wicd symbolic
diff --git a/templates/system/wicd/ip-down.sh b/templates/system/wicd/ip-down.sh
deleted file mode 100644
index 05a7907..0000000
--- a/templates/system/wicd/ip-down.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-
diff --git a/templates/system/wicd/ip-up.sh b/templates/system/wicd/ip-up.sh
deleted file mode 100644
index 05a7907..0000000
--- a/templates/system/wicd/ip-up.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-
diff --git a/templates/system/wicd/wired-settings.conf b/templates/system/wicd/wired-settings.conf
deleted file mode 100644
index 432be93..0000000
--- a/templates/system/wicd/wired-settings.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate comment=#
-
-[wired-default]
-afterscript = /etc/wicd/ip-up.sh
-use_static_dns = False
-dns3 = None
-ip = None
-dns1 = None
-broadcast = None
-default = True
-netmask = None
-dns2 = None
-beforescript = None
-disconnectscript = /etc/wicd/ip-down.sh
-gateway = None
-use_global_dns = False
-
diff --git a/templates/system/xfce-utils/.calculate_directory b/templates/system/xfce-utils/.calculate_directory
deleted file mode 100644
index b5d6d2a..0000000
--- a/templates/system/xfce-utils/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(xfce-base/xfce-utils)!= path=/etc name=env.d
-
diff --git a/templates/system/xfce-utils/90xsession b/templates/system/xfce-utils/90xsession
deleted file mode 100644
index 617e8a7..0000000
--- a/templates/system/xfce-utils/90xsession
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate comment=#
-
-#?pkg(kde-base/kdebase-startkde)!=#
-XSESSION="KDE-4"
-#pkg#
-#?pkg(kde-base/kdebase-startkde)==&&pkg(gnome-base/gnome-session)!=#
-XSESSION="Gnome"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)!=#
-XSESSION="Xfce4"
-#pkg#
-#?pkg(kde-base/ksmserver)==&&pkg(gnome-base/gnome-session)==&&pkg(xfce-base/xfce-utils)==&&pkg(x11-wm/openbox)!=#
-XSESSION="openbox"
-#pkg#
diff --git a/templates/system/xinit/.calculate_directory b/templates/system/xinit/.calculate_directory
deleted file mode 100644
index a3a1c4e..0000000
--- a/templates/system/xinit/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(x11-apps/xinit)!= name=etc
-
diff --git a/templates/system/xinit/conf.d/xdm b/templates/system/xinit/conf.d/xdm
deleted file mode 100644
index 5437f33..0000000
--- a/templates/system/xinit/conf.d/xdm
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate comment=#
-
-CHECKVT=7
-#?pkg(kde-base/kdm)!=#
-DISPLAYMANAGER="kdm"
-#pkg#
-#?pkg(gnome-base/gdm)!=#
-DISPLAYMANAGER="gdm"
-#pkg#
-#?pkg(x11-misc/slim)!=#
-DISPLAYMANAGER="slim"
-#pkg#
diff --git a/templates/system/xorg-server/.calculate_directory b/templates/system/xorg-server/.calculate_directory
deleted file mode 100644
index 4186b43..0000000
--- a/templates/system/xorg-server/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(x11-base/xorg-server)!= name=etc
-
diff --git a/templates/system/xorg-server/X11/xorg.conf b/templates/system/xorg-server/X11/xorg.conf
deleted file mode 100644
index 48e39eb..0000000
--- a/templates/system/xorg-server/X11/xorg.conf
+++ /dev/null
@@ -1,107 +0,0 @@
-# Calculate comment=#
-
-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"
- #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!=vesa&&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&&os_install_x11_video_drv!=vmware&&os_install_x11_video_drv!=vboxvideo#
-EndSection
-#os_install_x11_video_drv#
diff --git a/templates/system/xorg-server/default/.calculate_directory b/templates/system/xorg-server/default/.calculate_directory
deleted file mode 100644
index 0f7257b..0000000
--- a/templates/system/xorg-server/default/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
diff --git a/templates/system/xorg-server/default/xdm b/templates/system/xorg-server/default/xdm
deleted file mode 100644
index 040bbf0..0000000
--- a/templates/system/xorg-server/default/xdm
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/xdm symbolic