diff --git a/README.md b/README.md
index e3a209c..55fe48b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
# calculate-gnome
Gnome Profile for Calculate Linux Desktop
-This is an unofficial and very experimental profile. Only for home use at your own risk!!!
+
+***This is an unofficial and very experimental profile! Only for home use at your own risk!!!***
+
![Снимок экрана от 2023-04-15 17-10-33](https://user-images.githubusercontent.com/127089814/232235518-d7f4ed4a-ac44-4b52-b212-d39a567a1688.png)
diff --git a/gnome-extra/gnome-shell-extension-just-perfection/Manifest b/gnome-extra/gnome-shell-extension-just-perfection/Manifest
new file mode 100644
index 0000000..0e1cc86
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-just-perfection/Manifest
@@ -0,0 +1 @@
+DIST gnome-shell-extension-just-perfection-24.tar.gz 148644 BLAKE2B f1c7e88a4139d988629bf7327c9249fb6a7a5629ba3d14334cc91b4bab588fbcb1e64df2ff556cc2cefcbe0810f54bc7728f8787b5aa6889d63c4935f608e7db SHA512 b5bfae3d577af5c47ed5b6993aa09ef1afc58aaeb72a113f433d6f5291e184f15a3c6aafa050b4ee94be7f8b29985b0d604110bcd835e9ccb7a6a620ca486d2b
diff --git a/gnome-extra/gnome-shell-extension-just-perfection/gnome-shell-extension-just-perfection-24.ebuild b/gnome-extra/gnome-shell-extension-just-perfection/gnome-shell-extension-just-perfection-24.ebuild
new file mode 100644
index 0000000..cd3e98c
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-just-perfection/gnome-shell-extension-just-perfection-24.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_PV="${PV}.0"
+
+DESCRIPTION="Disable GNOME Shell UI Elements, Change the Behavior and Customize your GNOME Shell Desktop."
+HOMEPAGE="https://gitlab.gnome.org/jrahmatzadeh/just-perfection"
+SRC_URI="https://gitlab.gnome.org/jrahmatzadeh/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+ app-eselect/eselect-gnome-shell-extensions
+ >=gnome-base/gnome-shell-40.0
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+extensions=.local/share/gnome-shell/extensions
+extension_uuid="just-perfection-desktop@just-perfection"
+
+# Not useful for us
+src_compile() { :; }
+
+src_install() {
+ einstalldocs
+ sh scripts/build.sh -i
+ cd ${HOME}/${extensions}/"${extension_uuid}"
+ insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+ doins -r *
+ insinto /usr/share/glib-2.0/schemas
+ doins schemas/*.xml
+ insinto /usr/share/locale
+ doins -r locale/*
+ cd ${S}/
+ rm -r ${HOME}/.local ${HOME}/.cache || die
+ cd ${ED}/usr/share/gnome-shell/extensions/"${extension_uuid}"
+ rm -r locale/ schemas/ || die
+ rm -f CHANGELOG.md LICENSE || die
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
+
diff --git a/profiles/CLDG/package.mask b/profiles/CLDG/package.mask
index b2b6a17..aded1f3 100644
--- a/profiles/CLDG/package.mask
+++ b/profiles/CLDG/package.mask
@@ -1,3 +1,3 @@
-#error: window lost focus when switching layouts Win+Space
+#bug: Window lost focus when switching layouts Win+Space
#in wm/mutter 43.3
=x11-wm/mutter-43.3
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.icons/Calculate/index.theme b/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.icons/Calculate/index.theme
deleted file mode 100644
index eb78c53..0000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.icons/Calculate/index.theme
+++ /dev/null
@@ -1,5 +0,0 @@
-[Icon Theme]
-Name=MyCalculate
-Comment=MyCalculate
-Inherits=Adwaita
-Directories=
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.icons/Calculate/scalable/places/calculate.svg b/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.icons/Calculate/scalable/places/calculate.svg
deleted file mode 100755
index 1f27e16..0000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.icons/Calculate/scalable/places/calculate.svg
+++ /dev/null
@@ -1,3048 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/extension.js b/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/extension.js
deleted file mode 100644
index 795b00f..0000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/extension.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/* extension.js
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-/* exported init */
-
-const GETTEXT_DOMAIN = 'activities-icon-and-label';
-
-const { Atk, Clutter, GLib, GObject, Meta, Shell, St, Gio } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-var BUTTON_DND_ACTIVATION_TIMEOUT = 250;
-
-
-
-const ActivitiesIndicator = GObject.registerClass(
-class ActivitiesIndicator extends PanelMenu.Button {
- _init() {
- super._init(0.0, _('Activities Icon and Label'));
- this.accessible_role = Atk.Role.TOGGLE_BUTTON;
-
- this.name = 'panelActivities';
-
- /* Translators: If there is no suitable word for "Activities"
- in your language, you can use the word for "Overview". */
-
- const box = new St.BoxLayout();
- this.add_child(box);
-
- this._icon = new St.Icon({ icon_name: 'calculate',
- style_class: 'panel-logo-icon', });
- box.add_child(this._icon);
-
- this._label = new St.Label({
- text: _('Activities'),
- y_align: Clutter.ActorAlign.CENTER,
- });
- box.add_child(this._label);
-
- this.label_actor = this._label;
-
- this._showingSignal = Main.overview.connect('showing', () => {
- this.add_style_pseudo_class('overview');
- this.add_accessible_state(Atk.StateType.CHECKED);
- });
-
- this._hidingSignal = Main.overview.connect('hiding', () => {
- this.remove_style_pseudo_class('overview');
- this.remove_accessible_state(Atk.StateType.CHECKED);
- });
-
- this._xdndTimeOut = 0;
- }
-
- handleDragOver(source, _actor, _x, _y, _time) {
- if (source != Main.xdndHandler)
- return DND.DragMotionResult.CONTINUE;
-
- if (this._xdndTimeOut != 0)
- GLib.source_remove(this._xdndTimeOut);
- this._xdndTimeOut = GLib.timeout_add(GLib.PRIORITY_DEFAULT, BUTTON_DND_ACTIVATION_TIMEOUT, () => {
- this._xdndToggleOverview();
- });
- GLib.Source.set_name_by_id(this._xdndTimeOut, '[gnome-shell] this._xdndToggleOverview');
-
- return DND.DragMotionResult.CONTINUE;
- }
-
- vfunc_captured_event(event) {
- if (event.type() == Clutter.EventType.BUTTON_PRESS ||
- event.type() == Clutter.EventType.TOUCH_BEGIN) {
- if (!Main.overview.shouldToggleByCornerOrButton())
- return Clutter.EVENT_STOP;
- }
- return Clutter.EVENT_PROPAGATE;
- }
-
- vfunc_event(event) {
- if (event.type() == Clutter.EventType.TOUCH_END ||
- event.type() == Clutter.EventType.BUTTON_RELEASE) {
- if (Main.overview.shouldToggleByCornerOrButton())
- Main.overview.toggle();
- }
-
- return Clutter.EVENT_PROPAGATE;
- }
-
- vfunc_key_release_event(keyEvent) {
- let symbol = keyEvent.keyval;
- if (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_space) {
- if (Main.overview.shouldToggleByCornerOrButton()) {
- Main.overview.toggle();
- return Clutter.EVENT_STOP;
- }
- }
-
- return Clutter.EVENT_PROPAGATE;
- }
-
- _xdndToggleOverview() {
- let [x, y] = global.get_pointer();
- let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
-
- if (pickedActor == this && Main.overview.shouldToggleByCornerOrButton())
- Main.overview.toggle();
-
- GLib.source_remove(this._xdndTimeOut);
- this._xdndTimeOut = 0;
- return GLib.SOURCE_REMOVE;
- }
-
- _onDestroy() {
- if (this._showingSignal) {
- Main.overview.disconnect(this._showingSignal);
- this._showingSignal = null;
- }
-
- if (this._hidingSignal) {
- Main.overview.disconnect(this._hidingSignal);
- this._hidingSignal = null;
- }
-
- if (this._xdndTimeOut) {
- GLib.Source.remove(this._xdndTimeOut);
- this._xdndTimeOut = null;
- }
-
- super.destroy();
- }
-});
-
-
-class Extension {
- constructor(uuid) {
- this._uuid = uuid;
- }
-
- enable() {
- Main.panel.statusArea['activities'].hide();
-
- this._indicator = new ActivitiesIndicator();
- Main.panel.addToStatusArea(this._uuid, this._indicator, 0, 'left');
-}
-
- disable() {
- this._indicator.destroy();
- this._indicator = null;
-
- if (Main.sessionMode.currentMode !== 'unlock-dialog')
- Main.panel.statusArea['activities'].show();
- }
-}
-
-function init(meta) {
- return new Extension(meta.uuid);
-}
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/metadata.json b/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/metadata.json
deleted file mode 100644
index 31cdb64..0000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/metadata.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "_generated": "Generated by SweetTooth, do not edit",
- "description": "Add an icon to the Activities. \nbased on GNOME gnome-shell and RHEL gnome-shell patch",
- "name": "Activities Icon & Label",
- "shell-version": [
- "40",
- "41",
- "42",
- "43",
- "44"
- ],
- "url": "https://github.com/orbitcorrecton/enhunce-activites/tree/experimental",
- "uuid": "enhunceactivitiese@github.com.orbitcorrection",
- "version": 8
-}
\ No newline at end of file
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/stylesheet.css b/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/stylesheet.css
deleted file mode 100644
index 2c53425..0000000
--- a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/.local/share/gnome-shell/extensions/enhunceactivitiese@github.com.orbitcorrection/stylesheet.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#panel .panel-button .panel-logo-icon {
- -st-icon-style: symbolic;
- padding-right: .4em;
- icon-size: 1.1em; }
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/gnome b/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/gnome
index f03779f..e928b13 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/gnome
+++ b/profiles/templates/6_ac_desktop_profile/2-user/gnome-base/Gnome-40.0/gnome
@@ -68,7 +68,7 @@ enable-animations=true
font-antialiasing='grayscale'
font-hinting='slight'
gtk-theme='Adwaita-dark'
-icon-theme='Calculate'
+icon-theme='Adwaita'
[desktop/screensaver]
color-shading-type='solid'
@@ -86,7 +86,7 @@ button-layout='appmenu:minimize,maximize,close'
[shell]
app-picker-layout=[{'Multimedia': <{'position': <0>}>, 'Graphics': <{'position': <1>}>, 'Internet': <{'position': <2>}>, 'Office': <{'position': <3>}>, 'System': <{'position': <4>}>, 'Accessories': <{'position': <5>}>, 'Utilities': <{'position': <6>}>, 'Settings': <{'position': <7>}>}]
disable-user-extensions=false
-enabled-extensions=['enhunceactivitiese@github.com.orbitcorrection', 'appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock@micxgx.gmail.com', 'ding@rastersoft.com']
+enabled-extensions=['just-perfection-desktop@just-perfection', 'appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock@micxgx.gmail.com', 'ding@rastersoft.com']
favorite-apps=['chromium-browser-chromium.desktop', 'org.gnome.Evolution.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Polari.desktop', 'libreoffice-startcenter.desktop', 'org.gnome.Calculator.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Music.desktop', 'org.gnome.Totem.desktop', 'org.gnome.TextEditor.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'cl-console-gui-update.desktop']
[shell/extensions/dash-to-dock]
@@ -106,6 +106,12 @@ show-home=false
show-trash=false
show-volumes=false
+[shell/extensions/just-perfection]
+activities-button-icon-monochrome=false
+activities-button-icon-path='file:///usr/share/pixmaps/calculate/start-here-blue.svg'
+app-menu=false
+startup-status=0
+
[terminal/legacy]
theme-variant='dark'
diff --git a/profiles/templates/6_ac_update_sync/world/0-ini b/profiles/templates/6_ac_update_sync/world/0-ini
index 1af320e..de99397 100644
--- a/profiles/templates/6_ac_update_sync/world/0-ini
+++ b/profiles/templates/6_ac_update_sync/world/0-ini
@@ -1,4 +1,4 @@
# Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(calculate-gnome.world)==
[calculate-gnome]
-world = 20230413
+world = 20230422
diff --git a/profiles/templates/6_ac_update_sync/world/create/gnome b/profiles/templates/6_ac_update_sync/world/create/gnome
index 882f320..e3be825 100644
--- a/profiles/templates/6_ac_update_sync/world/create/gnome
+++ b/profiles/templates/6_ac_update_sync/world/create/gnome
@@ -77,4 +77,5 @@ gnome-extra/gnome-browser-connector
gnome-extra/gnome-shell-extension-dash-to-dock
gnome-extra/gnome-shell-extension-desktop-icons-ng
gnome-extra/gnome-shell-extension-appindicator
+gnome-extra/gnome-shell-extension-just-perfection
#in#
diff --git a/profiles/templates/6_ac_update_sync/world/update/2023/20230422 b/profiles/templates/6_ac_update_sync/world/update/2023/20230422
new file mode 100644
index 0000000..0dc3d8e
--- /dev/null
+++ b/profiles/templates/6_ac_update_sync/world/update/2023/20230422
@@ -0,0 +1,7 @@
+# Calculate format=world name=world ini(calculate-gnome.world)<#-cut()-#
+
+#-ini(calculate-gnome.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLDG)!=#
+gnome-extra/gnome-shell-extension-just-perfection
+#in#
\ No newline at end of file