diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
deleted file mode 100644
index b12d2c3..0000000
--- a/gnome-base/gnome-control-center/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-control-center-43.0-patchset.tar.xz 5940 BLAKE2B 91f47272518175286943a160ef77338b0153aa700a75315708ec478627dda8353b21d257b2baed9961ba77700e43c5655be06591b447c442881f828dd7002622 SHA512 e4683e99f43d9c395238df02228a87df4798df53c936bc8d188e366653d9e75b5219b0b0d8eb66ad21141fc2f1a882b994b96cf523c26b8dc21edb854aa1f384
-DIST gnome-control-center-43.4.1.tar.xz 5735068 BLAKE2B f0fe438d3ac5ac046d3dec7c0d8ed275edb2c6b001465b83bff28e0b4b7748328f980095483faec0a290653d0b2a24b9df767ee96b1b6b6f522a8bab25358cef SHA512 73cf74ba50c838b65033879de0d57eb4e2608d70a9888c6dda4ddd82e83024432d04492ab0c30c35753250bf52e7a05627d09da15f88c08abdd4b516cd70d324
-EBUILD gnome-control-center-43.4.1-r1.ebuild 6647 BLAKE2B 0a98d2622464863909dfee3f077fddbbdb91f1b59142eccfb8c38f5f5b9db7c2dc0c17d01d6549e5ecc625d4ac8674d042f91baaa517396cd11fadab04bd442e SHA512 8d5f038562ccfa2816055266f589a4839565c713b1ba98ef168d0046e4257ec92a3ea446bc8b061e668426c79bbec08bd57fb0447eb8c78491985ef9dc968aee
\ No newline at end of file
diff --git a/gnome-base/gnome-control-center/gnome-control-center-43.4.1-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-43.4.1-r1.ebuild
deleted file mode 100644
index c8f7114..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-43.4.1-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-43.0-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	gnome-online-accounts? (
-		x11-libs/gtk+:3
-		>=net-libs/gnome-online-accounts-3.25.3:=
-	)
-	>=media-libs/libpulse-2.0[glib]
-	>=gui-libs/libadwaita-1.2.0:1
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.70.0:2
-	gnome-base/gnome-desktop:4=
-	>=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-42_alpha
-	dev-libs/libxml2:2
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	app-crypt/gcr:0=
-	>=dev-libs/libpwquality-1.2.2
-	>=gui-libs/gtk-4.4:4[X,wayland=]
-	>=sys-auth/polkit-0.114
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.36
-		>=net-misc/networkmanager-1.24.0[modemmanager]
-		>=net-misc/modemmanager-0.7.990:=
-	)
-	bluetooth? ( net-wireless/gnome-bluetooth:3= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.3.0:=
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	net-libs/gnutls:=
-	media-libs/gsound
-
-	x11-libs/pango
-"
-# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
-# Settings/Sound/Output/Output Device, bug #814110
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	media-libs/libcanberra[pulseaudio,sound]
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? (
-		app-admin/openrc-settingsd
-		sys-auth/elogind
-	)
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper
-	)
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
-	)
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		x11-apps/setxkbmap
-	)
-"
-
-PATCHES=(
-	# Patches from gnome-43 branch
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use debug tracing)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-		-Ddistributor_logo=/usr/share/pixmaps/calculate-gnome-control-center-logo.png
-		-Ddark_mode_distributor_logo=/usr/share/pixmaps/calculate-gnome-control-center-logo-dark.png
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/calculate-gnome-control-center-logo.png
-	doins "${FILESDIR}"/calculate-gnome-control-center-logo-dark.png
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 0f7fbd1..524e022 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -12,4 +12,4 @@ sign-manifests = false
 cache-formats = md5-dict
 
 # Support package.* directories as well as files
-profile-formats = portage-2
+profile-formats = portage-2 profile-bashrcs
\ No newline at end of file
diff --git a/profiles/CLDG/bashrc/logocontrol b/profiles/CLDG/bashrc/logocontrol
new file mode 100644
index 0000000..81e2ce9
--- /dev/null
+++ b/profiles/CLDG/bashrc/logocontrol
@@ -0,0 +1,25 @@
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dcups=$(usex cups enabled disabled)
+		-Ddocumentation=true # manpage
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+		$(meson_use ibus)
+		-Dkerberos=$(usex kerberos enabled disabled)
+		$(meson_use networkmanager network_manager)
+		-Dprivileged_group=wheel
+		-Dsnap=false
+		$(meson_use test tests)
+		$(meson_use input_devices_wacom wacom)
+		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+		-Dmalcontent=false # unpackaged
+		-Ddistributor_logo=/usr/share/pixmaps/calculate-gnome-control-center-logo.png
+		-Ddark_mode_distributor_logo=/usr/share/pixmaps/calculate-gnome-control-center-logo-dark.png
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+}
\ No newline at end of file
diff --git a/profiles/CLDG/make.defaults b/profiles/CLDG/make.defaults
index 32fb484..5a9e484 100644
--- a/profiles/CLDG/make.defaults
+++ b/profiles/CLDG/make.defaults
@@ -9,4 +9,6 @@ USE="${USE} gnome-online-accounts"
 USE="${USE} nautilus"
 USE="${USE} tracker"
 
+EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --usepkg-exclude gnome-base/gnome-control-center"
+
 THEMES="CLDG"
\ No newline at end of file
diff --git a/profiles/CLDG/package.accept_keywords b/profiles/CLDG/package.accept_keywords
index 21097db..38b2ac1 100644
--- a/profiles/CLDG/package.accept_keywords
+++ b/profiles/CLDG/package.accept_keywords
@@ -3,5 +3,4 @@ gnome-extra/gnome-shell-extension-just-perfection ~amd64
 gnome-extra/gnome-software ~amd64
 sys-power/power-profiles-daemon ~amd64
 gui-libs/gtk ~amd64
-gui-libs/libadwaita ~amd64
-=x11-wm/mutter-43.4 ~amd64
\ No newline at end of file
+gui-libs/libadwaita ~amd64
\ No newline at end of file
diff --git a/profiles/CLDG/package.bashrc/gnome b/profiles/CLDG/package.bashrc/gnome
new file mode 100644
index 0000000..82a6da3
--- /dev/null
+++ b/profiles/CLDG/package.bashrc/gnome
@@ -0,0 +1 @@
+gnome-base/gnome-control-center logocontrol
\ No newline at end of file
diff --git a/profiles/CLDG/package.mask b/profiles/CLDG/package.mask
index 1d826e9..30fd047 100644
--- a/profiles/CLDG/package.mask
+++ b/profiles/CLDG/package.mask
@@ -1,4 +1,2 @@
-#bug: Window lost focus when switching layouts Win+Space in wm/mutter 43.3
-=x11-wm/mutter-43.3
 #temporary fix: Some applications icons are missing in x11-themes/adwaita-icon-theme-44.0
 =x11-themes/adwaita-icon-theme-44.0
\ No newline at end of file
diff --git a/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/.calculate_directory b/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/.calculate_directory
new file mode 100644
index 0000000..265aff0
--- /dev/null
+++ b/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip mergepkg()!=
\ No newline at end of file
diff --git a/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/pixmaps/.calculate_directory b/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/pixmaps/.calculate_directory
new file mode 100644
index 0000000..a36f5c1
--- /dev/null
+++ b/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/pixmaps/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/usr/share name=pixmaps pkg(gnome-base/gnome-control-center)>=42.0
\ No newline at end of file
diff --git a/gnome-base/gnome-control-center/files/calculate-gnome-control-center-logo-dark.png b/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/pixmaps/calculate-gnome-control-center-logo-dark.png
similarity index 100%
rename from gnome-base/gnome-control-center/files/calculate-gnome-control-center-logo-dark.png
rename to profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/pixmaps/calculate-gnome-control-center-logo-dark.png
diff --git a/gnome-base/gnome-control-center/files/calculate-gnome-control-center-logo.png b/profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/pixmaps/calculate-gnome-control-center-logo.png
similarity index 100%
rename from gnome-base/gnome-control-center/files/calculate-gnome-control-center-logo.png
rename to profiles/templates/3_ac_install_live/1-merge/gnome-base/gnome-control-center/pixmaps/calculate-gnome-control-center-logo.png