diff --git a/media-gfx/dm-themes-calculate/Manifest b/media-gfx/dm-themes-calculate/Manifest
index 7038270a3..928fbcbcd 100644
--- a/media-gfx/dm-themes-calculate/Manifest
+++ b/media-gfx/dm-themes-calculate/Manifest
@@ -1,8 +1,10 @@
-DIST dm-14-r4.tar.bz2 4899217 SHA256 f8bf0cbcfcb4dab4f3c02c94efd6f50ec7a6c9b4d25f37f3f3d83873d66b314e SHA512 3165841d4fa984ca658c71d3c2bdcb6f2b318ff26c5c5f086d3e44f5ee4bb696707ff4fd8ef1d9e6557c5cebf0c278a87e4f09f574bf439201def06c183ee23e WHIRLPOOL 2c6013de91796c06bebc7fb214235423f4464db8ff7d5613b5c69d64724ce117cfd0c172046bb4ca8aedd1e68403640aa8a1b50703aa397a6e1e8521f7a96994
-DIST dm-15.tar.bz2 23220475 SHA256 7874657e5be24f50e8e654980f2e18ec5f87df0e272cdae91e1857c158334e05 SHA512 4773ac9315dc9340cbd43b25eca506c1884fc6b53e05843b9dbf256e61bcc1dd3254e439a27aff4c94283fed8d486d65bbfa2fa1cea066cc330dc6d8ba85168b WHIRLPOOL 003aed6b7540ef7083fd8e370ee55704a3bd9cd6b0e3992297942e55d7f1681da0c14c529cbe102ae236e6642c640361ccdfe6193998743e413fec9d695ab7a6
-DIST dm-cld-13.tar.bz2 2861465 SHA256 aacd046dd375eded1e3c74dd039bc0820159e07f82d2d3b58f233e0f3fac6f01 SHA512 0550323efdec2149114d858e8268cd11be584901132b6f9fd44ace72be5d68949a68316416e5d84c8d01dea61ab19dc1be1f09cb8d95ccbb424fba04811c3efb WHIRLPOOL 9c7db5e5c0fb24168bc962e6959a3fa7ee4e42b3d27ddae988091511ee964f8420cf0c64eede25398e72bd045bb75a2652697d1aa4a42c1f948eecec09688482
-DIST dm-cldg-13.tar.bz2 3118843 SHA256 a7898282262f12e1294347141c9ad38b4990c13035535fa9fd9aaaf5e272ad62 SHA512 22b19896056eadb8eb94e6fc716ee807a3a5d8c21104ac391ae9eff68691c80d905eb28d29f89358520c3cbd90fdc148ecaf62170e3ce581f14eb3c7ae43e041 WHIRLPOOL f08054d04380baf9db4fbadf5f56dbce8944985344ed4fb4b2bb1a611ce08749491c3522589e1cf47ffebceaa7e4864e9774d3258c642e608645f7a8070737bf
-DIST dm-cldx-13.tar.bz2 3126013 SHA256 da1e83127fe5a36f6004c98fe28e631a361efb8397a44c35b9f02115a0470717 SHA512 8c1832cc3db67de9198cf5ff675c97745859656146bafb703748cf6c7f6ff46d190100ffb5669f70d052a14e854cf7bfa0d751e015d5c5ae17c9f5abee91e079 WHIRLPOOL f509fe1812cc3aaccbe8aa75ac450208a4336dfc23aa2951cb490fe03b8fa49a8162c0c48113e9412b8c9fdb617db44dd5f45fece405e593ccc2aa3280714a17
-DIST dm-cls-13.tar.bz2 3140558 SHA256 62cf3d9e1f620a2788c9d85ab68f84817b45278abcafaa135636f8f5c6486a6f SHA512 ec94f1884f3b0b50737d2e225be0e490d463a07c452ce5d006f6780f21f9fef3e34e352b055c921e3a4c50b57ff6283e07840e92bf24a54924b1ed315316e9fc WHIRLPOOL d818e8e6178eb15390a5a114df2ecda54243efd35d737cd1b254ac79e7c8140dd813b82d62d471b569305352f55c393e83e6d49e80231776d25201fd58ce9ad5
-DIST dm-themes-calculate-login-17-r4.jpg 1929196 SHA256 99fd25b5eb542733e81ab4154c94f8347919d02c5245ed2f931d43df531d40a8 SHA512 e1242085dc10d504661ffb929db50e167c43443927ff7da2c02edd3686d9fca46f1b0b87f1a70e0d883c8893f30c9beb67b067a170c648e49c0d64be01b53bf7 WHIRLPOOL e87306b6055411741f7407600e8fb8d7e293155a1fec1c4abc4e150780ce8a62bf3cb74354c590e4cd80741b1e2de7417524c0b911fbe7e6b896b9b91e8fc787
-DIST dm-themes-calculate-splash-17-r4.jpg 6911444 SHA256 c3cdfd21cecbed2da128af6a2e80fa635d834f6746495c5841981133273b8cb9 SHA512 f24965479aaff006b161b5aab84797cb1239f6fc53f9d354bafcb187d937fe67d6f3edbd436458caf386ddcede079e94c1553fb4ed45febf59340c8209c34292 WHIRLPOOL a845e76842a913f4518c280d928a6eb51e99036bee196ddbab0d7fe2781e033c619226ec92c34234391d39ff02e46d439684177722dcee6d941916294a6a8894
+DIST dm-14-r4.tar.bz2 4899217 BLAKE2B 97a0ab4218b4c7d7c63210f56b871b258deb030341ec8bd2e4f789f68ea18645d56beb359e89bc9f5a291ef9ab3118dcc5ca43bcb9618ad4bfb82047be3aec99 SHA512 3165841d4fa984ca658c71d3c2bdcb6f2b318ff26c5c5f086d3e44f5ee4bb696707ff4fd8ef1d9e6557c5cebf0c278a87e4f09f574bf439201def06c183ee23e
+DIST dm-15.tar.bz2 23220475 BLAKE2B 9b80b5d200f5c7dc4ce5c92affa4551d0858fb80a83da78034b9f05c64245d6dd5bab2e4eeb1730b3bef94b55b39fae469c1993e24c55b285dae091a10b7935e SHA512 4773ac9315dc9340cbd43b25eca506c1884fc6b53e05843b9dbf256e61bcc1dd3254e439a27aff4c94283fed8d486d65bbfa2fa1cea066cc330dc6d8ba85168b
+DIST dm-cld-13.tar.bz2 2861465 BLAKE2B 3c453d588313336379d066f0129599456236423bb7d8fa62acf910d301446b87ceed6e1c1beae5bb7da0b0cac5c5be9510fb0c88849cdaedc33f63aa594ba713 SHA512 0550323efdec2149114d858e8268cd11be584901132b6f9fd44ace72be5d68949a68316416e5d84c8d01dea61ab19dc1be1f09cb8d95ccbb424fba04811c3efb
+DIST dm-cldg-13.tar.bz2 3118843 BLAKE2B 8172331db778c1dd49dc60724e53624b5cb3ad2d3b00182a9a5863097d43d674d56f501c3de7c72a86143ef49d10106b7af5732fa827e5d80337cdfbff0cfe81 SHA512 22b19896056eadb8eb94e6fc716ee807a3a5d8c21104ac391ae9eff68691c80d905eb28d29f89358520c3cbd90fdc148ecaf62170e3ce581f14eb3c7ae43e041
+DIST dm-cldx-13.tar.bz2 3126013 BLAKE2B eac0050bcd480dda4d1a82b84246e61c111528e6312ad98a87848c00e0f152b38dac41dc87c4969e6f66c2ec2b415e454557f48d7594076bb89b8479b6e75cb6 SHA512 8c1832cc3db67de9198cf5ff675c97745859656146bafb703748cf6c7f6ff46d190100ffb5669f70d052a14e854cf7bfa0d751e015d5c5ae17c9f5abee91e079
+DIST dm-cls-13.tar.bz2 3140558 BLAKE2B 5b6761062ceda4731b2f3f20e62244345362188de5cc107ce1e978e9b880104813f8af7872496f072a13101aed1703473f09a0ac6c114cf652e0a87ddc8446e2 SHA512 ec94f1884f3b0b50737d2e225be0e490d463a07c452ce5d006f6780f21f9fef3e34e352b055c921e3a4c50b57ff6283e07840e92bf24a54924b1ed315316e9fc
+DIST dm-themes-calculate-login-17-r4.jpg 1929196 BLAKE2B f05e6276d48d21cfcfd44c78dec2763eedaab4d315d31316e1dfe2fe46f0f9eb4168fce65d09fc3fa755df200f854506bdc777795483b03012e9277a55b64f28 SHA512 e1242085dc10d504661ffb929db50e167c43443927ff7da2c02edd3686d9fca46f1b0b87f1a70e0d883c8893f30c9beb67b067a170c648e49c0d64be01b53bf7
+DIST dm-themes-calculate-login-18.jpg 1692858 BLAKE2B 2e3c8b97c97ef1fa35ad08ca11542b7e27fb871a762aeed193578ff9a8a02f4b252c0537b708226a62e479e7e6fff736207a0ab99f65dcf516fdfc9550de4b5e SHA512 f1a6b97db272a202b2dbb6ccc31f6ee4dfc253c53a4fb981bc0abd6ed8deed9d724b5bd7136bbfd2f15cf46de48da80018ced1c020bff015181930e98257e010
+DIST dm-themes-calculate-splash-17-r4.jpg 6911444 BLAKE2B a1206edcbeb03cd1e710c298f40f89b2c33e71096707444d69ba99717be7f1ec8721f13ba434c34e7f9791f488f32ba9e7e4139e933748683ffcf90a4d7f64f1 SHA512 f24965479aaff006b161b5aab84797cb1239f6fc53f9d354bafcb187d937fe67d6f3edbd436458caf386ddcede079e94c1553fb4ed45febf59340c8209c34292
+DIST dm-themes-calculate-splash-18.jpg 1750291 BLAKE2B abb936f262488a896a7056528edb0a2d604b8f1f571aba04ff0599a5a81badc43afb6415d7b69c3704f0b14122f750618919ef2cca889ee2ef8e0dc408c99055 SHA512 59f9ae99fca924a127091aae59a540fd37b23ea6fce1591e6503ed4ab22ed5b0dfa1cd0f163f89d4f531783a66c73a27a921d969a3ea7c41ec62dc60083ef5b3
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-18.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-18.ebuild
new file mode 100644
index 000000000..f30f588d4
--- /dev/null
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-18.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Display manager wallpapers for Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+splash +login"
+
+REQUIRED_USE="|| ( splash login )"
+
+SRC_URI="login? ( https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
+	https://mirror.yandex.ru/calculate/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg )
+	splash? ( https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
+	https://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg )"
+
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
+
+# need for templates
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/themes/Calculate/
+	use login && newins "${DISTDIR}"/${PN}-login-${PVR}.jpg dm-login.jpg
+	use splash && newins "${DISTDIR}"/${PN}-splash-${PVR}.jpg dm-splash.jpg
+}
+
diff --git a/media-gfx/splash-themes-calculate/Manifest b/media-gfx/splash-themes-calculate/Manifest
index 0b99dfc5e..ed553da5e 100644
--- a/media-gfx/splash-themes-calculate/Manifest
+++ b/media-gfx/splash-themes-calculate/Manifest
@@ -1,4 +1,6 @@
-DIST splash-themes-calculate-15-r2.tar.bz2 3770693 SHA256 5f3ffb0377f4cd90e54bd21ce78e9f0641106fe48cc3f8321890046e5070053b SHA512 ff03779c1707f3625f022c48cb4389499f22c82ef4217e49cb245738a126ab98f5ac45319f9e67ba883b12f1fee614c57f2b32cbb199d4852af652811a10cf25 WHIRLPOOL db7d19db62e4321b077b43ebf8aafda03181248846baf8ee7ac2af37a477ea5cd670c7d1a627db9d1ff5b173156e194becdf493adffd071285ad07fa17b2afd1
-DIST splash-themes-calculate-shutdown-17.jpg 1419977 SHA256 ffb74200a1622c746d98feea4f42661c3d1d271af45b886d36551dda42875242 SHA512 eee4e13d11c1d1f24184bfc7c8443a6966c637d861a8484e4c26c757dd7ba81ca3f9f4b60cd39dd6df8fad0181a4deabe75510f531d18db98f7c6419a48534f4 WHIRLPOOL b7e07ea8ba298b74a5268a631753baa300c8eb68022beac90a3f349cdddc55123f47787d7127530ea665d50b54fc3f24f6b4adb75733ea4fb9f2eaa93b4ad52c
-DIST splash-themes-calculate-silent-17.jpg 1318715 SHA256 abe8e74142273001a018f66e08f755a1313d1da12e150aa6fc96e6a479642488 SHA512 85638a990786d9d151925061ea6ccbde939710de880101b577485da859054d9fef918f2449f36628263e5b6d04a30eb57a378211d0322d51b0a074a481406079 WHIRLPOOL 6d4d5ea11799e087bb60ac76042be9414580ff22201f3224679bc061c93887bb7891e382bf91218e9cfe335ec967ee815ada0fbc0d0f5f7bf517f9a15d39b0f3
-DIST splash-themes-calculate-verbose-17-r1.jpg 1717558 SHA256 b5d0a1f435222cf4f49955dc50eb7177c982e25dedcd959520d0777d6677fffb SHA512 df5a78ce52b187fc8fc43739a38518bf55c27e0e267b58a11b19be2415776d70e0aed9840ec645a769504f57e3364a58efef98b2a1039ea82c4519155d35c3f2 WHIRLPOOL 0674b18455fcaa43728053492c22dc1a1f433e440b43099d05af7a433376eb7e7d3bd3643266688956dba97231ad42d19ad71ce75e77ca866762f1c72a721b89
+DIST splash-themes-calculate-15-r2.tar.bz2 3770693 BLAKE2B 0be4bfa94373afc07a92cf60d336c93928db6bd67a2ebf9d758eefa6a397a509b5c8b074eceed4221e8d4afb29dcbf4175168b43c6ebe9ee95fa961258cbb0be SHA512 ff03779c1707f3625f022c48cb4389499f22c82ef4217e49cb245738a126ab98f5ac45319f9e67ba883b12f1fee614c57f2b32cbb199d4852af652811a10cf25
+DIST splash-themes-calculate-shutdown-17.jpg 1419977 BLAKE2B 68baa394fd80ba55c95803b053a7712863b0c1b1bc158972f128bcb705f2ad59605eee9852fe35db7efcfb6c7164133eb835fd7ccd8b01b684ab8bffc5fc6089 SHA512 eee4e13d11c1d1f24184bfc7c8443a6966c637d861a8484e4c26c757dd7ba81ca3f9f4b60cd39dd6df8fad0181a4deabe75510f531d18db98f7c6419a48534f4
+DIST splash-themes-calculate-shutdown-18.jpg 412 BLAKE2B 97610de71e779511fb66b905e58c35b727b7de815979675032303ebaf4866a77e25634bb2c3de67aa8494d451c1657d05b82e6c7133ac09fb8339486ca4acd99 SHA512 a46bc91c4a5ea840967ea64715fa46a23a7889a1be0958b0262783dbd38d7109465f24ff8588006ab09779eb7b781a9918357d4f5d3a5faa652257a33f8df232
+DIST splash-themes-calculate-silent-17.jpg 1318715 BLAKE2B 8553f55db5341731a16efc97576abf4b577d2122c4adb6764f343578bef2086f2df1360601fa355505f30987faba87b766aabcd5be969a5a3cf569810ca98f35 SHA512 85638a990786d9d151925061ea6ccbde939710de880101b577485da859054d9fef918f2449f36628263e5b6d04a30eb57a378211d0322d51b0a074a481406079
+DIST splash-themes-calculate-silent-18.jpg 1603642 BLAKE2B 3db07ed5e581e66fc1a4749b8ca164be309c7b571b05c07a1c81c24bf097f336c82625a53ed7cc33409dad0127afdff6ce895fbc439c0e071791d32e648a5fcc SHA512 62f44ac0511cf16ff72aec6341aa0a08d7af3baa1d25adcc808f379049de0d6cbfa1230fa50ca70908d9affb35c7be5b2d81547ef117e35ffab1158e77aff1c7
+DIST splash-themes-calculate-verbose-17-r1.jpg 1717558 BLAKE2B c122adc66e5f636f3b155b3014b1c50312cd5960aeb92079d6fe628f647f6efd9d1e889f73cb811586ca791040b37755f2a78d86cd1fe5ceb4e29f55e1c27fb9 SHA512 df5a78ce52b187fc8fc43739a38518bf55c27e0e267b58a11b19be2415776d70e0aed9840ec645a769504f57e3364a58efef98b2a1039ea82c4519155d35c3f2
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-18.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-18.ebuild
new file mode 100644
index 000000000..ef5e115ba
--- /dev/null
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-18.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Calculate Linux theme for gensplash"
+HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-splash-themes"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+silent +silent-shutdown"
+
+REQUIRED_USE="|| ( silent silent-shutdown )"
+
+SRC_URI="silent? ( 
+		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-silent-18.jpg -> ${PN}-silent-18.jpg
+		http://mirror.yandex.ru/calculate/themes/calculate/splash-silent-18.jpg -> ${PN}-silent-18.jpg )
+	silent-shutdown? (
+		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-shutdown-18.jpg -> ${PN}-shutdown-18.jpg
+		http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-18.jpg -> ${PN}-shutdown-18.jpg )"
+
+DEPEND="media-gfx/splashutils
+	media-fonts/droid
+	!<sys-apps/calculate-utils-3.5.2.6"
+
+# need for templates
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/themes/Calculate/
+	if use silent
+	then
+		newins "${DISTDIR}"/${PN}-silent-${PV}.jpg splash-silent.jpg
+	fi
+	if use silent-shutdown
+	then
+		newins "${DISTDIR}"/${PN}-shutdown-${PV}.jpg splash-shutdown.jpg
+	fi
+}
+