diff --git a/SonicDE/sonic-workspace.spec b/SonicDE/sonic-workspace.spec
index bd74dc1..ebd572e 100644
--- a/SonicDE/sonic-workspace.spec
+++ b/SonicDE/sonic-workspace.spec
@@ -3,13 +3,15 @@
 
 Name:           sonic-workspace
 Version:        6.4.5
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Core workspace components for SonicDE (fork of plasma-workspace)
 
 License:        GPL-2.0-or-later
 URL:            https://github.com/Sonic-DE/sonic-workspace
 Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz
 
+%global plasma_version %(echo %{version} | cut -d. -f1-3)
+
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf6-rpm-macros
 BuildRequires:  qt6-qtbase-devel
@@ -141,6 +143,18 @@ Requires:       xsetroot
 
 Conflicts:      plasma-workspace-x11
 
+Provides:       plasma-workspace%{?_isa} >= %{plasma_version}
+Provides:       plasma-workspace >= %{plasma_version}
+Obsoletes:      plasma-workspace <= %{plasma_version}
+
+Provides:       plasma-workspace-libs%{?_isa} >= %{plasma_version}
+Provides:       plasma-workspace-libs >= %{plasma_version}
+Obsoletes:      plasma-workspace-libs <= %{plasma_version}
+
+Provides:       libkworkspace6%{?_isa} >= %{plasma_version}
+Provides:       libkworkspace6 >= %{plasma_version}
+Obsoletes:      libkworkspace6 <= %{plasma_version}
+
 %description
 Core workspace components for SonicDE, fork of plasma-workspace.
 
@@ -154,8 +168,8 @@ Development files for sonic-workspace.
 
 %package        x11
 Summary:        SonicDE X11 session
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       xorg-x11-server-utils
+#Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       xlibre-xserver-Xorg
 Conflicts:      plasma-workspace-x11
 
 %description    x11
@@ -170,23 +184,82 @@ SonicDE X11 session.
 
 %install
 %cmake_install
-%find_lang %{name} --all-name
+# Many translation files have different names than the package
+%find_lang plasmanetworkmanagement --all-name || :
+%find_lang plasmashell --all-name || :
 
-%files -f %{name}.lang
+%files
 %license LICENSES/*
 %{_bindir}/plasma*
-%{_libdir}/*.so.*
+%{_bindir}/krunner
+%{_bindir}/ksmserver
+%{_bindir}/ksplashqml
+%{_bindir}/kcminit*
+%{_bindir}/kde-systemd-start-condition
+%{_bindir}/lookandfeeltool
+%{_bindir}/kcolorschemeeditor
+%{_bindir}/kfontinst
+%{_bindir}/kfontview
+%{_bindir}/xembedsniproxy
+%{_bindir}/gmenudbusmenuproxy
+%{_bindir}/startplasma-wayland
+%{_libdir}/lib*.so.*
+%{_libdir}/kconf_update_bin/
+%{_libexecdir}/ksmserver-logout-greeter
+%{_libexecdir}/plasma*
+%{_libexecdir}/kf6/kauth/
+%{_libexecdir}/kfontprint
+%{_libexecdir}/baloorunner
 %{_qt6_plugindir}/plasma/
-%{_datadir}/plasma*/
+%{_qt6_plugindir}/kf6/
+%{_qt6_plugindir}/phonon_platform/
+%{_qt6_plugindir}/plasma5support/
+%{_qt6_plugindir}/plasmacalendarplugins/
+%{_qt6_qmldir}/org/kde/
+%{_userunitdir}/plasma*
+%{_datadir}/plasma/
+%{_datadir}/plasma5support/
+%{_datadir}/applications/*.desktop
+%{_datadir}/desktop-directories/
+%{_datadir}/config.kcfg/
+%{_datadir}/dbus-1/
+%{_datadir}/doc/
+%{_datadir}/icons/
+%{_datadir}/kconf_update/
+%{_datadir}/kfontinst/
+%{_datadir}/kglobalaccel/
+%{_datadir}/kio*/
+%{_datadir}/knotifications6/
+%{_datadir}/knsrcfiles/
+%{_datadir}/konqsidebartng/
+%{_datadir}/krunner/
+%{_datadir}/kstyle/
+%{_datadir}/kxmlgui5/
+%{_datadir}/polkit-1/
+%{_datadir}/qlogging-categories6/
+%{_datadir}/solid/
+%{_datadir}/timezonefiles/
+%{_datadir}/wayland-sessions/
+%{_datadir}/xdg-desktop-portal/
+%{_datadir}/zsh/
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
+%{_sysconfdir}/xdg/*
 
 %files devel
-%{_includedir}/plasma*/
-%{_libdir}/libSonicWorkspace*.so
-%{_libdir}/cmake/SonicWorkspace/
+%defattr(-,root,root,-)
+%{_includedir}/kworkspace6/
+%{_includedir}/taskmanager/
+%{_includedir}/notificationmanager/
+%{_includedir}/colorcorrect/
+%{_includedir}/krdb/
+%{_includedir}/plasma5support/
+%{_libdir}/lib*.so
+%{_libdir}/cmake/*/
 
 %files x11
-%{_datadir}/xsessions/sonic.desktop
-%{_bindir}/startsonic
+%defattr(-,root,root,-)
+%{_datadir}/xsessions/plasmax11.desktop
+%{_bindir}/startplasma-x11
 
 %changelog
 * Wed Mar 11 2026 Anders Rh <andersrh@example.com> - 6.4.5-1