diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/ini.env b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/ini.env
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/ini.env
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopete.notifyrc b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopete.notifyrc
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopete.notifyrc
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopetechatwindow.rc b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopetechatwindow.rc
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopetechatwindow.rc
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopeteemailwindow.rc b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopeteemailwindow.rc
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeteemailwindow.rc
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopeterc b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kopete-4.6/kopeterc
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kopete-4.6/kopeterc
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/ini.env b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/ini.env
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/ini.env
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/ini.env
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/kwallet/.calculate_directory b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/.calculate_directory
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/kwallet/.calculate_directory
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/.calculate_directory
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/kwallet/kdewallet.kwl b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.kwl
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/kwallet/kdewallet.kwl
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwallet/kdewallet.kwl
diff --git a/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/kwalletrc b/profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwalletrc
similarity index 100%
rename from profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-base/kwalletd-4.6/kwalletrc
rename to profiles/templates/3.3/6_ac_desktop_profile/2-user/kde-apps/kwalletd-4.6/kwalletrc
diff --git a/sys-kernel/calculate-sources/Manifest b/sys-kernel/calculate-sources/Manifest
index 42ea053c7..4ee7d1ab7 100644
--- a/sys-kernel/calculate-sources/Manifest
+++ b/sys-kernel/calculate-sources/Manifest
@@ -6,5 +6,6 @@ DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd
 DIST patch-3.12.43.xz 1242492 SHA256 96ce65b950e484ba7abdfb5f7a69ee954c05d00cd4e3a1627b9fe6d742e04a34 SHA512 e06e83ad53bc0b5a44df52e057005987ff8941f57cd46fe03bdb58bdff09dc302b457399f1a2f12ad0e4c657401e14aba085d6fc687e05709e720369dea71eab WHIRLPOOL f63bb589cd87a48f438296bd65afb2c51080ecc868d54d5e32940187f7b56d47eb254a4972398e5f9ef063b96559b1a0cb6e133422276a053902aafaec3dc0db
 DIST patch-3.14.44.xz 909800 SHA256 5af4e26194d3195e5a7c9235b0e6b60f577e7948ba2e1f653341d6263ef2ffc0 SHA512 3eed66584f6cb3958fdbb2d0e15eb240d68d317e073c2a4fbc02d35af773429a968144e3d2eea49c58fe90395de4fd6cf8de909075b95cce0d60ad241c90df4b WHIRLPOOL 957eaa62c01c143c58a49f321aebf8dedf9ad3599c1a2b8049b8dcf35752bc17acb22f0f44aa73880dd126123d6950b741bd214b41ce7da83dd3aed88905a841
 DIST patch-3.18.14.xz 428736 SHA256 488ac8f9fb1bcc5670d2222a4f382ca4e4950c4489bc5217c244b787d2ac8974 SHA512 ba898f08a0252f3bc99b4bb3916dfd6af1935bf6d149a9204b834a16ec615a5f0f53e73c14075c40efd8a8f5cf64b9f1b7dc3e74fb5f5fab87d7b0c6b0517315 WHIRLPOOL 56c0183421104d3bc6555c3465551a8063f0f904de3ae25ef549680ccd189fd5506c646f8f6733c50c0fa7edfb7b7216d7f385f21a157d7f0c1cb8fc2dd2d6e8
+DIST patch-3.18.16.xz 470372 SHA256 f60602c8de2ae7b1507c538b6af65d5b933727a06f56075898ff64fdcf650313 SHA512 868de9793e67e741dc69d61339f66c25d08d36a7d67b09d5644e855e05faf239c1e6e01299812a68edc52a39e132d7ec459929cb5d8a0936fe6aa580a72af80c WHIRLPOOL 5c1d6b5e60cffe8e06a2f6b39ee5bf2b6fb0f05bbd90df5e199e87b5b12871fb18eaaecdf7882e9d69bed1703418436063d872082ca1298829a8975e316fe52d
 DIST patch-3.19.8.xz 250604 SHA256 2e4f01c2ce7ccb2ffee1722724df0a2c2ad6ba5fa74218aa816bda19f3ddcf5d SHA512 29c63beaab43493093a002c29d979e999d11f44eb5465b887ddf75313cd7755d20b3ea19ac1ef68ae586fb4e5275817bfe56d1dfba930ffaabd618702541aebb WHIRLPOOL d8c7fed18c9fa036f7affabc6c9cbb71e825d49e1ed16b387b466a48909cde237e4c07cb0b6d7dc99a79813fb8a2bf42d0fa73faa38a78e5e4ff34b86e31ffb0
 DIST patch-4.0.5.xz 154204 SHA256 60b691210a9e412710e29eac6468d64b6c4d1efc53a6e22878dd51044001adf0 SHA512 377371371752eb706053282ee296f82b3af0c3cf84c346091b1e347c8d00fcf6787c5b51c76955af3f61e9c20c30035b110368ee3ba2587871f0dbc92826de32 WHIRLPOOL af2a7e0c805beeff1a235d8a6958d1251524e02c2c5b0302d0e45e77695f95183ab43f6cfd55f973e6d22ae3da8bd6829e6f180945480d1ed8a3ab5f6c3e6777
diff --git a/sys-kernel/calculate-sources/calculate-sources-3.18.16.ebuild b/sys-kernel/calculate-sources/calculate-sources-3.18.16.ebuild
new file mode 100644
index 000000000..b982de463
--- /dev/null
+++ b/sys-kernel/calculate-sources/calculate-sources-3.18.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+ETYPE="sources"
+
+inherit calculate-kernel-6 eutils
+
+DESCRIPTION="Calculate Linux kernel image"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="http://www.calculate-linux.org"
+
+IUSE="plymouth themes firmware"
+
+DEPEND="vmlinuz? ( || ( app-arch/xz-utils app-arch/lzma-utils )
+		sys-apps/v86d
+		sys-boot/grub
+	)
+	firmware? ( sys-kernel/linux-firmware )
+	themes? ( media-gfx/splash-themes-calculate )
+	"
+
+RDEPEND="${DEPEND}"
+
+SRC_URI="${KERNEL_URI} ${ARCH_URI}"
+
+src_unpack() {
+	calculate-kernel-6_src_unpack
+}
+
+pkg_postinst() {
+	calculate-kernel-6_pkg_postinst
+}