diff --git a/app-crypt/openpgp-keys-calculate-release/openpgp-keys-calculate-release-20180827.ebuild b/app-crypt/openpgp-keys-calculate-release/openpgp-keys-calculate-release-20180827.ebuild
index 12364954f..34fb065a8 100644
--- a/app-crypt/openpgp-keys-calculate-release/openpgp-keys-calculate-release-20180827.ebuild
+++ b/app-crypt/openpgp-keys-calculate-release/openpgp-keys-calculate-release-20180827.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="OpenPGP keys used for Calculate binary packages"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/openpgp-keys/calculate-release.asc.${PV}.gz"
+SRC_URI="https://mirror.calculate-linux.org/source/openpgp-keys/calculate-release.asc.${PV}.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-crypt/shim-signed/shim-signed-0.2.ebuild b/app-crypt/shim-signed/shim-signed-0.2.ebuild
index d39c22a7c..9a7e62efa 100644
--- a/app-crypt/shim-signed/shim-signed-0.2.ebuild
+++ b/app-crypt/shim-signed/shim-signed-0.2.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 DESCRIPTION="UEFI Shim bootloader for SecureBoot signed by Microsoft"
 HOMEPAGE="http://mjg59.dreamwidth.org/20303.html"
 SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/${P}.tgz"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tgz
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tgz
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tgz"
 
 LICENSE="as-is"
diff --git a/eclass/calculate-utils-r15.eclass b/eclass/calculate-utils-r15.eclass
index c1d3aced3..0f1285142 100644
--- a/eclass/calculate-utils-r15.eclass
+++ b/eclass/calculate-utils-r15.eclass
@@ -17,7 +17,7 @@ inherit distutils-r1 eutils
 
 EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
 
-CALCULATE_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate3"
+CALCULATE_URI="https://mirror.calculate-linux.org/source/calculate3"
 MIRROR_URI="https://mirror.yandex.ru/calculate/source/calculate3"
 
 # @ECLASS-VARIABLE: CALCULATE_MODULES
diff --git a/media-gfx/calculate-wallpapers/Manifest b/media-gfx/calculate-wallpapers/Manifest
index 1073405df..72600f68e 100644
--- a/media-gfx/calculate-wallpapers/Manifest
+++ b/media-gfx/calculate-wallpapers/Manifest
@@ -1,9 +1,11 @@
 DIST calculate-wallpapers-17-r4.jpg 1498109 BLAKE2B e6573ef615a984dda8d1e2390827f8f3c46cafc6c93c0def1b74dfe8d8eac7823f0071bf580a1a9be2b131c4c03f121f10db6a41625cb8506d3d966b5cda4a74 SHA512 0c6ea3b9bfd822e98738b162ab28a410296b96c16901712cf69710f4af3af2f56a64f2cf24d3207b2e274ebc9b6f18268f2fa1aeee5b15f2aabdaff7de91095a
 DIST calculate-wallpapers-18-r1.jpg 1750291 BLAKE2B abb936f262488a896a7056528edb0a2d604b8f1f571aba04ff0599a5a81badc43afb6415d7b69c3704f0b14122f750618919ef2cca889ee2ef8e0dc408c99055 SHA512 59f9ae99fca924a127091aae59a540fd37b23ea6fce1591e6503ed4ab22ed5b0dfa1cd0f163f89d4f531783a66c73a27a921d969a3ea7c41ec62dc60083ef5b3
 DIST calculate-wallpapers-21.jpg 599960 BLAKE2B 1185b772039393bbbb104ea6a29347ccd9eb5ca68c7cab7d5a715fe34b584d55933e3b37a9c8036a566e09b6d770bb16200c21cc535fc358695120180c8a978e SHA512 b1c48c5750c30f9436a6a0e12c4d5633bf87ac6ef1e2fa373aa7b81676d3c51220168a8a5e558045e1034ce8c1eaa28c4e472f2fa9ed114ab37ae98a2de43cb9
+DIST calculate-wallpapers-22.jpg 551009 BLAKE2B e0ac9f68d548b646095452453b101bdf3808d0360ae5bba4e26b4d365223c51c40be8bd0b925ac127b5ee5a1fc40d4b4bde66ff09e961ac5af68bcacd9bba209 SHA512 6ae69d9ee1c91b6a6747f41f3dd77e733ca85c56cc17562544a9bdd73934e7eba25c77f4ec4c36942f3e3a1da9eaa86bf1cc411657ad746dcb48f56fb1beb0ca
 DIST wallpapers-11.tar.bz2 5318262 BLAKE2B bbd4b883cf609c0578809145a519b92b2eaec2d961f67c11654e0559bb165cf36fed58111fedd743c99cb2e911d36d2fd792422f93e81e93c34fa23836a23054 SHA512 32e0573427357d1c372df3a68f77bd6d6faab16c9f5fc67b6cf21486683644de5a2878e8f1fb5826e3b67acc262c21b46d07f942341090e776e4bfcece37378a
 DIST wallpapers-12.tar.bz2 14993163 BLAKE2B a42adb0401e4572c06e7db37d8e49aeb8e396fa27ffeb434c67247389a1a64eb918fce96c7918d5ce00a530d99986e2a82bf8953cc6f15b87ce6347ec4cd6578 SHA512 b35b712e1993f960bdbfd0343b03d21bd990c38e9053920ac395443d010b4eb9f6178cfde0a3ca45a83c67a9b6609ffce9905dec4be400b521d82255533d60ec
 DIST wallpapers-13.tar.bz2 14606610 BLAKE2B f47ccd90c2117f2e3440613f8465d91c9fb08432126dc5d1d100f24073bb9a831394262dfc53a44633cfb0884e2bb070756ef726032f667a57df341173801d0c SHA512 9b83d30a428b2897708acda943cdf3de7e400a4fa1f4bdd6eea827fc6be37c0b1e8fdddf9acc9f3dea493071006bd2e4663c569562c546a56dddc60be2acc12b
 DIST wallpapers-14-r1.tar.bz2 6632861 BLAKE2B 09df9235728a29a1288a2e2ef7e859c962a77a06574452e2c67a3343a96ae7e484b8f8046ae4c797ded2b92d2499820894d46ffe18dfa451527e04afbcddf138 SHA512 04660bb6f05156ead4b2353f60ad11b886fa9048eaa0b7240dd8ba845591e00b1a57792429397e916ca7761f05ee1919945bd5bc4c53d253b7b0eb827b3997bd
 DIST wallpapers-15.tar.bz2 7374260 BLAKE2B beb45dcb0841131f3e5d335b452002c8fc44c5c5ef6ec009e6739f4c29af62d42bb5e801ad6221c0d7c1302f6a69a9e03711f9060908ea76cc26e07ab9c66208 SHA512 f5400cd3709ffb80e4c904be6fd540f2b47e39bfec86715975ab81bfaee2eebb4fec0b03c21fc3d2f09ce784690a1744f64a95f5c4ad6c3968312931f1c6c90b
 DIST wallpapers-17.tar.bz2 3155801 BLAKE2B 703ae4c9bf3968c0cb7b0f3fc84ad35c7836975eaef92d8e7cb1ec1bc2004a07d6efb504f54782feb6436fea7971945c8a34ec8ff6ecd330f01d1806dae8269e SHA512 4ec4117e0a749e44918522b7ef11aecfb18581740669d4f822e297a68537e5605b6084c6d7c61f62c72f34cbcfcd5bafd4ede35118786c5efcfe4df0f3ce8255
+DIST wallpapers-21.tar.bz2 5550082 BLAKE2B 255644bab9f4de9e8a49e2c200ab3b79570bea602c4789ce2dd26f4bf672bb489cc2ebb7d83131548a6690f3f9632de3c00d9b2f9b05f4a273a3caef98419b1b SHA512 214318e56c44566970857bd1421ff9bd6ac7c6c716803f955d46c6e230b64d56efffe8c3db95e9f79e82031d1adf0cedb5d609b5727c797e2630300c595df168
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
index 57db94ec2..a10385725 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
@@ -14,18 +14,18 @@ VERSION_IUSE="CL11 CL12 CL13"
 IUSE="+CL11 +CL12 +CL13"
 
 SRC_URI="
-	ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	CL11? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
index 51fc41383..2dae93e5f 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
@@ -14,20 +14,20 @@ VERSION_IUSE="CL11 CL12 CL13 CL14"
 IUSE="+CL11 +CL12 +CL13 +CL14"
 
 SRC_URI="
-	ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-15.tar.bz2
+	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
-	ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	CL11? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
-		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-22.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-22.ebuild
new file mode 100644
index 000000000..1c450a634
--- /dev/null
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-22.ebuild
@@ -0,0 +1,87 @@
+# Copyritght 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+DESCRIPTION="Wallpapers for Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+VERSION_IUSE="CL11 CL12 CL13 CL14 CL15 CL17 CL21"
+IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17 +CL21"
+
+SRC_URI="
+	https://mirror.calculate-linux.org/themes/calculate/wallpaper-22.jpg -> ${PF}.jpg
+	https://mirror.yandex.ru/calculate/themes/calculate/wallpaper-22.jpg -> ${PF}.jpg
+	CL21? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-21.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-21.tar.bz2
+	)
+	CL17? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-17.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-17.tar.bz2
+	)
+	CL15? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
+	)
+	CL14? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+	)
+	CL13? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+	)
+	CL12? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+	)
+	CL11? (
+		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
+		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+	)
+	"
+
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
+
+# need for templates
+RDEPEND="${DEPEND}
+	|| ( media-gfx/imagemagick
+	media-gfx/graphicsmagick )"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/themes/Calculate/
+	newins "${DISTDIR}"/${PF}.jpg wallpaper.jpg
+
+	insinto /
+	for useflag in $VERSION_IUSE
+	do
+		if use $useflag
+		then
+			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
+			if [[ $useflag == CL21 ]]
+			then
+				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_21
+			fi
+			if [[ $useflag == CL17 ]]
+			then
+				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_17
+			fi
+			if [[ $useflag == CL15 ]]
+			then
+				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_15
+			fi
+			if [[ $useflag == CL14 ]]
+			then
+				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_14
+			fi
+			doins -r usr
+		fi
+	done
+}
diff --git a/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild b/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
index 760d6df07..51b92bc25 100644
--- a/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
+++ b/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/cinnamon/cinnamon-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/cinnamon/cinnamon-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/cinnamon/cinnamon-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/media-gfx/dm-themes-calculate/Manifest b/media-gfx/dm-themes-calculate/Manifest
index 64b8a4aa5..136b3b448 100644
--- a/media-gfx/dm-themes-calculate/Manifest
+++ b/media-gfx/dm-themes-calculate/Manifest
@@ -7,6 +7,8 @@ DIST dm-cls-13.tar.bz2 3140558 BLAKE2B 5b6761062ceda4731b2f3f20e62244345362188de
 DIST dm-themes-calculate-login-17-r5.jpg 1929196 BLAKE2B f05e6276d48d21cfcfd44c78dec2763eedaab4d315d31316e1dfe2fe46f0f9eb4168fce65d09fc3fa755df200f854506bdc777795483b03012e9277a55b64f28 SHA512 e1242085dc10d504661ffb929db50e167c43443927ff7da2c02edd3686d9fca46f1b0b87f1a70e0d883c8893f30c9beb67b067a170c648e49c0d64be01b53bf7
 DIST dm-themes-calculate-login-18-r1.jpg 1692858 BLAKE2B 2e3c8b97c97ef1fa35ad08ca11542b7e27fb871a762aeed193578ff9a8a02f4b252c0537b708226a62e479e7e6fff736207a0ab99f65dcf516fdfc9550de4b5e SHA512 f1a6b97db272a202b2dbb6ccc31f6ee4dfc253c53a4fb981bc0abd6ed8deed9d724b5bd7136bbfd2f15cf46de48da80018ced1c020bff015181930e98257e010
 DIST dm-themes-calculate-login-21.jpg 599960 BLAKE2B 1185b772039393bbbb104ea6a29347ccd9eb5ca68c7cab7d5a715fe34b584d55933e3b37a9c8036a566e09b6d770bb16200c21cc535fc358695120180c8a978e SHA512 b1c48c5750c30f9436a6a0e12c4d5633bf87ac6ef1e2fa373aa7b81676d3c51220168a8a5e558045e1034ce8c1eaa28c4e472f2fa9ed114ab37ae98a2de43cb9
+DIST dm-themes-calculate-login-22.jpg 598326 BLAKE2B 6f3e47cbab753bd9c93693708b80fa5707d25d3a9a18991bd5917e7c0d14f9ddd08ed58a2e785a028127095790136d58eabc59b9d13754c324bcfc5004491559 SHA512 51c807f31e4aa06f41be135757f6ec871f3aedce88c45f33b44cbabe19da731527b8921f661edc4944e3124c0546b88ad27d57c40da1f79c0e5cbf7529958466
 DIST dm-themes-calculate-splash-17-r5.jpg 6911444 BLAKE2B a1206edcbeb03cd1e710c298f40f89b2c33e71096707444d69ba99717be7f1ec8721f13ba434c34e7f9791f488f32ba9e7e4139e933748683ffcf90a4d7f64f1 SHA512 f24965479aaff006b161b5aab84797cb1239f6fc53f9d354bafcb187d937fe67d6f3edbd436458caf386ddcede079e94c1553fb4ed45febf59340c8209c34292
 DIST dm-themes-calculate-splash-18-r1.jpg 1750291 BLAKE2B abb936f262488a896a7056528edb0a2d604b8f1f571aba04ff0599a5a81badc43afb6415d7b69c3704f0b14122f750618919ef2cca889ee2ef8e0dc408c99055 SHA512 59f9ae99fca924a127091aae59a540fd37b23ea6fce1591e6503ed4ab22ed5b0dfa1cd0f163f89d4f531783a66c73a27a921d969a3ea7c41ec62dc60083ef5b3
 DIST dm-themes-calculate-splash-21.jpg 599960 BLAKE2B 1185b772039393bbbb104ea6a29347ccd9eb5ca68c7cab7d5a715fe34b584d55933e3b37a9c8036a566e09b6d770bb16200c21cc535fc358695120180c8a978e SHA512 b1c48c5750c30f9436a6a0e12c4d5633bf87ac6ef1e2fa373aa7b81676d3c51220168a8a5e558045e1034ce8c1eaa28c4e472f2fa9ed114ab37ae98a2de43cb9
+DIST dm-themes-calculate-splash-22.jpg 598326 BLAKE2B 6f3e47cbab753bd9c93693708b80fa5707d25d3a9a18991bd5917e7c0d14f9ddd08ed58a2e785a028127095790136d58eabc59b9d13754c324bcfc5004491559 SHA512 51c807f31e4aa06f41be135757f6ec871f3aedce88c45f33b44cbabe19da731527b8921f661edc4944e3124c0546b88ad27d57c40da1f79c0e5cbf7529958466
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
index 61fde61bf..02d437f3b 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
@@ -14,16 +14,16 @@ IUSE="themes_CLD themes_CLDX themes_CLS
 themes_CLDG"
 
 SRC_URI="themes_CLD? (
-	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cld-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/dm/dm-cld-13.tar.bz2
 )
 themes_CLDX? (
-	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cldx-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/dm/dm-cldx-13.tar.bz2
 )
 themes_CLDG? (
-	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cldg-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/dm/dm-cldg-13.tar.bz2
 )
 themes_CLS? (
-	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cls-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/dm/dm-cls-13.tar.bz2
 )"
 
 REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLS themes_CLDG )"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
index 19615e218..f8476e739 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-14-r4.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/dm/dm-14-r4.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/dm/dm-14-r4.tar.bz2"
 
 RDEPEND=""
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
index 06d598ff2..cc8fc65fa 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-15.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/dm/dm-15.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/dm/dm-15.tar.bz2"
 
 RDEPEND=""
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild
new file mode 100644
index 000000000..023a29b06
--- /dev/null
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+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
+	media-gfx/graphicsmagick )"
+
+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/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
index 22fb517c1..f4ceb3b2a 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
index 22fb517c1..f4ceb3b2a 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
index c87ba547b..e9cf49ac9 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
index e054951e6..52ff76060 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
index c87ba547b..e9cf49ac9 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
index e054951e6..52ff76060 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild
index 47b99403a..f41c90963 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	https://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild
index 30b0b9cba..4176b6fed 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
index b7f3b40e4..77e301307 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
@@ -14,25 +14,25 @@ IUSE="themes_CLD themes_CLDX themes_CLS themes_CLDG themes_CSS themes_CDS themes
 
 SRC_URI="
 themes_CLD? (
-	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cld-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/grub/grub-cld-13.tar.bz2
 )
 themes_CLDX? (
-	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cldx-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/grub/grub-cldx-13.tar.bz2
 )
 themes_CLDG? (
-	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cldg-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/grub/grub-cldg-13.tar.bz2
 )
 themes_CMC? (
-	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cmc-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/grub/grub-cmc-13.tar.bz2
 )
 themes_CLS? (
-	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cls-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/grub/grub-cls-13.tar.bz2
 )
 themes_CDS? (
-	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cds-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/grub/grub-cds-13.tar.bz2
 )
 themes_CSS? (
-	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-css-13.tar.bz2
+	https://mirror.calculate-linux.org/themes/grub/grub-css-13.tar.bz2
 )"
 
 REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLS themes_CLDG themes_CSS
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
index e2ebd5094..c0f7b95b9 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-14-r1.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/grub/grub-14-r1.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/grub/grub-14-r1.tar.bz2"
 RDEPEND="!<sys-boot/calcboot-4.05.0-r1"
 
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
index 47c9f55e1..a979be3b5 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/grub/grub-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/grub/grub-${PV}.tar.bz2"
 RDEPEND="!<sys-boot/calcboot-4.05.0-r1"
 
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
index 1e5079b73..bcc716107 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/calculate/grub-17-r1.jpg -> ${P}.jpg
+SRC_URI="https://mirror.calculate-linux.org/themes/calculate/grub-17-r1.jpg -> ${P}.jpg
 	http://mirror.yandex.ru/calculate/themes/calculate/grub-17-r1.jpg -> ${P}.jpg"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
index 0b2fd04ef..dee393773 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/calculate/grub-18-r1.jpg -> ${PF}.jpg
+SRC_URI="https://mirror.calculate-linux.org/themes/calculate/grub-18-r1.jpg -> ${PF}.jpg
 	http://mirror.yandex.ru/calculate/themes/calculate/grub-18-r1.jpg -> ${PF}.jpg"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
index 9aa15def3..1e43aef44 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
index 9aa15def3..1e43aef44 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
index 75248af91..fbaf2e33f 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND=">=media-gfx/dm-themes-calculate-${PV}
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
index 048b37e72..485ad0169 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PV}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
index 07618f557..e1b1e8e38 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="x11-themes/gtk-engines-murrine
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
index 07618f557..e1b1e8e38 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="x11-themes/gtk-engines-murrine
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
index 07618f557..e1b1e8e38 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="x11-themes/gtk-engines-murrine
diff --git a/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild b/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
index 5849fb770..90c6e28e3 100644
--- a/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
+++ b/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lxdm/lxdm-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lxdm/lxdm-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lxdm/lxdm-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild b/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild
index e63acd568..7d71dd421 100644
--- a/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild
+++ b/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lxqt/${PF}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/lxqt/${PF}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lxqt/${PF}.tar.bz2"
 
 src_install() {
diff --git a/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild b/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild
index a383952cc..6b21fea32 100644
--- a/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild
+++ b/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/mate/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/mate/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/mate/${P}.tar.bz2"
 
 src_install() {
diff --git a/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild b/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild
index c932b8a57..3d485406b 100644
--- a/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild
+++ b/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/mate/${PF}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/mate/${PF}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/mate/${PF}.tar.bz2"
 
 src_install() {
diff --git a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
index 206809fe6..e10512222 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2"
 
 
diff --git a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild
index 56c8ae11b..5c5c5b406 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/plasma/plasma-calculate-${PVR}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/plasma/plasma-calculate-${PVR}.tar.bz2"
 
 
diff --git a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
index 7c4dec369..b195b2f43 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2"
 
 
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
index 7311a032f..853b02f19 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/splash/splash-themes-calculate-15-r2.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/splash/splash-themes-calculate-15-r2.tar.bz2"
 
 RDEPEND="media-gfx/splashutils
 media-fonts/droid
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild
index 5e4c221bf..196de3dfd 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild
@@ -15,13 +15,13 @@ IUSE="+verbose +silent +silent-shutdown"
 REQUIRED_USE="|| ( verbose silent silent-shutdown )"
 
 SRC_URI="silent? ( 
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-silent-17.jpg -> ${PN}-silent-17.jpg
+		https://mirror.calculate-linux.org/themes/calculate/splash-silent-17.jpg -> ${PN}-silent-17.jpg
 		http://mirror.yandex.ru/calculate/themes/calculate/splash-silent-17.jpg -> ${PN}-silent-17.jpg )
 	verbose? (
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-verbose-17-r1.jpg -> ${PN}-verbose-17-r1.jpg
+		https://mirror.calculate-linux.org/themes/calculate/splash-verbose-17-r1.jpg -> ${PN}-verbose-17-r1.jpg
 		http://mirror.yandex.ru/calculate/themes/calculate/splash-verbose-17-r1.jpg -> ${PN}-verbose-17-r1.jpg )
 	silent-shutdown? (
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-shutdown-17.jpg -> ${PN}-shutdown-17.jpg
+		https://mirror.calculate-linux.org/themes/calculate/splash-shutdown-17.jpg -> ${PN}-shutdown-17.jpg
 		http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-17.jpg -> ${PN}-shutdown-17.jpg )"
 
 DEPEND="media-gfx/splashutils
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild
index fa0bc66c2..00ba22b00 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild
@@ -15,13 +15,13 @@ IUSE="+verbose +silent +silent-shutdown"
 REQUIRED_USE="|| ( verbose silent silent-shutdown )"
 
 SRC_URI="silent? ( 
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-silent-18.jpg -> ${PN}-silent-18.jpg
+		https://mirror.calculate-linux.org/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 )
 	verbose? (
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-verbose-18.jpg -> ${PN}-verbose-18.jpg
+		https://mirror.calculate-linux.org/themes/calculate/splash-verbose-18.jpg -> ${PN}-verbose-18.jpg
 		http://mirror.yandex.ru/calculate/themes/calculate/splash-verbose-18.jpg -> ${PN}-verbose-18.jpg )
 	silent-shutdown? (
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-shutdown-18-r1.jpg -> ${PN}-shutdown-18-r1.jpg
+		https://mirror.calculate-linux.org/themes/calculate/splash-shutdown-18-r1.jpg -> ${PN}-shutdown-18-r1.jpg
 		http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-18-r1.jpg -> ${PN}-shutdown-18-r1.jpg )"
 
 DEPEND="media-gfx/splashutils
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild
index 6039ddce8..f441550b1 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild
@@ -15,10 +15,10 @@ IUSE="+silent +silent-shutdown"
 REQUIRED_USE="|| ( silent silent-shutdown )"
 
 SRC_URI="silent? ( 
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-silent-${PV}.png -> ${PN}-silent-${PV}.png
+		https://mirror.calculate-linux.org/themes/calculate/splash-silent-${PV}.png -> ${PN}-silent-${PV}.png
 		http://mirror.yandex.ru/calculate/themes/calculate/splash-silent-${PV}.png -> ${PN}-silent-${PV}.png )
 	silent-shutdown? (
-		ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-shutdown-${PV}.jpg -> ${PN}-shutdown-${PV}.jpg
+		https://mirror.calculate-linux.org/themes/calculate/splash-shutdown-${PV}.jpg -> ${PN}-shutdown-${PV}.jpg
 		http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-${PV}.jpg -> ${PN}-shutdown-${PV}.jpg )"
 
 DEPEND="sys-boot/plymouth-calculate-plugin
diff --git a/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild b/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild
index fadc7f105..159fefa64 100644
--- a/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild
+++ b/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/xfce/${PF}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/xfce/${PF}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/xfce/${PF}.tar.bz2"
 
 src_install() {
diff --git a/profiles/calculate.env b/profiles/calculate.env
index a1a173ce0..c7bbad163 100644
--- a/profiles/calculate.env
+++ b/profiles/calculate.env
@@ -74,7 +74,7 @@ cl_update_autocheck_set = on
 cl_update_binhost_list = https://calculate-linux.freemirror.org/calculate-linux,http://sft.if.usp.br/calculate,https://ftp.acc.umu.se/mirror/calculate-linux.org,https://mirror-hk.koddos.net/calculate-linux,https://mirror.koddos.net/calculate-linux,http://miroir.linuxtricks.fr/calculate,https://mirror.yandex.ru/calculate,ftp://ftp.mgts.by/pub/calculate,ftp://ftp.mtu.ru/pub/calculate-linux,ftp://ftp.download.asso-linux-online.fr/download/calculate,https://mirror.cedia.org.ec/calculate,http://www.gtlib.gatech.edu/pub/calculate,https://stage4linux.com/mirrors/calculate,https://mirror.ihost.md/calculate-linux,https://ftpmirror1.infania.net/mirror/calculate-linux
 cl_update_binhost_revision_path = grp/ini.env
 cl_update_binhost_stable_set = on
-cl_update_binhost_unstable_list = ftp://ftp.calculate-linux.org/testing,http://miroir.linuxtricks.fr/testing
+cl_update_binhost_unstable_list = https://mirror.calculate-linux.org/testing,https://miroir.linuxtricks.fr/testing
 cl_update_lines_limit = 30
 cl_update_metadata_force = skip
 cl_update_rep_host = calculate,github,bitbucket
diff --git a/profiles/default/amd64/make.defaults b/profiles/default/amd64/make.defaults
index 450581d30..78897df64 100644
--- a/profiles/default/amd64/make.defaults
+++ b/profiles/default/amd64/make.defaults
@@ -3,4 +3,4 @@ CXXFLAGS="${CFLAGS}"
 CHOST="x86_64-pc-linux-gnu"
 GRUB_PLATFORMS="efi-64 efi-32 pc"
 PKGDIR="/var/calculate/packages/x86_64"
-PORTAGE_BINHOST="ftp://ftp.calculate-linux.org/calculate/grp/x86_64"
+PORTAGE_BINHOST="https://mirror.calculate-linux.org/grp/x86_64"
diff --git a/profiles/default/make.defaults b/profiles/default/make.defaults
index 0fee293c7..c3bf0eda1 100644
--- a/profiles/default/make.defaults
+++ b/profiles/default/make.defaults
@@ -80,7 +80,7 @@ CPU_FLAGS_X86="3dnow 3dnowext mmx sse sse2 *"
 DISTDIR="/var/calculate/distfiles"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --autounmask --binpkg-changed-deps=n --binpkg-respect-use=y --jobs=4 --quiet-build=n"
 FEATURES="getbinpkg parallel-install -news -userpriv"
-GENTOO_MIRRORS="http://mirror.yandex.ru/gentoo-distfiles http://distfiles.gentoo.org"
+GENTOO_MIRRORS="http://distfiles.gentoo.org"
 INPUT_DEVICES="${INPUT_DEVICES} evdev mutouch synaptics"
 INSTALL_MASK="/etc/systemd /lib*/systemd /usr/lib*/systemd /etc/shorewall*/* -/etc/shorewall*/shorewall*.conf"
 LCD_DEVICES="*"
diff --git a/profiles/default/x86/make.defaults b/profiles/default/x86/make.defaults
index 98aad6163..36bcd66d2 100644
--- a/profiles/default/x86/make.defaults
+++ b/profiles/default/x86/make.defaults
@@ -3,4 +3,4 @@ CXXFLAGS="${CFLAGS}"
 CHOST="i686-pc-linux-gnu"
 GRUB_PLATFORMS="pc"
 PKGDIR="/var/calculate/packages/i686"
-PORTAGE_BINHOST="ftp://ftp.calculate-linux.org/calculate/grp/i686"
+PORTAGE_BINHOST="https://mirror.calculate-linux.org/grp/i686"
diff --git a/sys-apps/calculate-access/calculate-access-0.1.2.ebuild b/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
index 4c6409ca6..c917803b7 100644
--- a/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
+++ b/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Cryptodata management tools"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_access"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest
index f0b2d65b4..6aa80b1a9 100644
--- a/sys-apps/calculate-server/Manifest
+++ b/sys-apps/calculate-server/Manifest
@@ -5,3 +5,4 @@ DIST calculate-server-2.3.4.tar.bz2 238318 BLAKE2B 302b00475f3a6ff3edc2f188a2fea
 DIST calculate-server-2.3.5.tar.bz2 238118 BLAKE2B 859254831388dcf1e3f354801a9cc10e46e3aae179640b55be38efc16078819c445fa1db3a4b8d177674a747176d658fa0d424f50b136fe0393fce89690798de SHA512 a1d6aca2c8f86c22b31309a7c2dd959485a39fade05c927720aa439c03a0d092953680753c1df5ede9952d3cdce7a48c9e4955dbea4d4078b28867dd33085e36
 DIST calculate-server-2.3.6.tar.bz2 238163 BLAKE2B bf8d37cf6d639efcae8354fbd2745273694ad9885b1a7dcd0cb7b30647290a29c8f2688929c5af48d9524f6041ec8ca46a7624b5110af20b7954d19a5889913c SHA512 d6de8b5977f161d0656b4b21e6ed8ed97713b1724f6ba6689348b04b2f1ccf1abffa3ba12ac923dc436514b7c798fa5e6eff9abe203ce92eca24b01c35098129
 DIST calculate-server-2.3.7.tar.bz2 238191 BLAKE2B 0d31473ebdca8255924ffbe3f132a13ac45739cdd638abc6e812900b5f7d6c80b622b273d2bf2492ca10d8506b20f9d120cfe6cab53f60360d0186b530c74b64 SHA512 c8b3b5d76ca0320eac2b416e21c8a11b9094f9437a71372a0382066181e2e2b836d31bd837dee87a9c8c4492d547aff870f4b26115ae766b17d67391e7766c4c
+DIST calculate-server-2.3.8.tar.bz2 238546 BLAKE2B ef2e07b2967406dbae66422650f3d60ff8b233bd302622670dc7933cf158ffa28cecab6080d2cedee9a13eea008d2032f36a615b98ebd24c0d8cf88bc86fcdc9 SHA512 6434263139651e68ab0d2869cbafeed31f1bb4bb595806509d5b45fa283f59665c2a3fe7b7ad7a5f7eb22c2e7dfa756eda45faefe3e87e999632852df0645e2b
diff --git a/sys-apps/calculate-server/calculate-server-2.3.1.ebuild b/sys-apps/calculate-server/calculate-server-2.3.1.ebuild
index 7ef55dfb0..9458d45ba 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.1.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.2.ebuild b/sys-apps/calculate-server/calculate-server-2.3.2.ebuild
index 7ef55dfb0..9458d45ba 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.2.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.3.ebuild b/sys-apps/calculate-server/calculate-server-2.3.3.ebuild
index 7ef55dfb0..9458d45ba 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.3.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.4.ebuild b/sys-apps/calculate-server/calculate-server-2.3.4.ebuild
index 7ef55dfb0..9458d45ba 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.4.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.5.ebuild b/sys-apps/calculate-server/calculate-server-2.3.5.ebuild
index 7ef55dfb0..9458d45ba 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.5.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.6.ebuild b/sys-apps/calculate-server/calculate-server-2.3.6.ebuild
index 7ef55dfb0..9458d45ba 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.6.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.7.ebuild b/sys-apps/calculate-server/calculate-server-2.3.7.ebuild
index 7ef55dfb0..9458d45ba 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.7.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.8.ebuild b/sys-apps/calculate-server/calculate-server-2.3.8.ebuild
new file mode 100644
index 000000000..9458d45ba
--- /dev/null
+++ b/sys-apps/calculate-server/calculate-server-2.3.8.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="7"
+PYTHON_COMPAT=(python3_9)
+
+inherit distutils-r1
+
+SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Configuration utility for Linux services"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+IUSE="calculate_nomail
+calculate_nodhcp
+calculate_noftp
+calculate_nojabber
+calculate_nonamed
+calculate_nosamba
+calculate_noproxy"
+
+DEPEND="!sys-apps/calculate-lib
+	acct-group/ldap
+	acct-user/ldap
+	>=net-nds/openldap-2.3[-minimal]
+	>=sys-auth/pam_ldap-180[ssl]
+	>=sys-auth/nss_ldap-239
+	!<sys-apps/calculate-utils-3.5.0_alpha44
+	!calculate_nosamba? (
+		|| ( 
+			<net-fs/samba-4[acl,client,cups,ldap,netapi,pam,server,smbclient]
+			>=net-fs/samba-4[acl,client,cups,ldap,pam]
+		)
+	)
+	!calculate_nomail? ( 
+		|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
+			>=net-mail/dovecot-1.2.0[ldap,pam,ssl(+)]
+		)
+		>=mail-filter/procmail-3.22
+		dev-python/pymilter[python_targets_python3_9]
+		>=mail-mta/postfix-2.2[ldap,pam,ssl,sasl,dovecot-sasl]
+	)
+	!calculate_noftp? (
+		|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,ssl,tcpd]
+			>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd]
+		)
+	)
+	!calculate_nojabber? (
+		|| ( >=net-im/ejabberd-2.1.8[mod_pubsub,ldap]
+			>=net-im/ejabberd-16.04-r1[ldap] )
+		|| ( media-gfx/imagemagick
+			media-gfx/graphicsmagick )
+	)
+	!calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] )
+	!calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] )
+	!calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )
+	dev-python/python-ldap[ssl,python_targets_python3_9]
+	dev-python/lxml[python_targets_python3_9]
+"
+
+RDEPEND="${DEPEND}"
+
+
+pkg_postinst() {
+	if [ -d /var/calculate/server-data/mail/imap ] || \
+		[ -d /var/calculate/server-data/samba/win/profiles ] || \
+		[ -d /var/calculate/server-data/samba/unix/profiles ] || \
+		[ -d /var/calculate/server-data/samba/win/netlogon ];
+	then
+		ewarn "Data found in directories of previous version calculate-server"
+	fi
+
+	if [ -d /var/calculate/server-data/mail/imap ];
+	then
+		if ! [ -d /var/calculate/server-data/mail~ ];
+		then
+			if mv /var/calculate/server-data/mail/imap \
+				/var/calculate/server-data/mail~ && \
+				rmdir /var/calculate/server-data/mail && \
+				mv /var/calculate/server-data/mail~ \
+					/var/calculate/server-data/mail;
+			then
+				ewarn
+				ewarn "Data from /var/calculate/server-data/mail/imap"
+				ewarn "was moved to /var/calculate/server-data/mail"
+				MAILUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${MAILUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/mail/imap"
+			eerror "Please manualy move /var/calculate/server-data/mail/imap"
+			eerror "to /var/calculate/server-data/mail"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/win/profiles ];
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/profiles/win ];
+		then
+			if mkdir -p /var/calculate/server-data/samba/profiles && \
+				mv  /var/calculate/server-data/samba/win/profiles \
+					/var/calculate/server-data/samba/profiles/win;
+			then
+				ewarn
+				ewarn "Data from /var/calculate/server-data/samba/win/profiles"
+				ewarn "was moved to /var/calculate/server-data/samba/profiles/win"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/win/profiles"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/win/profiles"
+			eerror "to /var/calculate/server-data/samba/profiles/win"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/unix/profiles ]; \
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/profiles/unix ];
+		then
+			if mkdir -p /var/calculate/server-data/samba/profiles && \
+				mv -f /var/calculate/server-data/samba/unix/profiles \
+					/var/calculate/server-data/samba/profiles/unix;
+			then
+				rmdir /var/calculate/server-data/samba/unix
+				ewarn
+				ewarn "Data from /var/calculate/server-data/samba/unix/profiles"
+				ewarn "was moved to /var/calculate/server-data/samba/profiles/unix"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/unix/profiles"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/unix/profiles"
+			eerror "to /var/calculate/server-data/samba/profiles/unix"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/win/netlogon ];
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/netlogon ];
+		then
+			if mv -f /var/calculate/server-data/samba/win/netlogon \
+				/var/calculate/server-data/samba/netlogon;
+			then
+				rmdir /var/calculate/server-data/samba/win
+				ewarn
+				ewarn "Data form /var/calculate/server-data/samba/win/netlogon"
+				ewarn "was moved to /var/calculate/server-data/samba/netlogon"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/win/netlogon"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/win/netlogon"
+			eerror "/var/calculate/server-data/samba/netlogon"
+		fi
+	fi
+
+	if [ "${MAILUPDATE}" == "TRUE" ];
+	then
+	    ewarn
+		ewarn "Please update mail service by the command:"
+		ewarn "\tcl-update mail"
+	fi
+	if [ "${SAMBAUPDATE}" == "TRUE" ];
+	then
+	    ewarn
+		ewarn "Please update samba service by the command:"
+		ewarn "\tcl-update samba"
+	fi
+
+	ewarn
+	ewarn "WARNING!!! If you have the samba service, then update it by the command:"
+	ewarn "\tcl-update samba"
+}
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
index da4952137..945588524 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
index da4952137..945588524 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
index da4952137..945588524 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
index 89675d657..b8c0db246 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
index 9b7d5e2f7..3629ecc29 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
index 8977e89f7..11212e6b9 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 PYTHON_COMPAT=(python3_9)
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${PF}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${PF}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${PF}.tar.bz2"
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
index 872b73e0d..a88658762 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 PYTHON_COMPAT=(python3_9)
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
diff --git a/sys-apps/keyexec/keyexec-0.1.3.ebuild b/sys-apps/keyexec/keyexec-0.1.3.ebuild
index abc34fe9b..edd7d423e 100644
--- a/sys-apps/keyexec/keyexec-0.1.3.ebuild
+++ b/sys-apps/keyexec/keyexec-0.1.3.ebuild
@@ -5,7 +5,7 @@
 EAPI=7
 DESCRIPTION="Runs other programs with the user password, kept in the Linux kernel"
 HOMEPAGE="http://www.calculate-linux.org/main/en/keyexec"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 		http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild b/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
index 6c924b24e..e210f3aa1 100644
--- a/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
+++ b/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit pam
 
 DESCRIPTION="Module of the waiting client daemon"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild b/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
index 875fc6ff2..1b8f3b508 100644
--- a/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
+++ b/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit pam
 
 DESCRIPTION="Keeps a login and the password the user in the kernel"
 HOMEPAGE="http://www.calculate-linux.org/main/en/pam_keystore"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild b/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
index 81c257178..2080c48c8 100644
--- a/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
+++ b/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit pam
 
 DESCRIPTION="System authentification update checkup tool"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild b/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild
index ead3a1471..1c36c766c 100644
--- a/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild
+++ b/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild
@@ -8,7 +8,7 @@ MYP=linux-firmware-${PV}
 
 KEYWORDS="amd64 x86"
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 DESCRIPTION="Binary firmware for Lenovo Yoga 7 (LNVNB161216) S3 mode"
 HOMEPAGE="https://gist.github.com/zurohki/4b859668c901e6ba13e8187a0d5d734c"
diff --git a/sys-kernel/calculate-sources/Manifest b/sys-kernel/calculate-sources/Manifest
index c14fa7dcc..c09768b2f 100644
--- a/sys-kernel/calculate-sources/Manifest
+++ b/sys-kernel/calculate-sources/Manifest
@@ -2,7 +2,7 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST patch-5.10.73.xz 2213532 BLAKE2B 8069486891bd8bd2d6f15204f6c18848c374a650254a4b381126407fdc3136b625f8e13e3a3ba93817f71c80297a5ad7c4f25a8f43330f0017f37396c033cf95 SHA512 630d564b49ea9e5d67ac2395b312e653ba8aa28011cd5565ad506b0296c7598eebbf2e7a792e06b4c90e75bb764e0c2dc0246b11d496e7ad5533c0e177d887cc
-DIST patch-5.10.75.xz 2235148 BLAKE2B ba41cc264cdd17e09d908dcf1f8f8b1ab03bb1a49b8b38f2459d450f07cc50bf5f3a4b09bc132d0cfddcc827cd3793b32115692021a67b5b2262e04c3b14f19d SHA512 46ede6b29a42c30f700edf8e9bfe0e2dd82798658443c09ff9a4610946e4b2dcb4868d5cc955bb6f331bdebacd7b9434a4efd63ecd31df05a764364cc3901961
-DIST patch-5.14.14.xz 528644 BLAKE2B 3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f SHA512 258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
+DIST patch-5.10.76.xz 2256124 BLAKE2B 2c9b8f25e2a39ad7208313c738db45873ff9bf839d59ca3c3f57d1e7f079581c6d57af79a21e2340d9fbbaa159ac168dd819fab3e840764b360c5ab87c892b6d SHA512 a64d038a370da6a18e5dfea1f9962edc5ea44a144cfc0bebde57672b5a054533fffa5077e37efc8e9171d6fd2e8475de280f1806de6826ba7eebf5799ed0728b
+DIST patch-5.14.15.xz 573672 BLAKE2B 1c33320afd02af7cb159e8b298c56d4bc6e3785387193f3fbb03460240353b7d0d353d69c412fdb2aaf8b33c76f9094e5cee53f02311ea4c2e05d2c73dd653bb SHA512 02f6e4e44e05bcfd9cbb0d2df0df8b42df67980f02decd95fb23bbbd29d0185da85d203ee1de20059863e1dec93f91ca5e1ae18b37763f788f7091a64d62eb53
 DIST patch-5.4.124.xz 3006220 BLAKE2B 394645f0cf7898c98d416e93858b3effe171d5bdbc968bccd876c41de527ce0221331a06744cc081a05407d3b539d7ab83ae526ff1cc99e9e17629af7b968932 SHA512 9a8a5388d921c55a6f620f2da0528c4d0ed4487cfa58ac876b7b9625247860e3b25bbfcd39b4ae73f34c2d2b8a45b155a149613a650a1306bdab4bad57f8f9e9
-DIST patch-5.4.155.xz 3428096 BLAKE2B 963b2aa16b3d176e30ae3f17caa2b2b31c913edb571931879d5a1000c805cdcac41384b7d4654089733847603799c6058ea61cd806d8113d35d66e98a2437892 SHA512 16d377569a362c768dcf7a63d064e2501b6c9d6be19099facc36b391e719ed12b9af558b8e4f690d1e662d3a3cf032a80a89352f620619445401b5b797513906
+DIST patch-5.4.156.xz 3438776 BLAKE2B 60024ef0f6665a425136c32349477056fa49df93974ae11387ca4aab3a3f987e469fe3a38e04c15d016a67c44d364c23806111a86c6d5ee1547833dee3ee9a5a SHA512 96fb6c79d86efa2a578bdf49025e7ec46963fc8d5a4ba2d11a19e4b0c84adbc86033e13400a90fa467b460adbf1f2b4ab60f2b050dfb20c6eb3e497bf885c4aa
diff --git a/sys-kernel/calculate-sources/calculate-sources-5.10.75.ebuild b/sys-kernel/calculate-sources/calculate-sources-5.10.76.ebuild
similarity index 100%
rename from sys-kernel/calculate-sources/calculate-sources-5.10.75.ebuild
rename to sys-kernel/calculate-sources/calculate-sources-5.10.76.ebuild
diff --git a/sys-kernel/calculate-sources/calculate-sources-5.14.14.ebuild b/sys-kernel/calculate-sources/calculate-sources-5.14.15.ebuild
similarity index 100%
rename from sys-kernel/calculate-sources/calculate-sources-5.14.14.ebuild
rename to sys-kernel/calculate-sources/calculate-sources-5.14.15.ebuild
diff --git a/sys-kernel/calculate-sources/calculate-sources-5.4.155.ebuild b/sys-kernel/calculate-sources/calculate-sources-5.4.156.ebuild
similarity index 100%
rename from sys-kernel/calculate-sources/calculate-sources-5.4.155.ebuild
rename to sys-kernel/calculate-sources/calculate-sources-5.4.156.ebuild
diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index c3b6618dd..d0920dab0 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,2 +1,3 @@
 DIST jackett-bin-0.18.1001-amd64.tar.gz 44716701 BLAKE2B 6202a8d7910a795e6325c7ad8ff3a03a91c83b35a83975fe63bb3ff27c2636c53e5ded7184615caed9e3da0d82288ce14d4b50a2fc7f08344108707b4e9b1fb6 SHA512 73c226e91330e1e7ad76b9d7b11b59b32fbc2db5ba66ec293ce6fea6ee3c7f16bd5c33dcae208a006ac8db69ab9b98bfdd2e53c20fe258799fcd76a131763aa4
 DIST jackett-bin-0.18.992-amd64.tar.gz 44715857 BLAKE2B 35fb05e02bd60a04a32e1925d4c9ea2f27b9919e46887ec50a96efc2742be6890211337d38ad1de42c32a3ce5ce334f9159235a1f7d41df9af3c7d7df4c70b03 SHA512 88d14f0ae9ad47d352b1f0f9126ba5133b44a33e0bc1ea923449d5215bbb2fd36a904081806abd918ea78d3c732f5b34abcbfe7900fe0c993e08c12e062cab88
+DIST jackett-bin-0.19.66-amd64.tar.gz 44719883 BLAKE2B 2d703933f52124c430a6c41c17ac07fafba1137d6dd801063f296b5a9bf316268ccb8a7702de49a7f47b9f9e9af338954ff78d23fd8b85436294fa7b5f340f08 SHA512 0de5ee67808264fa55367b98c777b72b010c584e056fec148993ff8a63629b6fe0b2462ece43cb661b5f593e6917172b929ce0014f682cb818916471ace50397
diff --git a/www-apps/jackett-bin/jackett-bin-0.19.66.ebuild b/www-apps/jackett-bin/jackett-bin-0.19.66.ebuild
new file mode 100644
index 000000000..c070c8fd6
--- /dev/null
+++ b/www-apps/jackett-bin/jackett-bin-0.19.66.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="API Support for your favorite torrent trackers"
+HOMEPAGE="https://github.com/Jackett/Jackett"
+SRC_URI="
+	amd64? ( https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz -> ${P}-amd64.tar.gz )
+"
+
+KEYWORDS="amd64"
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="strip"
+
+RDEPEND="
+	acct-user/jackett
+	app-crypt/mit-krb5
+	dev-libs/icu
+	dev-util/lttng-ust
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"/Jackett
+
+src_install() {
+	dodir /opt/jackett
+	cp -a "${S}"/. "${ED}"/opt/jackett || die
+	newinitd "${FILESDIR}"/jackett.initd jackett
+	systemd_dounit "${FILESDIR}"/jackett.service
+	doenvd "${FILESDIR}"/99jackett
+}
diff --git a/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild b/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
index 29fa3ffa5..d90fd885a 100644
--- a/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
+++ b/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Browser extension for Nextcloud Bookmarks"
diff --git a/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild b/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild
index 10cfdd774..235634f5b 100644
--- a/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild
+++ b/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Passman - The password manager for NextCloud / ownCloud"
diff --git a/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild b/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild
index 23ec04531..6fa92d409 100644
--- a/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild
+++ b/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="An efficient blocker for Chromium"
diff --git a/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild b/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild
index 23ec04531..6fa92d409 100644
--- a/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild
+++ b/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="An efficient blocker for Chromium"
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild
index 72eed9287..45604ef46 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/icon/icon-calculate-15-r4.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r4.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-15-r4.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild
index 9b30dcd89..8ca834afc 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/icon/icon-calculate-15-r6.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-15-r6.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild
index f50db4453..2d0d0ed19 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/icon/icon-calculate-15-r6.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-15-r6.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild
index b0d79cc48..941472cf0 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/icon/icon-calculate-19.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-19.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-19.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild b/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
index 9f9709ff5..985982a9a 100644
--- a/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
+++ b/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
@@ -4,7 +4,7 @@
 DESCRIPTION="Calculate X.Org mouse cursor"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-xcursors"
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
diff --git a/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild b/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
index 9f9709ff5..985982a9a 100644
--- a/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
+++ b/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
@@ -4,7 +4,7 @@
 DESCRIPTION="Calculate X.Org mouse cursor"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-xcursors"
 
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
diff --git a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
index 8b3a9d41e..35c9b4119 100644
--- a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
+++ b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
@@ -8,7 +8,7 @@ inherit gnome2-utils
 
 DESCRIPTION="Elementary icon theme is designed to be smooth, sexy, clear, and efficient"
 HOMEPAGE="https://launchpad.net/elementaryicons"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/elementary/${PF}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/elementary/${PF}.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/elementary/${PF}.tar.bz2"
 
 RESTRICT="binchecks strip"
diff --git a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild
index 0bfc42766..71c71c683 100644
--- a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild
+++ b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils
 
 DESCRIPTION="Elementary icon theme is designed to be smooth, sexy, clear, and efficient"
 HOMEPAGE="https://launchpad.net/elementaryicons"
-SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/elementary/${PF}.tar.bz2
+SRC_URI="https://mirror.calculate-linux.org/themes/elementary/${PF}.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/elementary/${PF}.tar.bz2"
 
 RESTRICT="binchecks strip"