diff --git a/media-gfx/gfxboot-themes-calculate/Manifest b/media-gfx/gfxboot-themes-calculate/Manifest
index 5445c2572..26d81cecf 100644
--- a/media-gfx/gfxboot-themes-calculate/Manifest
+++ b/media-gfx/gfxboot-themes-calculate/Manifest
@@ -8,3 +8,4 @@ DIST gfxboot-themes-calculate-19-r1.tar.bz2 101599 BLAKE2B 2695be38b3e65402587a9
 DIST gfxboot-themes-calculate-19-r2.tar.bz2 101582 BLAKE2B 749a24a9c03375e8038464f3b3012805998ca89df1babfc2e8ec381d217a14c629eb0d28c9af259f661f163fadfb6e2e22e4b07bdafe49a9436cf2983cbd2185 SHA512 997ad393fb93e8cabb9c0c94276002859cae390219218493a9733122ea71d1fc4f7116986c8088e85522499b6cacc8189b1f2f17483cf03726644f70010b4b11
 DIST gfxboot-themes-calculate-19-r3.tar.bz2 101521 BLAKE2B 552ac83b582d561b5a6a49256e2d1884a55f02685d43fb65c4d3b0c2c88a4a37ba68cc318c750bd6cbc5e7d96647dab880f034166e2c27bf9942d29cf2ad8230 SHA512 f478feaa917fdbac041b1bd5228524f32598c2bfe048e846a43ffe065be1e5e83876e999ee960c21d53e97738f7fcf1798a1963255b2f9706106fdb1cbe4a9c8
 DIST gfxboot-themes-calculate-19.tar.bz2 100922 BLAKE2B d7560a20084cebfa65e45a8c7afc892e49c854e73528941c81badf320e43f3f2cbcd9f4102e8be973b9ffed1810bd5e38b72a5b222837fb92b273745b579c10f SHA512 46bf7f3b4781f2ab91a57da626c23160bfc2a6f03eb69800a168c29b6f21225a73c54ebad265202444b21f7f437f973dab39f540cdc40fb762605317288a35ff
+DIST gfxboot-themes-calculate-20.tar.bz2 104472 BLAKE2B 424d22cf5f31dca516c3a29aaa91ddb5e3b88c7e01d45ddff50fb2c4398ddccc14907853832a9375ca20dd2b236ba6325fc1f2dab4f1018c0164e7ee04133452 SHA512 802efb7317ad0801b4f5ded809630f070f10aa000cd3450176fdfb96f9969e44c5d2b7f342d061fdf7462f53ab3e67557a6b8992b31c4f8f7713a04042e3076f
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
new file mode 100644
index 000000000..177acf2b2
--- /dev/null
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Gfxboot themes for Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/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
+	!<sys-apps/calculate-utils-3.5.2.6"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/share/themes/gfxboot-themes-calculate
+	insinto /usr/share/themes/gfxboot-themes-calculate
+	doins -r $(find install/* | grep -v -e back.jpg -e install/log -e bootlogo.tar.gz)
+	insinto /usr/share/themes/Calculate
+	newins back.jpg gfxboot.jpg
+}
diff --git a/profiles/default/make.defaults b/profiles/default/make.defaults
index 44a4ae8b4..9980de28e 100644
--- a/profiles/default/make.defaults
+++ b/profiles/default/make.defaults
@@ -70,7 +70,7 @@ USE="${USE} bluetooth wimax"
 # Window manager and speciality
 USE="${USE} gtk libnotify semantic-desktop -gnome X wayland"
 
-L10N="en be bg bs cs da de de-1901 es es-AR es-CL es-ES es-MX et fi fr fr-CA hr hu it kk lt lv nl pl pt pt-BR pt-PT ro ru sk sl sr sq sv uk"
+L10N="en be bg bs cs da de de-1901 el es es-AR es-CL es-ES es-MX et fi fr fr-CA hr hu it kk lt lv nl pl pt pt-BR pt-PT ro ru sk sl sr sq sv uk"
 
 ACCEPT_LICENSE="*"
 AUTOCLEAN="yes"
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/locale.gen b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/locale.gen
index 0739966db..a244235bd 100644
--- a/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/locale.gen
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-libs/glibc/locale.gen
@@ -5,6 +5,7 @@ bs_BA.UTF-8 UTF-8
 cs_CZ.UTF-8 UTF-8
 da_DK.UTF-8 UTF-8
 de_DE.UTF-8 UTF-8
+el_GR.UTF-8 UTF-8
 en_AU.UTF-8 UTF-8
 en_GB.UTF-8 UTF-8
 en_US.UTF-8 UTF-8
diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
index 0884a325c..5f5994648 100644
--- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
+++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/500-VideoPlayer/20-smplayer/install/smplayer-0.6.desktop
@@ -10,6 +10,9 @@ Icon=smplayer
 !Icon[da]=
 !Icon[de]=
 !Icon[el]=
+!Icon[gr]=
+!Icon[el]=
+!Icon[el_GR]=
 !Icon[en_GB]=
 !Icon[es]=
 !Icon[eu]=
diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/keymap.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/keymap.config
index e7cfe1531..f0a34a094 100644
--- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/keymap.config
+++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/keymap.config
@@ -9,6 +9,7 @@ Belgium;Belgier;fr_BE
 French;Français;fr_FR
 French,Canada;Français Canadien;fr_CA
 German;Deutsch;de_DE
+Greek;Ελληνικά;el_GR
 Icelandic;Icelandic;is_IS
 Italian;Italiano;it_IT
 Norwegian,Bokmål;Norsk bokmål;nb_NO
diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/lang.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/lang.config
index 6e75fb82f..5186b3f80 100644
--- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/lang.config
+++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/lang.config
@@ -5,6 +5,7 @@ Bosnian (Bosnia and Herzegovina);Bosanski (Bosna i Hercegovina);bs_BA;bs_BA;Euro
 Czech (Czech Republic);Čeština (Česká republika);cs_CZ;cs_CZ;Europe/Prague
 Danish (Denmark);Dansk (Danmark);da_DK;da_DK;Europe/Copenhagen
 German (Germany);Deutsch (Deutschland);de_DE;de_DE;Europe/Berlin
+Greek (Greece);Greek (Ελληνικά);el_GR;el_GR;Europe/Athens
 English (Australia);English (Australia);en_AU;en_AU;Australia/Canberra
 English (United Kingdom);English (United Kingdom);en_GB;en_GB;Europe/London
 English (United States);English (United States);en_US;en_US;America/New_York
diff --git a/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/el.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/el.tr
new file mode 100644
index 000000000..25898c0e6
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/el.tr
@@ -0,0 +1 @@
+# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/el.tr mirror
diff --git a/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
index db5726ad7..14a125e4b 100644
--- a/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
+++ b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/5-create_bootlogo
@@ -11,6 +11,7 @@ bs.tr
 cs.tr
 da.tr
 de.tr
+el.tr
 en.tr
 es.tr
 et.tr
diff --git a/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/el.tr b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/el.tr
new file mode 100644
index 000000000..25898c0e6
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/9-syslinux/el.tr
@@ -0,0 +1 @@
+# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/el.tr mirror
diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest
index 501851464..5a7189629 100644
--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@@ -29,6 +29,7 @@ DIST calculate-install-3.6.8.8.tar.bz2 84934 BLAKE2B 7053eaaace1863607617cd89058
 DIST calculate-install-3.6.8.9.tar.bz2 85088 BLAKE2B 5b38f0137ddaf5e83219ba01643f6e992a57643bdd2bb4317dc67290771da9ef765abd2d8474dc19c8141cda8b91521d0b9f06bfb10511f3484a8c50fd38789e SHA512 0456b2ef2e7a9853a1f42c9eeb55a0de2a2853ccfb7203a12d70167c312ad25dcdeb57e36df4a64d14dd9989b0a7858b4027a0a6defa230ce7282d26a8925f0e
 DIST calculate-install-3.6.9.1.tar.bz2 85085 BLAKE2B 80304a0beb07bcda5f38029f8d08a2821060914b363cfe52ee03132f4c835f83b929f6e641f81fcd8241b285c7fe64d6a50c7afc203ec0d3456f5a1557190f78 SHA512 cd83353f844a57e0c335d152ed0e9e9692528f617f2f8eebcc7a8fc8b527da74ac83d5a8812104bffc847977887a2bc5edc83718af39bf223ce176bebf212adf
 DIST calculate-install-3.6.9.2.tar.bz2 85016 BLAKE2B 75e9928c15da1a849defea8147fb9a093fa47439d0e68de52f46b6b4037bf3ee38d5b0c97712f963a0bcdd4b35af27422c051dfd2b243719e9e2f779ad985aa3 SHA512 91c29e71cb6744d67640f47601e3c1138716dffa0536258a3a99c692fe4a598f798e5b402170fae378a8e81b587196321f134a6444df564e108ccdb1aa89901f
+DIST calculate-install-3.6.9.3.tar.bz2 84784 BLAKE2B 4f1a416b8152f38d9bcd4951b4c6e897d056ed0c9292e9fdedf7359343c250e8f1d702146e67836f2d63bb7e7b90668c2452b70b3fb0a80e490a7cb021937d4e SHA512 a5a14495b39e6f11fdcb47fa746138bd8fa3ca8d249f6f766f82f837e53af90256c2b23361ecae37489b52949ae906d77af0ef769af5afd37b8c276909836ad4
 DIST calculate-install-3.6.9.tar.bz2 84889 BLAKE2B d68ac321dad7e3d275fe97a82a1466ada9a621a80ad36648543687959c51e2653699cde0e1f160fab1e6d2a058f2e52eccc144d1f16aa37cdc43290bedfd4be7 SHA512 127acaaf600f0f06798a418857523af966c9b71532490b1bc3ded5e371a831a3657c7dfe7958d7f4f7ce2aae9255ef854446823cd01bdc604d2401ead5e22eaa
 DIST calculate-ldap-3.6.8.tar.bz2 11923 BLAKE2B 473714789c6583bf577dca15cc60c125e6ffdb0f8d1fdc14e33209fc76540c380552cbd2064d97ce6c36fd3009b0acfd628360a09006c4a96fb14a735eac53f1 SHA512 aa84559b6571367946b46ad708a9dcad49afc92ad7d2cbf4e24d9665d4482007d66f80e39e988ed7ab79f2da367ca27923fe88ed3918ef4d82fe9493a438beaf
 DIST calculate-ldap-3.6.9.tar.bz2 11928 BLAKE2B 1e1d48e72b2775833beefa3b5f17d7f37247ce5906504565aaa197e429f9a014310b9294e1b475e24797941e27ee4520d030052f79de32362aebb66cfda706fd SHA512 fa7e42fb9ee01049c48659a796b08be4b5d4c5f63106655798e96c1662159b54776522fe9cde96df0c7760b01832c1fa758e4da014bb14b9aaaf9bb1a5de84dd
@@ -37,6 +38,7 @@ DIST calculate-lib-3.6.8.7.tar.bz2 618084 BLAKE2B 6d15becc0e6e88b6f5c9d4234ecc09
 DIST calculate-lib-3.6.8.8.tar.bz2 618062 BLAKE2B 5e33834da34f5d4bb9d629c30bb8753feef9f70fc2d7655cfeec5d7fefe078ff3852af9693fec2127778f93e31d9a0b96bfdc5f4724aed6c53167e17ceabcf07 SHA512 47d27d791bedbab411d5bdbd5b881246b0000e06720017ba1456cf75efbfe18a4258dff6a03ed926b16a460cc4f03b3ce94995720c02edbc2872c0ebe213d730
 DIST calculate-lib-3.6.8.9.tar.bz2 618279 BLAKE2B ba4087640188ddf8fa75c73bd4cb10c3d098c1d611eb9a08883c02d0c963e57fa1c39156686b72602c8929488b2796feb863d0b0122ce092a34db25df30cdda8 SHA512 0d76e144df06be973692477dea5e8975de13e877a3dbd118218a58ea897d921901421f29ed7671ab4619e64d26212d06847084680b4aa8fdb527f149b3b11755
 DIST calculate-lib-3.6.9.2.tar.bz2 618489 BLAKE2B 04ffbab50082006fe319c403d439c167d383a8c3c81d2b68a361d85b0c3701f87725e4d8bc35c03dc6ca76bcdf04ef7991640d0dc3fa5805220b5a485f1bede9 SHA512 79fbcf55b10fe52844c8ccb42dbc172b445432367e785b0cf81468391d23617290f37e21fd178b3c95adeafac8a623598d3f1100146e27a20e3ac06244e52de0
+DIST calculate-lib-3.6.9.4.tar.bz2 618526 BLAKE2B 1fa4ed1681c39b904543b72f07e4aee79e7525f2cb8bb796a5456aa0d67b765675ecf10cef6a83b989a3145e5b2cd0d810d1f7459664148d69cda7f5a2b9601f SHA512 6c92dfa6a8fe1cc02b25cda76885ca3b164d88a91c6fe46c3be72018dfcb66fbcaa84131f61d8650fc33b0e1a2f89f42fc7fdc71ec5795064cccd98fcfda40cf
 DIST calculate-lib-3.6.9.tar.bz2 618228 BLAKE2B 830804476c7f03f50702dc271f6fee6d6ce8eee9420c483cd179fd097a681a3f4670875d9126b929b6b83ea85527334ce84b58fe9d60d4be712303f19d0e9854 SHA512 2f6281392ca7ec360fc008c77b0da508c40a43337756b7bf0d2f8275b50da40f023e863d3beb6adf157a7520ba83943d4d241a208aacf74eebf5125aa972eb48
 DIST calculate-server-3.6.8.tar.bz2 6646 BLAKE2B e8900478cac290c3d3de491e505ea1b691907dbf3b37d959177e191d89360d52e1a4c46cb2e6be4f629aad2ae34c81b3372c47805c2842f766540af86103b039 SHA512 e88163b35a868295cb16a485dbe8d0eb50f11eb67ee34e02d3b27dccb394887cb9448e124767caaa3fefd2776b9e3ae5e31a9ec7af74d5da81635386f7a6ea7b
 DIST calculate-server-3.6.9.tar.bz2 6633 BLAKE2B 7ca41b527a11c4178dbd104bf2ca083cc4441bf656c8991928a7ad07478a50bae4b561ea132cd4c00947e360f48568cdc05bb93db2c9542877ba6b105e56246c SHA512 26d010cd45b64576894b2ba9961223181de5bc58eea0641e751d456c01c7b9f60e3f13223f445b017d39f250fde4d003be19f459ae61b6f05510593b38f1f492
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.9.6.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.9.6.ebuild
new file mode 100644
index 000000000..e3bd28c09
--- /dev/null
+++ b/sys-apps/calculate-utils/calculate-utils-3.6.9.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="7"
+PYTHON_COMPAT=(python2_7)
+
+declare -A CALCULATE_MODULES=(
+	["lib"]="3.6.9.4"
+	["install"]="3.6.9.3"
+	["client"]="3.6.9.4"
+	["desktop"]="3.6.9.2"
+	["update"]="3.6.9.1"
+)
+
+inherit calculate-utils-r12
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64"
+