diff --git a/eclass/calculate.eclass b/eclass/calculate.eclass
new file mode 100644
index 000000000..d1733e261
--- /dev/null
+++ b/eclass/calculate.eclass
@@ -0,0 +1,85 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+# @FUNCTION: calculate_update_kernel
+# @USAGE: [kernelname] [kernelversion] [destination]
+# @DESCRIPTION:
+# Make symbolic link to vmlinuz, preserve old vmlinuz
+# Copy initramfs to initrd and initrd-install
+calculate_update_kernel() {
+	kname=$1
+	kversion=$2
+	dir=$3
+
+	# update vmlinuz
+	[ -f ${dir}/vmlinuz ] && rm -f ${dir}/vmlinuz.old && 
+		mv ${dir}/vmlinuz	${dir}/vmlinuz.old
+	ln -sf "linux-${kname}-${kversion}-calculate" ${dir}/vmlinuz
+	# update initrd
+	[ -f ${dir}/initrd ] && rm -f ${dir}/initrd.old &&
+		mv ${dir}/initrd ${dir}/initrd.old
+	cp ${dir}/initramfs-${kname}-${kversion}-calculate ${dir}/initrd
+	# update initrd-install
+	[ -f ${dir}/initrd-install ] && rm -f ${dir}/initrd-install.old &&
+		mv ${dir}/initrd-install ${dir}/initrd-install.old
+	cp ${dir}/initramfs-${kname}-${kversion}-calculate ${dir}/initrd-install
+}
+
+TMP_INITRAMFS=${T}/initramfs
+SPLASH_DESCRIPTOR=/etc/splash/tty1/1024x768.cfg
+
+initramfs_unpack() {
+	mkdir -p ${TMP_INITRAMFS}
+	cd ${TMP_INITRAMFS}
+	# select arch
+	UNPACKER="gzip"
+	lzma -dc ${BOOT_DIR}/$1 &>/dev/null && UNPACKER="lzma"
+	# unpack initramfs
+	gzip -dc ${BOOT_DIR}/$1 | cpio -di &>/dev/null
+	return $?
+}
+
+initramfs_change_spalsh() {
+	if [ -f ${SPLASH_DESCRIPTOR} ]
+	then
+		# get silentpic param
+		SILENTPIC=$( sed -nr '/^silentpic/ s/^[^=]+=(.*)$/\1/p' \
+			${SPLASH_DESCRIPTOR} )
+		# get pic param
+		PIC=$( sed -nr '/^pic/ s/^[^=]+=(.*)$/\1/p' \
+			${SPLASH_DESCRIPTOR} )
+		if [ -f ${SILENTPIC} ] && [ -f ${PIC} ]
+		then
+			cp ${SPLASH_DESCRIPTOR} \
+					${TMP_INITRAMFS}${SPLASH_DESCRIPTOR} &&
+				mkdir -p ${TMP_INITRAMFS}${SILENTPIC%$(basename $SILENTPIC)} &&
+				cp $SILENTPIC ${TMP_INITRAMFS}${SILENTPIC} &&
+				mkdir -p ${TMP_INITRAMFS}${PIC%$(basename $PIC)} &&
+				cp $PIC ${TMP_INITRAMFS}${PIC}
+			return $?
+		fi
+	else
+		return 1
+	fi
+}
+
+initramfs_pack() {
+	# pack new initramfs
+	cd ${TMP_INITRAMFS}
+	find * | cpio -o --quiet -H newc | gzip -9 >${BOOT_DIR}/$1.new
+	# remove old initramfs
+	rm ${BOOT_DIR}/$1
+	mv ${BOOT_DIR}/$1.new ${BOOT_DIR}/$1
+}
+
+# @FUNCTION: calculate_update_splash
+# @USAGE: [initramfsfile]
+# @DESCRIPTION:
+# Install into initramfs splash data, which descripted by
+# /etc/splash/tty1/1024x768.cfg
+calculate_update_splash() {
+	einfo "Update splash screen"
+	initramfs_unpack $1 &&
+	initramfs_change_spalsh && initramfs_pack $1
+}
diff --git a/media-gfx/cds-themes/ChangeLog b/media-gfx/cds-themes/ChangeLog
index b7c228eee..536af8b7d 100644
--- a/media-gfx/cds-themes/ChangeLog
+++ b/media-gfx/cds-themes/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cds-themes-10.0.1 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +cds-themes-10.0.1.ebuild:
+  Version bump. Add update boot splash.
+
   23 Nov 2009; Mike Hirecky (mhiretskiy) <mh@calculate.ru>
   +cds-themes-10.0.ebuild:
   Themes for Calculate Directory Server 10.0 moved from calculate-cds-themes
diff --git a/media-gfx/cds-themes/Manifest b/media-gfx/cds-themes/Manifest
index d73061d51..322b15590 100644
--- a/media-gfx/cds-themes/Manifest
+++ b/media-gfx/cds-themes/Manifest
@@ -1,4 +1,5 @@
 DIST cds-themes-10.0.tar.bz2 277813 RMD160 0d8bfaf3ae8c43e175a19153cff0077d60a5b1bd SHA1 a537c4bf88776856a48c9de7616ac1bfd4a2fc34 SHA256 e4ee1aa46435a46f7aa95a0fb3dc068997076fa412e2f0a364ca086a29c1b579
+EBUILD cds-themes-10.0.1.ebuild 627 RMD160 ddc41f619ead3b115e5540cc82097985a16f99cd SHA1 cf6018441850b4a7cdf24ab242189a12eaa805a4 SHA256 327dcfb4a8bd6068402ead5ccdad9bb4771bc4b4fa51ec835d4cc9a8a50b9159
 EBUILD cds-themes-10.0.ebuild 473 RMD160 4861a4c8867b53f17866395f1a9a67ae5fa75e70 SHA1 f4d4405ba31d749fb602f1987e72d6f749490ca5 SHA256 cfd5bdde1398569dbea7d6799f0a6d778f8772d5570c3e83574a143753a9ab98
-MISC ChangeLog 284 RMD160 d8e19f56dc4210208d7a33ad5217108a95b30adb SHA1 d2cc1d70e5e0f9d82d9144a589fb0e4241f5441c SHA256 fc15c001e16da0c46e57759f1a48a42856ddd71b06b8536dd42be290eb0df5f2
+MISC ChangeLog 448 RMD160 20431a4e50d0c60bfaa5b8caabd0b96ab21eee2a SHA1 75cb2ba4000a667a267e1a908673c4f6dcb46aaa SHA256 ebbcffbf9a5e8d94080f9e07c4b16e5983b567695a1afd0ee52e9aa752253940
 MISC metadata.xml 259 RMD160 1b270d593092c8aa933eee383cc7faba8c979b88 SHA1 f11a78e0617a73b31ae83fa0689ccf35123ccd67 SHA256 a48a8a79d95d6ff3534bee46a101bfc3b38c25e4d3c72e336c7e8388616d9a91
diff --git a/media-gfx/cds-themes/cds-themes-10.0.1.ebuild b/media-gfx/cds-themes/cds-themes-10.0.1.ebuild
new file mode 100644
index 000000000..4698716c5
--- /dev/null
+++ b/media-gfx/cds-themes/cds-themes-10.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+inherit calculate
+
+DESCRIPTION="The theme for Calculate Directory Server"
+HOMEPAGE="http://www.calculate-linux.org/calcualte-cds-themes"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-10.0.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!media-gfx/calculate-cds-themes"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cd ${WORKDIR}/${PN}-10.0
+	insinto /
+	doins -r .
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initrd
+	calculate_update_splash /boot/initrd-install
+}
diff --git a/media-gfx/cld-themes/ChangeLog b/media-gfx/cld-themes/ChangeLog
index 0c3ce0f3c..9b610e3a4 100644
--- a/media-gfx/cld-themes/ChangeLog
+++ b/media-gfx/cld-themes/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cld-themes-10.0.1 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +cld-themes-10.0.1.ebuild:
+  Version bump. Add update boot splash.
+
   02 Dec 2009; Mike Hirecky (mhiretskiy) <mh@calculate.ru>
   cld-themes-10.0-r1.ebuild:
   Fix dependens.
diff --git a/media-gfx/cld-themes/Manifest b/media-gfx/cld-themes/Manifest
index bb6913d54..6c01f91cd 100644
--- a/media-gfx/cld-themes/Manifest
+++ b/media-gfx/cld-themes/Manifest
@@ -1,4 +1,5 @@
 DIST cld-themes-10.0.tar.bz2 20541271 RMD160 73d344b9534919c35e12b079ea7956719a0483e5 SHA1 ad3b0ded0bf469ef089a3450e5d84aaa2c33e2b3 SHA256 f6c62fb7155381238f0ffd66f9345cc313c18761d9f8f5d832df1c8018f55e8b
 EBUILD cld-themes-10.0-r1.ebuild 2095 RMD160 cbbb5720dacbf56eb5998fc61a3d252111865556 SHA1 0a7864a38d04f84879801075e41cbf7a0ec7dfec SHA256 52b5880d37c79fa43f1401b0a096f9aa6803e18e95fb5bc79e3a4cc5ae2503de
-MISC ChangeLog 436 RMD160 953f6648e39d022feec82f32fd58613a3ee8281b SHA1 55dcf236f20a567ffb2fbb40584802ab143caa70 SHA256 99b600b1c5bfbd99a20c30ec2b7b7d7cd75a5b37b5d2b586a10bf80a46431b76
+EBUILD cld-themes-10.0.1.ebuild 2214 RMD160 96916c137c15f80dce070b14b40f0701f827e62c SHA1 2530b9398f88250357de3769df0ee45abb51fbb1 SHA256 841c2c4987d076d212d1c313152ba7d715212ab735a2a212873d00881b6fb421
+MISC ChangeLog 600 RMD160 9885471c9772475aa1395bf00f45ddc2e8f54d8f SHA1 72588bd49ddcfdbf6d3a4b60ac324dfef049a776 SHA256 6b484edafbecf039d6c0546154d9c3ee0f74248091c90e8fa09e514eb0584037
 MISC metadata.xml 260 RMD160 59c747eaacafdcd25e3ff8c6a015d7b6879ff2c6 SHA1 bbc63bb4cd46fe301ef559f8945c614c338e5193 SHA256 7c0be206f5d6dd3bc91b97f691127a424cce958a1249ab726467278de23455e7
diff --git a/media-gfx/cld-themes/cld-themes-10.0.1.ebuild b/media-gfx/cld-themes/cld-themes-10.0.1.ebuild
new file mode 100644
index 000000000..b8455d433
--- /dev/null
+++ b/media-gfx/cld-themes/cld-themes-10.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit calculate
+
+DESCRIPTION="The theme for Calculate Linux Desktop KDE"
+HOMEPAGE="http://www.calculate-linux.org/calcualte-cld-themes"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-10.0.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!media-gfx/calculate-cldx-themes
+		!media-gfx/calculate-cld-themes
+		!media-gfx/cldx-themes"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cd ${WORKDIR}/${PN}-10.0
+	insinto /
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashPt/400x300
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashDe/400x300
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashEs/400x300
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashFr/400x300
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashRu/400x300
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashUk/400x300
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashIt/400x300
+	dosym ../CalculateSplashEn/400x300 \
+		/usr/share/apps/ksplash/Themes/CalculateSplashPl/400x300
+	dosym ../icons/Calculate/40x40/apps/1c.png \
+		/usr/share/pixmaps/1c.png
+	dosym ../icons/Calculate/40x40/apps/autocad.png \
+		/usr/share/pixmaps/autocad.png
+	dosym ../icons/Calculate/40x40/apps/corel.png \ /usr/share/pixmaps/corel.png
+	dosym ../icons/Calculate/40x40/apps/illustrator.png \
+		/usr/share/pixmaps/illustrator.png
+	dosym ../icons/Calculate/40x40/apps/photoshop.png \
+		/usr/share/pixmaps/photoshop.png
+	dosym ../icons/Calculate/40x40/apps/topplan.png \
+		/usr/share/pixmaps/topplan.png
+	dosym ../icons/Calculate/40x40/apps/windows.png \
+		/usr/share/pixmaps/windows.png
+	dosym ../icons/Calculate/40x40/apps/yellow.png \
+		/usr/share/pixmaps/yellow.png
+	dosym start-here-kde.svgz \
+		/usr/share/icons/Calculate/scalable/places/kde.svgz
+	doins -r .
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initrd
+	calculate_update_splash /boot/initrd-install
+}
diff --git a/media-gfx/cldg-themes/ChangeLog b/media-gfx/cldg-themes/ChangeLog
index 188a8e1c2..03d7b2a9f 100644
--- a/media-gfx/cldg-themes/ChangeLog
+++ b/media-gfx/cldg-themes/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cldg-themes-10.0.1 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +cldg-themes-10.0.1.ebuild:
+  Version bump. Add update boot splash.
+
 *cldg-themes-10.0 (04 Dec 2009)
 
   04 Dec 2009; Mike Hirecky (mhiretskiy) <mh@calculate.ru>
diff --git a/media-gfx/cldg-themes/Manifest b/media-gfx/cldg-themes/Manifest
index 32b5fb2da..ebbacd775 100644
--- a/media-gfx/cldg-themes/Manifest
+++ b/media-gfx/cldg-themes/Manifest
@@ -1,4 +1,5 @@
 DIST cldg-themes-10.0.tar.bz2 18610165 RMD160 b7c5514a9c1ec011a84216183f83f239644a0137 SHA1 c2de9d1cb81cf6cc8bde107853fd7e2f2ed41c9d SHA256 2f4bdfc2287af7232c597047e254bdcce0daeeab210c1a1e89c143dcee88a37e
+EBUILD cldg-themes-10.0.1.ebuild 1466 RMD160 fe72bef04a3578bcc037428542ef8dd13f63843d SHA1 53ea394476a6e7c80818986c261932e2924929d9 SHA256 c29ed5621d334475681c32a66a94fee6a8a6bf52f9de25f00031994b2504eed2
 EBUILD cldg-themes-10.0.ebuild 1329 RMD160 83b4fe1887cdd4e87af639948c3d755ef0ceb8ee SHA1 e8ea5cfcd1139760e460d148819ff68b719576a7 SHA256 ebe720efd92840d1d86aff132e511dd6a0be678fcc875d5a881e98ae01f9a9b3
-MISC ChangeLog 274 RMD160 7353c7845d9ac0081ce5674dfe6ccce6f6402e1b SHA1 3620d68be2967899e4d74360ae5d1dce59b04e65 SHA256 c780edd2c58e36fcc7f470fd3b9c85ac6de4a0b2d45d52126b8b8befac79119b
+MISC ChangeLog 440 RMD160 b7a3b4ad67eb1eab8b161aa66474dc471e484f30 SHA1 506ee259c03a2c38ead305d5324bf9b7faae8333 SHA256 b4760ee71b0518c874f1717c3cc55cb2ceb6ec4cce4f8ca3b5febbb92439db46
 MISC metadata.xml 262 RMD160 663e84f074fee7b06b0e8133fba6e5ef19e25c75 SHA1 4446020395d787f939246f39767f8633ea931a5e SHA256 e3852964a15875d8ea9ef0b30f6aba61440a7ecac12edc6e558bfdbc7f0aee3e
diff --git a/media-gfx/cldg-themes/cldg-themes-10.0.1.ebuild b/media-gfx/cldg-themes/cldg-themes-10.0.1.ebuild
new file mode 100644
index 000000000..8a2d52512
--- /dev/null
+++ b/media-gfx/cldg-themes/cldg-themes-10.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit calculate
+
+DESCRIPTION="The theme for Calculate Linux Desktop CLDG"
+HOMEPAGE="http://www.calculate-linux.org/calcualte-cldg-themes"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-10.0.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!media-gfx/calculate-cldx-themes
+		!media-gfx/calculate-cld-themes
+		!media-gfx/cldx-themes
+		!media-gfx/cld-themes"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cd ${WORKDIR}/${PN}-10.0
+	insinto /
+	dosym ../icons/Calculate/40x40/apps/1c.png \
+		/usr/share/pixmaps/1c.png
+	dosym ../icons/Calculate/40x40/apps/autocad.png \
+		/usr/share/pixmaps/autocad.png
+	dosym ../icons/Calculate/40x40/apps/corel.png \
+		/usr/share/pixmaps/corel.png
+	dosym ../icons/Calculate/40x40/apps/illustrator.png \
+		/usr/share/pixmaps/illustrator.png
+	dosym ../icons/Calculate/40x40/apps/photoshop.png \
+		/usr/share/pixmaps/photoshop.png
+	dosym ../icons/Calculate/40x40/apps/topplan.png \
+		/usr/share/pixmaps/topplan.png
+	dosym ../icons/Calculate/40x40/apps/windows.png \
+		/usr/share/pixmaps/windows.png
+	dosym ../icons/Calculate/40x40/apps/yellow.png \
+		/usr/share/pixmaps/yellow.png
+	dosym start-here-kde.svgz \
+		/usr/share/icons/Calculate/scalable/places/kde.svgz
+	doins -r .
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initrd
+	calculate_update_splash /boot/initrd-install
+}
diff --git a/media-gfx/cldx-themes/ChangeLog b/media-gfx/cldx-themes/ChangeLog
index dcc5590d6..f8c9d21cc 100644
--- a/media-gfx/cldx-themes/ChangeLog
+++ b/media-gfx/cldx-themes/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cldx-themes-10.0.1 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +cldx-themes-10.0.1.ebuild:
+  Version bump. Add update boot splash.
+
   02 Dec 2009; Mike Hirecky (mhiretskiy) <mh@calculate.ru>
   cldx-themes-10.0.ebuild:
   Fix dependence.
diff --git a/media-gfx/cldx-themes/Manifest b/media-gfx/cldx-themes/Manifest
index 93c03438d..078a42251 100644
--- a/media-gfx/cldx-themes/Manifest
+++ b/media-gfx/cldx-themes/Manifest
@@ -1,4 +1,5 @@
 DIST cldx-themes-10.0.tar.bz2 18658254 RMD160 bd85bde89e20c14ad9288b9989b00f54633921da SHA1 0903f0d27772ecd8e3386a15e8e9666341ff7ef0 SHA256 5a6b1f8ef6ad55ab7fe5971b3cb20464feaad28d8d55b5590583758bd909bfe9
+EBUILD cldx-themes-10.0.1.ebuild 1325 RMD160 dfc1c992b5eac822ebd8c630ba5bc46c9ebda0ae SHA1 03ab92cd85edc77d46293688909e9fd499759d76 SHA256 feec2c08a4999d50d96ddf9587ce0282847bc32877076832190c6bb6abee3d30
 EBUILD cldx-themes-10.0.ebuild 1178 RMD160 4ff181459be9fbfdbebc7b957af0a697750c437e SHA1 c5620ce967e379ecb14eb014e088260456c28a70 SHA256 47fb785113b2eb10c3e409eec2ee16a71f4531ee30370f68e94534df3d289417
-MISC ChangeLog 394 RMD160 2e5ddd3425ae3d77b55b9258c94c45fb116e926c SHA1 91f185a0dccb55faa950ee1884cd4b7c8849db4d SHA256 362c8934f87fd5c2fab0f8cb38b9a353f69a3fdce6cb8d78fcbd35e56eb51cf1
+MISC ChangeLog 560 RMD160 8050fb1dabc54640fa18ed8daa0da371cc686191 SHA1 0c6eb12d48c9612220d6dd186efd7d2bc1351a9d SHA256 2879119f623ed88b609d81166249b365b8ea923fab97d4874883ed8136f0ecd7
 MISC metadata.xml 261 RMD160 780ef31c45327481235a981f2595b7a20c84bea7 SHA1 8dab799571d6f6a3ae1fc5df00b2a1467baecbba SHA256 e53f2cc5c63713f127f04a8bb2430c6f2b17da1825772a993f170268352a5858
diff --git a/media-gfx/cldx-themes/cldx-themes-10.0.1.ebuild b/media-gfx/cldx-themes/cldx-themes-10.0.1.ebuild
new file mode 100644
index 000000000..2ac6ad851
--- /dev/null
+++ b/media-gfx/cldx-themes/cldx-themes-10.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit calculate
+
+DESCRIPTION="The theme for Calculate Linux Desktop XFCE"
+HOMEPAGE="http://www.calculate-linux.org/calcualte-cldx-themes"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-10.0.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!media-gfx/calculate-cldx-themes
+		!media-gfx/calculate-cld-themes
+		!media-gfx/cld-themes"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cd ${WORKDIR}/${PN}-10.0
+	insinto /
+	dosym ../icons/Calculate/40x40/apps/1c.png /usr/share/pixmaps/1c.png
+	dosym ../icons/Calculate/40x40/apps/autocad.png /usr/share/pixmaps/autocad.png
+	dosym ../icons/Calculate/40x40/apps/corel.png /usr/share/pixmaps/corel.png
+	dosym ../icons/Calculate/40x40/apps/illustrator.png /usr/share/pixmaps/illustrator.png
+	dosym ../icons/Calculate/40x40/apps/photoshop.png /usr/share/pixmaps/photoshop.png
+	dosym ../icons/Calculate/40x40/apps/topplan.png /usr/share/pixmaps/topplan.png
+	dosym ../icons/Calculate/40x40/apps/windows.png /usr/share/pixmaps/windows.png
+	dosym ../icons/Calculate/40x40/apps/yellow.png /usr/share/pixmaps/yellow.png
+	doins -r .
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initrd
+	calculate_update_splash /boot/initrd-install
+}
diff --git a/media-gfx/cls-themes/ChangeLog b/media-gfx/cls-themes/ChangeLog
index a4c29ba2f..3100ecd97 100644
--- a/media-gfx/cls-themes/ChangeLog
+++ b/media-gfx/cls-themes/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cls-themes-10.0.1 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +cls-themes-10.0.1.ebuild:
+  Version bump. Add update boot splash.
+
   02 Dec 2009; Mike Hirecky (mhiretskiy) <mh@calculate.ru>
   cls-themes-10.0.ebuild:
   Fix dependence.
diff --git a/media-gfx/cls-themes/Manifest b/media-gfx/cls-themes/Manifest
index 33505462b..64cbb92a3 100644
--- a/media-gfx/cls-themes/Manifest
+++ b/media-gfx/cls-themes/Manifest
@@ -1,4 +1,5 @@
 DIST cls-themes-10.0.tar.bz2 197763 RMD160 b7e5d3eb1aae3f5a9ce2c5b30e4d80353f89e95f SHA1 8f1c845cbca3403d2dc3116fae7460736b94a50e SHA256 1a8290b500497c1c5f584ebafc9177f255a7fa561f2950f4a04a89fc8ba5302b
+EBUILD cls-themes-10.0.1.ebuild 615 RMD160 32dfacc81e2cc48f86219fbd23d6beafdccba06d SHA1 6d6b8fb2455313506ae492875e242cd19058916e SHA256 69c7067cafcfcfaed19b8f5953bdddd0a1d2fed2fdfcecdb016ed892891ec176
 EBUILD cls-themes-10.0.ebuild 460 RMD160 bab0eb9f62755d8c95be6d54467f592aacfa6ddc SHA1 47c0cbf19b2b4a4a449e93bf4781ebd91f381efe SHA256 95a2262076ebfc45b0a26e323d1da5b622855066abefc7d9021734eb522628f0
-MISC ChangeLog 386 RMD160 c1c82d5599b0e60a7deaceafd3943f60599495ed SHA1 7b30856f6b73f3621efc5618d7b74bca4ce899d4 SHA256 e0cc4fe0b9d85a3c7ee6e76e6fae7c67ae153421b0d256c0d788de794aab5e2f
+MISC ChangeLog 550 RMD160 f4081b4397de75b292c47eab6b5a0e212e34f1bb SHA1 ce15543760feb99f667cfbfb6c93198a2e73f3c8 SHA256 eb8b2961833f44a58156b9314b1f3eb2ff88da2e31a3519dec7be44b0adc0d6a
 MISC metadata.xml 256 RMD160 4d2932b17e710e22b4ef8d10d4efa8e29ec2f59e SHA1 af0b67b9e0e87272e68c6017cb83ba23f6c86c27 SHA256 721c3fbe7e755146d6767cdd14cff57bf8474852588e99630f70bf5a058df759
diff --git a/media-gfx/cls-themes/cls-themes-10.0.1.ebuild b/media-gfx/cls-themes/cls-themes-10.0.1.ebuild
new file mode 100644
index 000000000..7e95f259a
--- /dev/null
+++ b/media-gfx/cls-themes/cls-themes-10.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit calculate
+
+DESCRIPTION="The theme for Calculate Linux Scratch"
+HOMEPAGE="http://www.calculate-linux.org/cls-themes"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-10.0.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!media-gfx/calculate-cls-themes"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cd ${WORKDIR}/${PN}-10.0
+	insinto /
+	doins -r .
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initrd
+	calculate_update_splash /boot/initrd-install
+}
diff --git a/media-gfx/clsg-themes/ChangeLog b/media-gfx/clsg-themes/ChangeLog
index ceb157038..adb1095b3 100644
--- a/media-gfx/clsg-themes/ChangeLog
+++ b/media-gfx/clsg-themes/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*clsg-themes-10.0.1 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +clsg-themes-10.0.1.ebuild:
+  Version bump. Add update boot splash.
+
   02 Dec 2009; Mike Hirecky (mhiretskiy) <mh@calculate.ru>
   clsg-themes-10.0.ebuild:
   Fix dependence.
diff --git a/media-gfx/clsg-themes/Manifest b/media-gfx/clsg-themes/Manifest
index 5e65cbc3c..5d7628678 100644
--- a/media-gfx/clsg-themes/Manifest
+++ b/media-gfx/clsg-themes/Manifest
@@ -1,4 +1,5 @@
 DIST clsg-themes-10.0.tar.bz2 235951 RMD160 e2a1d7b959704f4c23aae351179a662d30c9b618 SHA1 6115a6936167f9d1b36a37a997f2fa3782007b08 SHA256 0806d260af9dffe86e7e5e0596a5a7be6415e70d6b5b26ae5797290441d30e72
+EBUILD clsg-themes-10.0.1.ebuild 632 RMD160 2d1d27304c27b84b99f74c172aee7151fb8b38ed SHA1 170ae4e79d82058f9f38e015b6076358e332b5e2 SHA256 430bec69b676a7e92678afcfe6ab819d3b47103dac0cee4248d271bdc77d465c
 EBUILD clsg-themes-10.0.ebuild 478 RMD160 b1df9143090644e886afe5702083f5df217ca971 SHA1 801f9209e247f04805979d4dcf041deb3d26a0c9 SHA256 69b4f385fdbfccce1a61640afb37e1304731a25e5ddd9d4de567cdc271aa2de3
-MISC ChangeLog 395 RMD160 e56fd796098900d445bc6d44d1af69a79a3bc5eb SHA1 0b5e8aa2dcae5632aef4c0f1ce938b5e81222cea SHA256 0a20f6688c35521316dfb5b3365934e18d4183ad5634619751e175b936092c94
+MISC ChangeLog 561 RMD160 b22631548e61c46a5993d014a7471f68380947f2 SHA1 e28e378abcb3f2338c8f75fd2ea74097d595e427 SHA256 205114e88132a59823e32c04c049e99c5211ffb25d6408fd6b1d72c4f41c07c4
 MISC metadata.xml 262 RMD160 9329ba126b64e8987437a38872146fb0d73f3ff0 SHA1 f007f466eeeed3a1b08470837cbbd420d9adfea6 SHA256 6a5a0de954c7b48aac1bf0a68303a1555cc2c61277e4a5955adf258c6968fe72
diff --git a/media-gfx/clsg-themes/clsg-themes-10.0.1.ebuild b/media-gfx/clsg-themes/clsg-themes-10.0.1.ebuild
new file mode 100644
index 000000000..f13036ba3
--- /dev/null
+++ b/media-gfx/clsg-themes/clsg-themes-10.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+inherit calculate
+
+DESCRIPTION="The theme for Calculate Linux Scratch GNOME"
+HOMEPAGE="http://www.calculate-linux.org/calcualte-clsg-themes"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-10.0.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!media-gfx/calculate-clsg-themes"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cd ${WORKDIR}/${PN}-10.0
+	insinto /
+	doins -r .
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initrd
+	calculate_update_splash /boot/initrd-install
+}
diff --git a/metadata/.gitignore b/metadata/.gitignore
new file mode 100644
index 000000000..14d86ad62
--- /dev/null
+++ b/metadata/.gitignore
@@ -0,0 +1 @@
+/cache
diff --git a/metadata/layout.conf b/metadata/layout.conf
new file mode 100644
index 000000000..d43e61cad
--- /dev/null
+++ b/metadata/layout.conf
@@ -0,0 +1 @@
+masters = gentoo
diff --git a/profiles/package.mask b/profiles/package.mask
index 8d3cef3c9..9bdb8e2b4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -4,3 +4,5 @@
 =sys-apps/calculate-lib-9999
 =sys-apps/calculate-server-9999
 
+sys-kernel/linux-desktop
+sys-kernel/linux-server
diff --git a/sys-kernel/linux-desktop/ChangeLog b/sys-kernel/linux-desktop/ChangeLog
new file mode 100644
index 000000000..0600455ce
--- /dev/null
+++ b/sys-kernel/linux-desktop/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sys-kernel/linux-desktop
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*linux-desktop-2.6.31.7 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +linux-desktop-2.6.31.7.ebuild, +metadata.xml:
+  Add binary kernel for desktop.
+
diff --git a/sys-kernel/linux-desktop/Manifest b/sys-kernel/linux-desktop/Manifest
new file mode 100644
index 000000000..90b4bfa88
--- /dev/null
+++ b/sys-kernel/linux-desktop/Manifest
@@ -0,0 +1,4 @@
+DIST linux-desktop-i686-2.6.31.7.tar.bz2 19719354 RMD160 1c9531ab94c97e41da4ce6c8847b830c32263e31 SHA1 0e035db9c69f8639c11ae2b8ebfabb852af6ec33 SHA256 f051a67152c2fd83f1463bec1c5cb06cdab1d3d582f227cbcd2310132bd9e181
+EBUILD linux-desktop-2.6.31.7.ebuild 1672 RMD160 e894ab09ce687cb7a2990beed1df68c0dc79a304 SHA1 645df5b47fdcf732b87b2a5f6702b4120c6093f8 SHA256 0a639ac676e383a1530760bb41244bf424ecba4486a11b02b6f5dee2a6f31651
+MISC ChangeLog 307 RMD160 9f9a5a652d17089ff82e3dbda3e4a58e790540c5 SHA1 977fcbc7a3e3f99f02560ed62547459fbffac92b SHA256 97736af78c8f86a5e6517a318503b529140136c7b9b68fc0dbf941377bebec31
+MISC metadata.xml 301 RMD160 02bb86eab6405a3ef4c456cb74a1e75af6aa5908 SHA1 b175ee74e8df391d076f7eb5938f56a3b145ba14 SHA256 85b67abd7fbdbaf56de54b4d63580250b6f7ea0cfda624072a7601ee6d25ffd2
diff --git a/sys-kernel/linux-desktop/linux-desktop-2.6.31.7.ebuild b/sys-kernel/linux-desktop/linux-desktop-2.6.31.7.ebuild
new file mode 100644
index 000000000..2ff7c7f06
--- /dev/null
+++ b/sys-kernel/linux-desktop/linux-desktop-2.6.31.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ETYPE="sources"
+inherit calculate kernel-2 linux-mod
+
+DESCRIPTION="Binary kernel including the Gentoo patchset for the 2.6 kernel tree"
+HOMEPAGE="http://www.calculate-linux.org/linux-desktop"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-`arch`-${PV}.tar.bz2"
+
+GENTOO_SOURCES_PV="2.6.31"
+GENTOO_SOURCES_PR="r7"
+GENTOO_SOURCES_PVR="${GENTOO_SOURCES_PV}-${GENTOO_SOURCES_PR}"
+SRC_NAME=linux-${GENTOO_SOURCES_PV}-gentoo-${GENTOO_SOURCES_PR}
+SYSTEM="desktop"
+
+LICENSE="GPL-2"
+SLOT="2.6.31"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="=sys-kernel/gentoo-sources-${GENTOO_SOURCES_PVR}"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+:
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_compile() {
+	cd ${WORKDIR}
+}
+
+src_install() {
+	dodir /usr/src/${SRC_NAME}
+	insinto /
+	doins -r boot
+	doins -r lib
+	
+	dosym /usr/src/${SRC_NAME} "/lib/modules/${GENTOO_SOURCES_PV}-calculate/source" || die "cannot install source symlink"
+	dosym /usr/src/${SRC_NAME} "/lib/modules/${GENTOO_SOURCES_PV}-calculate/build" || die "cannot install build symlink"
+
+	addwrite "/lib/firmware"
+	# Workaround kernel issue with colliding
+	# firmwares across different kernel versions
+	for fwfile in `find "${D}/lib/firmware" -type f`; do
+
+		sysfile="${ROOT}/${fwfile/${D}}"
+		if [ -f "${sysfile}" ]; then
+			ewarn "Removing duplicated: ${sysfile}"
+			rm ${sysfile} || die "failed to remove ${sysfile}"
+		fi
+
+	done
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initramfs-${SYSTEM}-${SLOT}-calculate
+	calculate_update_kernel ${SYSTEM} ${SLOT} /boot
+
+	kernel-2_pkg_postinst
+	linux-mod_pkg_postinst
+}
+
diff --git a/sys-kernel/linux-desktop/metadata.xml b/sys-kernel/linux-desktop/metadata.xml
new file mode 100644
index 000000000..9a2d247f1
--- /dev/null
+++ b/sys-kernel/linux-desktop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+<longdescription lang="en">
+Binary kernel for desktop workstation including the Gentoo patchset and aufs patch.
+</longdescription>
+</pkgmetadata>
diff --git a/sys-kernel/linux-server/ChangeLog b/sys-kernel/linux-server/ChangeLog
new file mode 100644
index 000000000..b817d5fc0
--- /dev/null
+++ b/sys-kernel/linux-server/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sys-kernel/linux-server
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*linux-desktop-2.6.31.7 (11 Dec 2009)
+
+  11 Dec 2009; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+  +linux-server-2.6.31.7.ebuild, +metadata.xml:
+  Add binary kernel for server.
+
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
new file mode 100644
index 000000000..815e62c4d
--- /dev/null
+++ b/sys-kernel/linux-server/Manifest
@@ -0,0 +1,4 @@
+DIST linux-server-i686-2.6.31.7.tar.bz2 19745967 RMD160 859a42ff21742a5df2783dba4f67b4b5936db4d9 SHA1 7d890f4d003e0307cdeac7d244f3696ea56f344d SHA256 b5513bb8f6ad5fce504073158004986d2708528a5c13ae761ca15921ae909b6b
+EBUILD linux-server-2.6.31.7.ebuild 1672 RMD160 e894ab09ce687cb7a2990beed1df68c0dc79a304 SHA1 645df5b47fdcf732b87b2a5f6702b4120c6093f8 SHA256 0a639ac676e383a1530760bb41244bf424ecba4486a11b02b6f5dee2a6f31651
+MISC ChangeLog 304 RMD160 4dcd89c93677758d676c5d71f705bac40021ca69 SHA1 c53b12fe01121edcc6cf1756284b4d3d48afb62e SHA256 0173bab2ceddf2fcb941c66b9c750d9359a954db0aeb9693620851dcaa62cf3d
+MISC metadata.xml 288 RMD160 5fd5b532cfce86a2e9a2a8b6ed45d37b50e35cbc SHA1 2cce1a3a0269f00995b3021bb73e27ded1de11e7 SHA256 876cd412c7719fddeb9a0e9c39179fe240cfa198f9db5db3b599e23f644b2459
diff --git a/sys-kernel/linux-server/linux-server-2.6.31.7.ebuild b/sys-kernel/linux-server/linux-server-2.6.31.7.ebuild
new file mode 100644
index 000000000..2ff7c7f06
--- /dev/null
+++ b/sys-kernel/linux-server/linux-server-2.6.31.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ETYPE="sources"
+inherit calculate kernel-2 linux-mod
+
+DESCRIPTION="Binary kernel including the Gentoo patchset for the 2.6 kernel tree"
+HOMEPAGE="http://www.calculate-linux.org/linux-desktop"
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-`arch`-${PV}.tar.bz2"
+
+GENTOO_SOURCES_PV="2.6.31"
+GENTOO_SOURCES_PR="r7"
+GENTOO_SOURCES_PVR="${GENTOO_SOURCES_PV}-${GENTOO_SOURCES_PR}"
+SRC_NAME=linux-${GENTOO_SOURCES_PV}-gentoo-${GENTOO_SOURCES_PR}
+SYSTEM="desktop"
+
+LICENSE="GPL-2"
+SLOT="2.6.31"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="=sys-kernel/gentoo-sources-${GENTOO_SOURCES_PVR}"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+:
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_compile() {
+	cd ${WORKDIR}
+}
+
+src_install() {
+	dodir /usr/src/${SRC_NAME}
+	insinto /
+	doins -r boot
+	doins -r lib
+	
+	dosym /usr/src/${SRC_NAME} "/lib/modules/${GENTOO_SOURCES_PV}-calculate/source" || die "cannot install source symlink"
+	dosym /usr/src/${SRC_NAME} "/lib/modules/${GENTOO_SOURCES_PV}-calculate/build" || die "cannot install build symlink"
+
+	addwrite "/lib/firmware"
+	# Workaround kernel issue with colliding
+	# firmwares across different kernel versions
+	for fwfile in `find "${D}/lib/firmware" -type f`; do
+
+		sysfile="${ROOT}/${fwfile/${D}}"
+		if [ -f "${sysfile}" ]; then
+			ewarn "Removing duplicated: ${sysfile}"
+			rm ${sysfile} || die "failed to remove ${sysfile}"
+		fi
+
+	done
+}
+
+pkg_postinst() {
+	calculate_update_splash /boot/initramfs-${SYSTEM}-${SLOT}-calculate
+	calculate_update_kernel ${SYSTEM} ${SLOT} /boot
+
+	kernel-2_pkg_postinst
+	linux-mod_pkg_postinst
+}
+
diff --git a/sys-kernel/linux-server/metadata.xml b/sys-kernel/linux-server/metadata.xml
new file mode 100644
index 000000000..23bccebd8
--- /dev/null
+++ b/sys-kernel/linux-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+<longdescription lang="en">
+Binary kernel for server including the Gentoo patchset and aufs patch.
+</longdescription>
+</pkgmetadata>