diff --git a/50_kiran-common.gschema.override b/50_kiran-common.gschema.override
new file mode 100644
index 0000000000000000000000000000000000000000..e1375b4aacefb2f5c1ff07cf0ff054f06547dbf9
--- /dev/null
+++ b/50_kiran-common.gschema.override
@@ -0,0 +1,14 @@
+[org.mate.NotificationDaemon]
+popup-location='top_right'
+
+[org.mate.Marco.general]
+theme='Kiran'
+
+[org.mate.Marco.keybinding-commands]
+command-window-screenshot='kiran-flameshot gui'
+
+[org.mate.Marco.global-keybindings]
+run-command-window-screenshot='<Control><Shift>A'
+
+[com.kylinsec.kiran.screensaver]
+split-screensaver-and-lock=true
diff --git a/99-disable-xorg-dpms.conf b/51-disable-xorg-dpms.conf
similarity index 100%
rename from 99-disable-xorg-dpms.conf
rename to 51-disable-xorg-dpms.conf
diff --git a/99_kiran-server.gschema.override b/51_kiran-server.gschema.override
similarity index 61%
rename from 99_kiran-server.gschema.override
rename to 51_kiran-server.gschema.override
index a3ec1771b6d4a5126834d26a43f81d5609f61e7f..0ff835130c3ec2bc5f6e316f229fb8dbd6d092c3 100644
--- a/99_kiran-server.gschema.override
+++ b/51_kiran-server.gschema.override
@@ -4,7 +4,4 @@ disable-hibernate=true
 
 [com.kylinsec.kiran.xsettings]
 net-icon-theme-name="Summer"
-net-theme-name="Kiran-dark"
-
-[com.kylinsec.kiran.screensaver]
-idle-activation-lock=false
+net-theme-name="Kiran-dark"
\ No newline at end of file
diff --git a/99_kiran-org-mate-NotificationDaemon.gschema.override b/99_kiran-org-mate-NotificationDaemon.gschema.override
deleted file mode 100644
index b3063bd6d974ac943e09025d24b8d97436b3e1ee..0000000000000000000000000000000000000000
--- a/99_kiran-org-mate-NotificationDaemon.gschema.override
+++ /dev/null
@@ -1,2 +0,0 @@
-[org.mate.NotificationDaemon]
-popup-location='top_right'
diff --git a/99_unikylin-mate-marco-general-theme.gschema.override b/99_unikylin-mate-marco-general-theme.gschema.override
deleted file mode 100644
index 9c5419aad4c69c5c18a50e25907a5975533b9a2e..0000000000000000000000000000000000000000
--- a/99_unikylin-mate-marco-general-theme.gschema.override
+++ /dev/null
@@ -1,2 +0,0 @@
-[org.mate.Marco.general]
-theme='Kiran-dark'
diff --git a/kiran-desktop-2.6.0.tar.gz b/kiran-desktop-2.6.0.tar.gz
index 665a696b7b2ac6a95b37b44a046efc75d4a81552..c64caef5dfcd4a06604e747612b010eb174f0853 100644
Binary files a/kiran-desktop-2.6.0.tar.gz and b/kiran-desktop-2.6.0.tar.gz differ
diff --git a/kiran-desktop.spec b/kiran-desktop.spec
index a1202f45e216e9c8cc37d1a5a9812b3bd8ca89e9..ab635f2e9c25372262eacc96a01d091f598284e1 100644
--- a/kiran-desktop.spec
+++ b/kiran-desktop.spec
@@ -1,46 +1,53 @@
 %define debug_package %{nil}
+
 %if ("%{?kylin}" != "") || ("%{?kylinsec}" != "")
     %define kiran_for_openeuler 0
+    %define kylinsec_server 0
     %if %{defined ks_installclass} && "%{ks_installclass}" == "Server"
         %define kylinsec_server 1
-    %else
-        %define kylinsec_server 0
+    %endif
+    %if "%{?ks_custom_name}" == "PG" || "%{?kylin_custom_name}" == "PG"
+        %define kylinsec_server 1
     %endif
 %else
     %define kiran_for_openeuler 1
 %endif
 
+%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5))
+%global build_for_35 1
+%endif
+
+%if (("%{?kylinsec}" != "") && (0%{?ks_major_version} >= 6))
+%global build_for_v6 1
+%endif
 
 Name:    kiran-desktop
 Version: 2.6.0
-Release: 10
+Release: 22%{?dist}
 Summary: Kiran desktop environment
 #Group:
 License: MulanPSL-2.0
 URL:     https://gitee.com/openeuler/kiran-desktop
 Source0: %{name}-%{version}.tar.gz
 
-# 设置Marco默认主题
-Source1: 99_unikylin-mate-marco-general-theme.gschema.override
-# 更改Mate Notification 通知位置
-Source2: 99_kiran-org-mate-NotificationDaemon.gschema.override
-# 服务器版本定制配置，禁用Xorg screensaver以及DPMS
-Source3: 99-disable-xorg-dpms.conf
-# 服务器版本定制配置，禁用开始菜单休眠/待机
-Source4: 99_kiran-server.gschema.override
+# Kiran通用GSettings override文件
+Source1: 50_kiran-common.gschema.override
+# Kiran服务器版本特定GSettings override文件
+Source2: 51_kiran-server.gschema.override
+# 服务器版本定制配置，禁用Xorg screensaver以及DPMS，需比lightdm-50-xserver-command.conf优先级高
+Source3: 51-disable-xorg-dpms.conf
 # Kiran Mime Apps
-Source5: kiran-mimeapps.list
+Source4: kiran-mimeapps.list
 
 %if "%{kiran_for_openeuler}" == "0"
 Requires: mate-notification-daemon >= 1.22.0-1
 Requires: mate-media >= 1.22.1-1
 Requires: caja >= 1.22.0-1
-Requires: fcitx >= 4.2.9.6-4
+Requires: fcitx >= 4.2.9
 Requires: gtk3 >= 3.22.30-4
 Requires: kylin-license-core >= 2.2
 Requires: kylin-license-client >= 2.2
 Requires: kylin-license-tool >= 2.2
-Requires: kiran-authentication-devices-sdk
 %else
 Requires: mate-notification-daemon
 Requires: mate-media
@@ -89,7 +96,7 @@ Requires: gvfs-gphoto2
 Requires: gvfs-mtp
 Requires: gvfs-smb
 
-%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) || "%{?openEuler}" != ""
+%if 0%{?build_for_35} || 0%{?build_for_v6} || "%{?openEuler}" != ""
 Requires: gvfs-fuse3
 %else
 Requires: gvfs-fuse
@@ -177,28 +184,29 @@ Kiran desktop environment
 %install
 mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/
 cp %{_builddir}/%{name}-%{version}/RELEASE.md  %{buildroot}/%{_datadir}/doc/%{name}/
-install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin-mate-marco-general-theme.gschema.override
-install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override
+
+install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/50_kiran-common.gschema.override
 %if "%{kylinsec_server}" == "1"
 ## 安装针对服务器版本禁用相应的电源配置
-install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf
-install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override
+install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/51_kiran-server.gschema.override
+install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/51-disable-xorg-dpms.conf
 %endif
-install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list
-
+install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list
 
 %post
 /usr/bin/update-desktop-database &> /dev/null || :
 
+## 服务器版本默认配置，只在初次安装时修改，避免定制版本配置被覆盖
 %if "%{kylinsec_server}" == "1"
+if [ "$1" -eq 1 ]; then
 ## 禁用greeter/screensaver的休眠/待机
 sed -i "s/can-suspend=true/can-suspend=false/g"     %{_datadir}/lightdm-kiran-greeter/greeter.ini
 sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/lightdm-kiran-greeter/greeter.ini
-sed -i "s/can-suspend=true/can-suspend=false/g"     %{_datadir}/kiran-screensaver-dialog/screensaver.ini
-sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver.ini
-## 禁用控制中心前后端的电源插件
-sed -i "/\[power\]/,/Available=true/s/Available=true/Available=false/g" %{_libdir}/kiran-cc-daemon/session/plugin_options
-mv %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop.disable
+sed -i "s/can-suspend=true/can-suspend=false/g"     %{_datadir}/kiran-screensaver-dialog/screensaver-dialog.ini
+sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver-dialog.ini
+## 禁用控制中心后端的电源插件
+sed -i '/\[power\]/,/^\[/ s/Available=true/Available=false/' %{_libdir}/kiran-cc-daemon/session/plugin_options
+fi
 %endif
 
 
@@ -209,19 +217,36 @@ mv %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop %{_
 %posttrans
 glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || :
 
+
 %files
 %dir %{_datadir}/doc/%{name}
 %{_datadir}/doc/%{name}/RELEASE.md
-%{_datadir}/applications/kiran-mimeapps.list
-%{_datadir}/glib-2.0/schemas/99_unikylin-mate-marco-general-theme.gschema.override
-%{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override
+%config(noreplace) %{_datadir}/applications/kiran-mimeapps.list
+%config(noreplace) %{_datadir}/glib-2.0/schemas/50_kiran-common.gschema.override
 %if "%{kylinsec_server}" == "1"
-%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf
-%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override
+%config(noreplace) %{_datadir}/lightdm/lightdm.conf.d/51-disable-xorg-dpms.conf
+%config(noreplace) %{_datadir}/glib-2.0/schemas/51_kiran-server.gschema.override
 %endif
 
 
 %changelog
+* Thu Apr 03 2025 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-22
+- KYOS-F: Setting the default white theme for the desktop version
+- KYOS-F: Override configuration, split screen saver as well as lock screen(#73664)
+- KYOS-B: adjusting gvfs dependency judgments for v6 releases
+- KYOS-B: Increase Server Version Disable DPMS Configuration Priority(#53822)
+- Change configuration only at installation time
+- Fix the issue that executing the post script twice causes the touchpad backend plugin to be disabled
+- Specify configuration file %config(noreplace)
+- KYOS-B: Fix post stage change unlock box power configuration error report
+- KYOS-F: Adjust the default configuration of window screenshot shortcuts to kiran-flameshot
+- KYOS-B: Decrease override file priority(#52881)
+- KYOS-F: adjusting the default configuration of the PG version to the server configuration(#51253)
+- KYOS-F: server versions enable locking on idle by default
+- KYOS-B: fix install error in KY3.3-9
+- KYOS-F: Reserved idle lock screen related configurations for server versions(#31787)
+- KYOS-F: remove kiran-authentication-devices-sdk dependency (#35156)
+
 * Fri Apr 19 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-10
 - remove kiran-manual dependency in kylinsec release version(#35119)