diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/init.d/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/init.d/.calculate_directory
deleted file mode 100644
index 459f9b597..000000000
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/init.d/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/etc
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/init.d/alsasound b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/init.d/alsasound
deleted file mode 100644
index 3849fcc2c..000000000
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/init.d/alsasound
+++ /dev/null
@@ -1,67 +0,0 @@
-# Calculate format=patch
-(\s*ebegin "Restoring Mixer Levels"
-\s*
-\s*checkpath.*
-\s*
-\s*if \[ ! -r "\$\{alsastatedir\}/asound.state" \] ; then)
-(\s*ewarn "No mixer config in \${alsastatedir}/asound.state, you have to unmute your card!")
-(\s*eend 0
-\s*return 0
-\s*fi)
-\1
- einfo "Setting up ALSA Mixer Levels"
- # set output volumes to 85% - 100%
-#?os_audio==alsa#
- amixer -c 0 scontrols | grep -v Mic | sed -nr "/Wave|Master|Front|LFE|Center|Side|Speaker|Surround|PCM/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -c 0 -q set "{}" 85% unmute &>/dev/null
-#!os_audio#
- amixer -c 0 scontrols | grep -v Mic | sed -nr "/Wave|Master|Front|LFE|Center|Side|Speaker|Surround|PCM/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -c 0 -q set "{}" 100% unmute &>/dev/null
-#os_audio#
- # reduce beep
- amixer -c 0 scontrols | sed -nr "/Beep/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -c 0 -q set "{}" 10% mute &>/dev/null
- # mute all mics
- amixer -c 0 scontrols | sed -nr "/Mic/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -c 0 -q set "{}" 0% mute &>/dev/null
- save
- if ! grep -q "PCM Playback Volume" ${alsastatedir}/asound.state
- then
- sed -ri "s/^\}/\
- control.99 \{\\n\
- iface MIXER\\n\
- name 'PCM Playback Volume'\\n\
- value.0 255\\n\
- value.1 255\\n\
- comment \{\\n\
- access 'read write user'\\n\
- type INTEGER\\n\
- count 2\\n\
- range '0 - 255'\\n\
- tlv '0000000100000008ffffec1400000014'\\n\
- dbmin -5100\\n\
- dbmax 0\\n\
- dbvalue.0 0\\n\
- dbvalue.1 0\\n\
- }\\n\
- \}\\n\
-\}\\n\
-/" ${alsastatedir}/asound.state && restore
- fi
-\3
-(\s*ebegin "Loading ALSA modules"
-\s*eindent
-\s*load_modules)
-(\s*eoutdent)
-(\s*eend \$\? \|\| return 1)
-(\s*fi
-
-\s*if \[ ! -d /proc/asound \]; then)
-\1
- RES=$?
-\2
- eend $RES || return 1
-\4
-#?os_audio==alsa#
-100% unmute
-85% unmute
-#!os_audio#
-85% unmute
-100% unmute
-#os_audio#
diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest
index 4f0024449..fe25e3c63 100644
--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@@ -42,6 +42,7 @@ DIST calculate-install-3.6.9.12.tar.bz2 84847 BLAKE2B c69b5b33a06333de57f4c28b4f
DIST calculate-install-3.6.9.13.tar.bz2 85113 BLAKE2B 0da68a30300aac05a9760c914e76e800a293030d14e2adf1b0421b3d5e93bd25d44d576c5d778cef6453cbb7622792c29f50e69d56c08ddbd1ee2317b150a8c2 SHA512 0e323a30b832b21db7bcc766b58d74a9c706d998e100c120f1abb0bbe0cb62aa70aa0d51d37868b41c6d583005fa26340fa331c8b7ca35a9a8b6273d6051a7c2
DIST calculate-install-3.6.9.14.tar.bz2 84881 BLAKE2B 377e4d204e2acb7b4c6be51691c875ee836f7d2edd9fe2102412d3d0678bfa503a9907069c6a8ce8908c26d8c132e7bb31c7235394a7fbf55224cd8289be9809 SHA512 17164103652da3b9375c8922177cc1260b733369ba794f4a69e0f8c34b40787026e934383e4781d2d57811ba59fe69c65bb853373c29aa42d55acda8dbe1a475
DIST calculate-install-3.6.9.15.tar.bz2 85189 BLAKE2B 90d0489a39dadb737b760cfc4b566aed8c028c578c0a661ad763892fc54b74fa8870c9dcbf15f9100116941681879c13052422f5f8708a1b68023734f6559b63 SHA512 e2d3d97ebadbc288d3e9ed95ba7f45d03d8b1d3a18e514da2d7a95dcce839760fa53b97576299c9f4adf63b40f3e6fff7380458a1875bcf140591d63599ae388
+DIST calculate-install-3.6.9.19.tar.bz2 85604 BLAKE2B 72f582004b2a3ebc01e52f4aaf2d9e8fd42fce4671c98d2018c0f24b2c63b630b5b82031c68d7642666ecfd1b4c3d55ed638f7367f06c24868283e8b980fa082 SHA512 6baf3f9f2fabce88cbcfc76f5b210b82148410d09710eed9e7f93dd1c0201d000b5a1e6b4004c9d58bc91578ef26ab69a8f3d41f4201ffe58c685a79c3152ada
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.7.tar.bz2 85145 BLAKE2B 4304274f8d2f833eb3a8cec1185dd235da9fcee927adf991d7ddce5abab9d8e3ffac177124e34f7d65cb4aff8aceb41c8715220e450e5a95552fa6be5d5340cc SHA512 d8b82604492adbe07eefa7dbd7ca96289386f4152cbe86b6dc8d4997370bca1d087cd06fe02e1a1a93fe5f0a08bd200439b3f723e2aa5c7b85ce0c92c4b8fdeb
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.9.24.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.9.24.ebuild
new file mode 100644
index 000000000..60dff4895
--- /dev/null
+++ b/sys-apps/calculate-utils/calculate-utils-3.6.9.24.ebuild
@@ -0,0 +1,26 @@
+# 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.7"
+ ["install"]="3.6.9.19"
+ ["client"]="3.6.9.10"
+ ["desktop"]="3.6.9.3"
+ ["console-gui"]="3.6.9.1"
+ ["update"]="3.6.9.3"
+ ["builder"]="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"
+