diff --git a/eclass/calculate-kernel.eclass b/eclass/calculate-kernel.eclass
index e78f28834..37bd7eee2 100644
--- a/eclass/calculate-kernel.eclass
+++ b/eclass/calculate-kernel.eclass
@@ -8,7 +8,7 @@
 # Build the kernel from source.
 
 inherit calculate eutils kernel-2
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
 
 IUSE="vmlinuz"
 
@@ -18,8 +18,6 @@ detect_arch
 CKV=$(get_version_component_range 1-3)
 SLOT=$(get_version_component_range 1-4)
 KV_FULL="${PV}-calculate"
-#CKV_FULL="${CKV}-calculate"
-CKV_FULL=${KV_FULL}
 
 S="${WORKDIR}/linux-${KV_FULL}"
 EXTRAVERSION="-calculate"
@@ -35,35 +33,25 @@ CALC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-${CKV}.tar.bz2
 		http://mirror.yandex.ru/calculate/${PN}/${PN}-${CKV}.tar.bz2
 		ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/${PN}/${PN}-${CKV}.tar.bz2"
 
-#KERNEL_URI=`last_arg $KERNEL_URI`
-#UNIPATCH_LIST_DEFAULT=""
-
-SLOT_T="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-${SLOT}/temp"
-
 NEW_CALCULATE_OVERLAY="/var/lib/layman/calculate"
 [[ -d ${ROOT}/${NEW_CALCULATE_OVERLAY} ]] &&
 	CALCULATE_OVERLAY=${NEW_CALCULATE_OVERLAY} ||
 	CALCULATE_OVERLAY="/usr/local/portage/layman/calculate"
 
-CARCH=`arch`
-
 MODULESDBFILE=${ROOT}/var/lib/module-rebuild/moduledb
 
 calculate-kernel_pkg_setup() {
-	mkdir -p ${SLOT_T}
 	kernel-2_pkg_setup
 	local calculate_ini=${ROOT}/etc/calculate/calculate.ini
 	[[ -e $calculate_ini ]] && \
-		SYSTEM=$( cat $calculate_ini | sed -rn 's/^system\=(.*)/\1/p' )
+		SYSTEM=$( sed -rn 's/^system\=(.*)/\1/p' $calculate_ini )
 	[[ -n "$SYSTEM" ]] || SYSTEM=desktop
 	if [[ -z "${KERNEL_CONFIG}" ]] || [[ ! -f "${KERNEL_CONFIG}" ]]
 	then
 		KERNEL_CONFIG="${ROOT}/${CALCULATE_OVERLAY}/profiles/kernel"
+		[[ -n "$CARCH" ]] || CARCH=`arch`
 		KERNEL_CONFIG="${KERNEL_CONFIG}/config-${SYSTEM}-${CARCH}-${CKV}"
 	fi
-	#detect current kernel dir
-	[[ -e ${ROOT}/usr/src/linux ]] && 
-		SRCLINUXLINK=$( readlink ${ROOT}/usr/src/linux )
 }
 
 calculate-kernel_src_unpack() {
@@ -73,7 +61,13 @@ calculate-kernel_src_unpack() {
 vmlinuz_src_compile() {
 	# disable sandbox
 	export SANDBOX_ON=0
+	export LDFLAGS=""
+	mkdir -p ${WORKDIR}/boot
+	cd ${S}
+	einfo "Using kernel config from "$( readlink -f ${KERNEL_CONFIG} )
+	cp ${KERNEL_CONFIG}  ${WORKDIR}/config || die "cannot copy kernel config"
 
+	cp ${WORKDIR}/config ${S}/.config
 	local GENTOOARCH="${ARCH}"
 	unset ARCH
 
@@ -103,25 +97,18 @@ vmlinuz_src_compile() {
 	einfo "kernel: >> Distclean..."
 	make distclean &>/dev/null || die "cannot perform distclean"
 	ARCH="${GENTOOARCH}"
-	mv ${WORKDIR}/boot/kernel-${SYSTEM}-*-${CKV_FULL} \
+	mv ${WORKDIR}/boot/kernel-${SYSTEM}-*-${KV_FULL} \
 		${WORKDIR}/boot/vmlinuz-${KV_FULL}-installed
-	mv ${WORKDIR}/boot/initramfs-${SYSTEM}-*-${CKV_FULL} \
+	mv ${WORKDIR}/boot/initramfs-${SYSTEM}-*-${KV_FULL} \
 		${WORKDIR}/boot/initramfs-${KV_FULL}-installed
-	mv ${WORKDIR}/boot/System.map-${SYSTEM}-*-${CKV_FULL} \
+	mv ${WORKDIR}/boot/System.map-${SYSTEM}-*-${KV_FULL} \
 		${WORKDIR}/boot/System.map-${KV_FULL}-installed
 	cp ${WORKDIR}/boot/System.map-${KV_FULL}-installed ${S}/System.map
-	rm ${WORKDIR}/lib/modules/${CKV_FULL}/build
-	rm ${WORKDIR}/lib/modules/${CKV_FULL}/source
+	rm ${WORKDIR}/lib/modules/${KV_FULL}/build
+	rm ${WORKDIR}/lib/modules/${KV_FULL}/source
 }
 
 calculate-kernel_src_compile() {
-	export LDFLAGS=""
-	mkdir -p ${WORKDIR}/boot
-	cd ${S}
-	einfo "Using kernel config from "$( readlink -f ${KERNEL_CONFIG} )
-	cp ${KERNEL_CONFIG}  ${WORKDIR}/config || die "cannot copy kernel config"
-	cp ${WORKDIR}/config ${S}/.config
-
 	use vmlinuz && vmlinuz_src_compile
 }
 
@@ -129,48 +116,41 @@ vmlinuz_src_install() {
 	cd ${WORKDIR}
 	insinto /
 	doins -r boot
-	insinto /usr/src
 	cd ${WORKDIR}/lib
 	insinto /lib
 	doins -r modules
 	insinto /tmp
 	doins -r firmware
-	cd ${WORKDIR}
 	
 	dosym /usr/src/linux-${KV_FULL} \
-		"/lib/modules/${CKV_FULL}/source" ||
+		"/lib/modules/${KV_FULL}/source" ||
 		die "cannot install source symlink"
 	dosym /usr/src/linux-${KV_FULL} \
-		"/lib/modules/${CKV_FULL}/build" || 
+		"/lib/modules/${KV_FULL}/build" || 
 		die "cannot install build symlink"
 }
 
 calculate-kernel_src_install() {
-	rm -f ${S}/.config
 	kernel-2_src_install
 	use vmlinuz && vmlinuz_src_install
 }
 
-calculate-kernel_pkg_postrm() {
-	rm -f ${SLOT_T}/.alreadydel
-	rmdir ${SLOT_T} &>/dev/null
-	use vmlinuz && calculate_restore_kernel ${ROOT}/boot
-}
-
 vmlinuz_pkg_postinst() {
+	calculate_update_splash ${ROOT}/boot/initramfs-${KV_FULL}-installed
 	cp ${ROOT}/boot/initramfs-${KV_FULL}-installed \
 		${ROOT}/boot/initramfs-${KV_FULL}-install-installed
 	calculate_update_kernel ${KV_FULL} ${ROOT}/boot
+	mkdir -p ${ROOT}/lib/firmware
 	cp -a ${ROOT}/tmp/firmware/* ${ROOT}/lib/firmware/
 	rm -rf ${ROOT}/tmp/firmware
 	calculate_update_depmod
 	calculate_update_modules
 
-	sed -ri 's/a:1:sys-fs\/aufs2/a:0:sys-fs\/aufs2/' $MODULESDBFILE
+	[[ -f $MODULESDBFILE ]] &&
+		sed -ri 's/a:1:sys-fs\/aufs2/a:0:sys-fs\/aufs2/' $MODULESDBFILE
 }
 
 calculate-kernel_pkg_postinst() {
-	#calculate_update_splash ${ROOT}/boot/initramfs-${SYSTEM}-${KV_FULL}
 	kernel-2_pkg_postinst
 
 	KV_OUT_DIR=${ROOT}/usr/src/linux-${KV_FULL}
diff --git a/eclass/calculate.eclass b/eclass/calculate.eclass
index 8ba1ca74c..ec34c1e6d 100644
--- a/eclass/calculate.eclass
+++ b/eclass/calculate.eclass
@@ -96,9 +96,9 @@ calculate_update_kernel() {
 	update_file ${dir}/initramfs-${kversion}-install ${dir}/initrd-install
 	# update System.map
 	update_file ${dir}/System.map-${kversion} ${dir}/System.map
-	# update config-{CKV} (CKV 2.6.31, KV 2.6.31.4)
-	make_old_file ${dir}/config-${CKV_FULL}
-	mv ${dir}/config-${CKV_FULL}-installed ${dir}/config-${CKV_FULL}
+	# update config-{KV_FULL}
+	make_old_file ${dir}/config-${KV_FULL}
+	mv ${dir}/config-${KV_FULL}-installed ${dir}/config-${KV_FULL}
 	ebegin "Trying to optimize initramfs"
 	( which calculate &>/dev/null && calculate --initrd ) && eend 0 || eend 1
 }
@@ -167,29 +167,29 @@ initramfs_unpack() {
 	cd ${TMP_INITRAMFS}
 	# select arch
 	UNPACKER="gzip"
-	lzma -dc ${BOOT_DIR}/$1 &>/dev/null && UNPACKER="lzma"
+	lzma --force -t $1 &>/dev/null && UNPACKER="lzma"
 	# unpack initramfs
-	gzip -dc ${BOOT_DIR}/$1 | cpio -di &>/dev/null
+	${UNPACKER} -dc $1 | cpio -di &>/dev/null
 	return $?
 }
 
 initramfs_change_spalsh() {
-	if [ -f ${SPLASH_DESCRIPTOR} ]
+	if [ -f ${ROOT}${SPLASH_DESCRIPTOR} ]
 	then
 		# get silentpic param
 		SILENTPIC=$( sed -nr '/^silentpic/ s/^[^=]+=(.*)$/\1/p' \
-			${SPLASH_DESCRIPTOR} )
+			${ROOT}${SPLASH_DESCRIPTOR} )
 		# get pic param
 		PIC=$( sed -nr '/^pic/ s/^[^=]+=(.*)$/\1/p' \
-			${SPLASH_DESCRIPTOR} )
-		if [ -f ${SILENTPIC} ] && [ -f ${PIC} ]
+			${ROOT}${SPLASH_DESCRIPTOR} )
+		if [ -f ${ROOT}${SILENTPIC} ] && [ -f ${ROOT}${PIC} ]
 		then
-			cp ${SPLASH_DESCRIPTOR} \
+			cp ${ROOT}${SPLASH_DESCRIPTOR} \
 					${TMP_INITRAMFS}${SPLASH_DESCRIPTOR} &&
 				mkdir -p ${TMP_INITRAMFS}${SILENTPIC%$(basename $SILENTPIC)} &&
-				cp $SILENTPIC ${TMP_INITRAMFS}${SILENTPIC} &&
+				cp ${ROOT}${SILENTPIC} ${TMP_INITRAMFS}${SILENTPIC} &&
 				mkdir -p ${TMP_INITRAMFS}${PIC%$(basename $PIC)} &&
-				cp $PIC ${TMP_INITRAMFS}${PIC}
+				cp ${ROOT}$PIC ${TMP_INITRAMFS}${PIC}
 			return $?
 		fi
 	else
@@ -200,10 +200,13 @@ initramfs_change_spalsh() {
 initramfs_pack() {
 	# pack new initramfs
 	cd ${TMP_INITRAMFS}
-	find * | cpio -o --quiet -H newc | gzip -9 >${BOOT_DIR}/$1.new
+	find * | cpio -o --quiet -H newc | gzip -9 >$1.new
 	# remove old initramfs
-	rm ${BOOT_DIR}/$1
-	mv ${BOOT_DIR}/$1.new ${BOOT_DIR}/$1
+	if [[ $? -eq 0 ]]
+	then
+		rm $1
+		mv $1.new $1
+	fi
 }
 
 # @FUNCTION: calculate_update_splash
@@ -262,7 +265,7 @@ calculate_update_depmod() {
 	ebegin "Updating module dependencies for ${KV_FULL}"
 	if [ -r "${KV_OUT_DIR}"/System.map ]
 	then
-		depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" -r ${CKV_FULL}
+		depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" -r ${KV_FULL}
 		eend $?
 	else
 		ewarn
diff --git a/media-gfx/cds-themes/Manifest b/media-gfx/cds-themes/Manifest
index a4977b043..c9e7f22e0 100644
--- a/media-gfx/cds-themes/Manifest
+++ b/media-gfx/cds-themes/Manifest
@@ -2,6 +2,6 @@ DIST cds-themes-10.0.tar.bz2 277813 RMD160 0d8bfaf3ae8c43e175a19153cff0077d60a5b
 DIST cds-themes-10.2.tar.bz2 277918 RMD160 ffcbe45b2d875b08064462fcf96f80c97ffe3c25 SHA1 34bd453aca51247d90230d165e0e34bff26fcac9 SHA256 39260d28d31ab17e749b8a8bb6d7c7ef66be71f6b2155f1ae27f5ed4f28e5c92
 EBUILD cds-themes-10.0.1.ebuild 625 RMD160 588c11635f88799ed0dec1341120efa80ba9a6ad SHA1 1848f6360baf139700e436064be9fd295b443fc6 SHA256 67e34552419770160fcfd6ee246edb9a7413b106c16a299c4516a40d04554884
 EBUILD cds-themes-10.0.ebuild 473 RMD160 4861a4c8867b53f17866395f1a9a67ae5fa75e70 SHA1 f4d4405ba31d749fb602f1987e72d6f749490ca5 SHA256 cfd5bdde1398569dbea7d6799f0a6d778f8772d5570c3e83574a143753a9ab98
-EBUILD cds-themes-10.2.ebuild 475 RMD160 200f15ef97d09b7127a9f2ab90c9799bc55a5815 SHA1 5b5634d22545964f9aaccbe03e1f912473866846 SHA256 9cdfae8dc38d3d441dea10edf1ad1f3e44b6b9b6e549d5a05b8ee8e109933828
+EBUILD cds-themes-10.2-r1.ebuild 688 RMD160 6627488b400b004a5c7c2a955f42df27bc9b22c1 SHA1 f187f0bce43d5fb9753ad9021cab7970026e6b57 SHA256 cd49d854487786244eda84a6886a1b8d82d128d7df342f95f98aa4ba6e840d45
 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.2.ebuild b/media-gfx/cds-themes/cds-themes-10.2-r1.ebuild
similarity index 69%
rename from media-gfx/cds-themes/cds-themes-10.2.ebuild
rename to media-gfx/cds-themes/cds-themes-10.2-r1.ebuild
index bb21620d2..9fe58f5cd 100644
--- a/media-gfx/cds-themes/cds-themes-10.2.ebuild
+++ b/media-gfx/cds-themes/cds-themes-10.2-r1.ebuild
@@ -2,6 +2,8 @@
 # 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}/${P}.tar.bz2"
@@ -19,3 +21,10 @@ src_install() {
 		insinto /
 		doins -r .
 }
+
+pkg_postinst() {
+	[[ -f ${ROOT}/boot/initrd ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd
+	[[ -f ${ROOT}/boot/initrd-install ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd-install
+}
diff --git a/media-gfx/cld-themes/Manifest b/media-gfx/cld-themes/Manifest
index 6f86b7dcd..6a32d0784 100644
--- a/media-gfx/cld-themes/Manifest
+++ b/media-gfx/cld-themes/Manifest
@@ -2,6 +2,6 @@ DIST cld-themes-10.0.tar.bz2 20541271 RMD160 73d344b9534919c35e12b079ea7956719a0
 DIST cld-themes-10.2.tar.bz2 20503035 RMD160 91d2dab2bdcc91ee256db6a03755015d2949dd81 SHA1 45805e201cac751c59db610fed29d83493d09954 SHA256 10cb3efcdf5b2f5eac66653b55ef9f7a613756a4a13c3cb554eadeae27b3af56
 EBUILD cld-themes-10.0-r1.ebuild 2095 RMD160 cbbb5720dacbf56eb5998fc61a3d252111865556 SHA1 0a7864a38d04f84879801075e41cbf7a0ec7dfec SHA256 52b5880d37c79fa43f1401b0a096f9aa6803e18e95fb5bc79e3a4cc5ae2503de
 EBUILD cld-themes-10.0.1.ebuild 2212 RMD160 3a33ab63efc6e45ead529e49823f698d4341112d SHA1 b3a44f30811753710d8d9400b52031ec7e1fbb9d SHA256 80fa155271d4d44dcb0809d11fe0a5790a642192ccb6b6b4561a813f6a4fa601
-EBUILD cld-themes-10.2.ebuild 2097 RMD160 f87cdb0aaee390d7355da907393528644ea641e1 SHA1 debb0f62007c3be8d23e21ac90a08576a75bf1d5 SHA256 68abfd2ded3606242e0c13b520b211359342f3323cecec75889b35d26bbbe7da
+EBUILD cld-themes-10.2-r1.ebuild 2310 RMD160 ad01f045a4c08b742b5d386e8cb6e25390f96824 SHA1 1324a676243cc2026bce6f44cedda0362165b069 SHA256 7474a5280a043d61cb818d3572fa2a362428f62d2cc8d394a08257899493aa72
 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.2.ebuild b/media-gfx/cld-themes/cld-themes-10.2-r1.ebuild
similarity index 90%
rename from media-gfx/cld-themes/cld-themes-10.2.ebuild
rename to media-gfx/cld-themes/cld-themes-10.2-r1.ebuild
index 86aa4710a..b41ad2d38 100644
--- a/media-gfx/cld-themes/cld-themes-10.2.ebuild
+++ b/media-gfx/cld-themes/cld-themes-10.2-r1.ebuild
@@ -2,6 +2,8 @@
 # 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}/${P}.tar.bz2"
@@ -55,3 +57,10 @@ src_install() {
 			/usr/share/icons/Calculate/scalable/places/kde.svgz
 		doins -r .
 }
+
+pkg_postinst() {
+	[[ -f ${ROOT}/boot/initrd ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd
+	[[ -f ${ROOT}/boot/initrd-install ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd-install
+}
diff --git a/media-gfx/cldg-themes/Manifest b/media-gfx/cldg-themes/Manifest
index b70fdf632..ec3510286 100644
--- a/media-gfx/cldg-themes/Manifest
+++ b/media-gfx/cldg-themes/Manifest
@@ -2,6 +2,6 @@ DIST cldg-themes-10.0.tar.bz2 18610165 RMD160 b7c5514a9c1ec011a84216183f83f23964
 DIST cldg-themes-10.2.tar.bz2 18564474 RMD160 9f69055e795c2b49ea3d2732efb92a0220b5bbbd SHA1 29236b3cf9574178d4b86b18bdec3f1bc7a94ad5 SHA256 272405f61980dc097b4271d973bbfdd597250f5c5cfe261442fc3201c0952014
 EBUILD cldg-themes-10.0.1.ebuild 1464 RMD160 fa44dea1121d1764943731ac3c1c1feca96e4d11 SHA1 6be3245255c24241f19f289bc801701a05c99255 SHA256 4f9fdd12b1808175389623f8a052538caced7d171c92c25bff61af2848d14dc6
 EBUILD cldg-themes-10.0.ebuild 1329 RMD160 83b4fe1887cdd4e87af639948c3d755ef0ceb8ee SHA1 e8ea5cfcd1139760e460d148819ff68b719576a7 SHA256 ebe720efd92840d1d86aff132e511dd6a0be678fcc875d5a881e98ae01f9a9b3
-EBUILD cldg-themes-10.2.ebuild 1331 RMD160 ca66646c692d6f927e3a2851f60493c3d50cb8c7 SHA1 a6e0566dcbc021f7f250af4574999642688b85b4 SHA256 10db35dccef965cc6750adb3d74fcdce0ba955beefa5b86c5899af6d7d2a23d2
+EBUILD cldg-themes-10.2-r1.ebuild 1544 RMD160 89319d006e159eb671d6474d48f000df4a6171ba SHA1 b51218905be840a1f91a4424e3254e5bf0653c93 SHA256 45e505354aff6896472210ce06999e49256cfd2a656f2dd5d54eba8ed73b5d9f
 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.2.ebuild b/media-gfx/cldg-themes/cldg-themes-10.2-r1.ebuild
similarity index 86%
rename from media-gfx/cldg-themes/cldg-themes-10.2.ebuild
rename to media-gfx/cldg-themes/cldg-themes-10.2-r1.ebuild
index c513bd5b3..a308adfa7 100644
--- a/media-gfx/cldg-themes/cldg-themes-10.2.ebuild
+++ b/media-gfx/cldg-themes/cldg-themes-10.2-r1.ebuild
@@ -2,6 +2,8 @@
 # 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}/${P}.tar.bz2"
@@ -40,3 +42,10 @@ src_install() {
 			/usr/share/icons/Calculate/scalable/places/kde.svgz
 		doins -r .
 }
+
+pkg_postinst() {
+	[[ -f ${ROOT}/boot/initrd ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd
+	[[ -f ${ROOT}/boot/initrd-install ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd-install
+}
diff --git a/media-gfx/cldx-themes/Manifest b/media-gfx/cldx-themes/Manifest
index 4a955a391..39eef9fb5 100644
--- a/media-gfx/cldx-themes/Manifest
+++ b/media-gfx/cldx-themes/Manifest
@@ -2,6 +2,6 @@ DIST cldx-themes-10.0.tar.bz2 18658254 RMD160 bd85bde89e20c14ad9288b9989b00f5463
 DIST cldx-themes-10.2.tar.bz2 18602940 RMD160 ca9955eb3fbd9bc0b44d8982614d68a9d7e886a4 SHA1 5adfaf9cdc08e32a42284ea31f5d1e591f2b557f SHA256 0e5d0801ccaff5695f7721242dee8b45b2c9e636f16209c19b87ebfd0b53e59b
 EBUILD cldx-themes-10.0.1.ebuild 1323 RMD160 2afff01840811b0e8485c2d90f79437e36f862b2 SHA1 222b27940d7bb9dd7775703ce7a3605349a5c891 SHA256 f50a443a4e88ab70abc6f5f96fa1beb036301d44fe482ce18d633d466bff81dd
 EBUILD cldx-themes-10.0.ebuild 1178 RMD160 4ff181459be9fbfdbebc7b957af0a697750c437e SHA1 c5620ce967e379ecb14eb014e088260456c28a70 SHA256 47fb785113b2eb10c3e409eec2ee16a71f4531ee30370f68e94534df3d289417
-EBUILD cldx-themes-10.2.ebuild 1180 RMD160 41655df5913c3c63f1887cdb67f9e7368a3b9979 SHA1 b83288fce8c07f323e3d5d949e3e2a8d805cca94 SHA256 74ded9d5882c226bc0e042a4e7173c0e64fff1fe06865ee792879de3f1ceaf8d
+EBUILD cldx-themes-10.2-r1.ebuild 1393 RMD160 abd2dbf7b51a1ea594bc0703e6d6a0a0aba6eddc SHA1 8ffd23c9bc173e3d476bd5fedaf35e0dc9f2c0e5 SHA256 7e5b527d2af41d94b6ed97f2deff00c02cc057fa2ed75b7727bd7cec306cf9fd
 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.2.ebuild b/media-gfx/cldx-themes/cldx-themes-10.2-r1.ebuild
similarity index 84%
rename from media-gfx/cldx-themes/cldx-themes-10.2.ebuild
rename to media-gfx/cldx-themes/cldx-themes-10.2-r1.ebuild
index 748751036..aadb95ba7 100644
--- a/media-gfx/cldx-themes/cldx-themes-10.2.ebuild
+++ b/media-gfx/cldx-themes/cldx-themes-10.2-r1.ebuild
@@ -2,6 +2,8 @@
 # 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}/${P}.tar.bz2"
@@ -28,3 +30,10 @@ src_install() {
 		dosym ../icons/Calculate/40x40/apps/yellow.png /usr/share/pixmaps/yellow.png
 		doins -r .
 }
+
+pkg_postinst() {
+	[[ -f ${ROOT}/boot/initrd ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd
+	[[ -f ${ROOT}/boot/initrd-install ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd-install
+}
diff --git a/media-gfx/cls-themes/Manifest b/media-gfx/cls-themes/Manifest
index 27336f7bc..0d12d1558 100644
--- a/media-gfx/cls-themes/Manifest
+++ b/media-gfx/cls-themes/Manifest
@@ -2,6 +2,6 @@ DIST cls-themes-10.0.tar.bz2 197763 RMD160 b7e5d3eb1aae3f5a9ce2c5b30e4d80353f89e
 DIST cls-themes-10.2.tar.bz2 197756 RMD160 e0eafdeefac4d7788f3fdb49b69ecf14cd925045 SHA1 3c1547eab80aae198f9ab4a8ed48b8bc0363e781 SHA256 36a0c142af294b718250630c41c8e7e00581436472742d61a4d0c0fd7fd7053a
 EBUILD cls-themes-10.0.1.ebuild 613 RMD160 c3b6f9cef3b2ecce778d39b5325d115140f3f23d SHA1 2f3047063567638cf30a1a62913cf815408117a6 SHA256 5c262d97b48e37170ffc8cc4f480a445ab69e43c5fb9aaaca4a5644408a38e3e
 EBUILD cls-themes-10.0.ebuild 460 RMD160 bab0eb9f62755d8c95be6d54467f592aacfa6ddc SHA1 47c0cbf19b2b4a4a449e93bf4781ebd91f381efe SHA256 95a2262076ebfc45b0a26e323d1da5b622855066abefc7d9021734eb522628f0
-EBUILD cls-themes-10.2.ebuild 462 RMD160 24f4feda7de65e637192455179281d5be1cad058 SHA1 b5a58a98d441fe50d4c87851da176ee794c14029 SHA256 f2676f117d7b3d0cb9dcdd8b60162bb6d41c7f3f357e71741630e5b4dc3f07f3
+EBUILD cls-themes-10.2-r1.ebuild 675 RMD160 16052729eaf4b6f3a66c2b99af92bd5e63825be0 SHA1 4c1ede4fc54fa66cdfd671a42bea631454897ae9 SHA256 2bf5474755356cc44aafc4b57cbde48c6eb385dab7564106fd5d94a3a2cafa8d
 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.2.ebuild b/media-gfx/cls-themes/cls-themes-10.2-r1.ebuild
similarity index 68%
rename from media-gfx/cls-themes/cls-themes-10.2.ebuild
rename to media-gfx/cls-themes/cls-themes-10.2-r1.ebuild
index a0c447333..83c6b363f 100644
--- a/media-gfx/cls-themes/cls-themes-10.2.ebuild
+++ b/media-gfx/cls-themes/cls-themes-10.2-r1.ebuild
@@ -2,6 +2,8 @@
 # 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}/${P}.tar.bz2"
@@ -19,3 +21,10 @@ src_install() {
 		insinto /
 		doins -r .
 }
+
+pkg_postinst() {
+	[[ -f ${ROOT}/boot/initrd ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd
+	[[ -f ${ROOT}/boot/initrd-install ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd-install
+}
diff --git a/media-gfx/clsg-themes/Manifest b/media-gfx/clsg-themes/Manifest
index 90f19838d..e1875fd0b 100644
--- a/media-gfx/clsg-themes/Manifest
+++ b/media-gfx/clsg-themes/Manifest
@@ -2,6 +2,6 @@ DIST clsg-themes-10.0.tar.bz2 235951 RMD160 e2a1d7b959704f4c23aae351179a662d30c9
 DIST clsg-themes-10.2.tar.bz2 197756 RMD160 164c3bc033f5b4a8501df1b8b3448a386fffab99 SHA1 4cfd9d513ca4d37d736fd4969e4a9bbc821465b3 SHA256 760ce6f9977383a813fe821cd9dcdb15db96173c8a326494a81104d5274fdc01
 EBUILD clsg-themes-10.0.1.ebuild 630 RMD160 e6ee70ae8f6182f29b859a76bf69c055ba517ce3 SHA1 9c2ac6fbd601728d440b91048fe21e6baa749faf SHA256 4d1c42d8dd456fb5cdb92593f02ce36dd90396a10447ed76407aa0a22df0e7a2
 EBUILD clsg-themes-10.0.ebuild 478 RMD160 b1df9143090644e886afe5702083f5df217ca971 SHA1 801f9209e247f04805979d4dcf041deb3d26a0c9 SHA256 69b4f385fdbfccce1a61640afb37e1304731a25e5ddd9d4de567cdc271aa2de3
-EBUILD clsg-themes-10.2.ebuild 480 RMD160 7002f0c01a08461709d394ad54867109eda9fc74 SHA1 b3396b0e5322b5bad981d91462cd735c83a0ec5e SHA256 9af3b064595e4252179c53320f07752a25203595d7357ce5e8d11e9393176d87
+EBUILD clsg-themes-10.2-r1.ebuild 693 RMD160 7de20384b1de24d5d80551b65b1f69b498b7ec82 SHA1 a6ffc3484e69948425e1294ed67c01f6909200b3 SHA256 3d653a2609cdeed78284b9f074029a624a090e666c20c057be772e312c9aa528
 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.2.ebuild b/media-gfx/clsg-themes/clsg-themes-10.2-r1.ebuild
similarity index 69%
rename from media-gfx/clsg-themes/clsg-themes-10.2.ebuild
rename to media-gfx/clsg-themes/clsg-themes-10.2-r1.ebuild
index 619c4b5d6..92afcd675 100644
--- a/media-gfx/clsg-themes/clsg-themes-10.2.ebuild
+++ b/media-gfx/clsg-themes/clsg-themes-10.2-r1.ebuild
@@ -2,6 +2,8 @@
 # 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}/${P}.tar.bz2"
@@ -19,3 +21,10 @@ src_install() {
 		insinto /
 		doins -r .
 }
+
+pkg_postinst() {
+	[[ -f ${ROOT}/boot/initrd ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd
+	[[ -f ${ROOT}/boot/initrd-install ]] &&
+		calculate_update_splash ${ROOT}/boot/initrd-install
+}