diff --git a/50_kiran-common.gschema.override b/50_kiran-common.gschema.override
index e1375b4aacefb2f5c1ff07cf0ff054f06547dbf9..81ad84a5e43c4b594319bfb159d68502af933966 100644
--- a/50_kiran-common.gschema.override
+++ b/50_kiran-common.gschema.override
@@ -1,9 +1,6 @@
 [org.mate.NotificationDaemon]
 popup-location='top_right'
 
-[org.mate.Marco.general]
-theme='Kiran'
-
 [org.mate.Marco.keybinding-commands]
 command-window-screenshot='kiran-flameshot gui'
 
@@ -11,4 +8,4 @@ command-window-screenshot='kiran-flameshot gui'
 run-command-window-screenshot='<Control><Shift>A'
 
 [com.kylinsec.kiran.screensaver]
-split-screensaver-and-lock=true
+split-screensaver-and-lock=false
diff --git a/51_kiran-desktop.gschema.override b/51_kiran-desktop.gschema.override
new file mode 100644
index 0000000000000000000000000000000000000000..43fa041d2ba441851864e604d414f01c60c19622
--- /dev/null
+++ b/51_kiran-desktop.gschema.override
@@ -0,0 +1,7 @@
+[com.kylinsec.kiran.xsettings]
+net-icon-theme-name="Summer"
+gtk-cursor-theme-name="Kiran"
+net-theme-name="Kiran-white"
+
+[org.mate.Marco.general]
+theme='Kiran-white'
diff --git a/51_kiran-server.gschema.override b/51_kiran-server.gschema.override
index 0ff835130c3ec2bc5f6e316f229fb8dbd6d092c3..6cce23716a840b41c958a63fb661a483927755c4 100644
--- a/51_kiran-server.gschema.override
+++ b/51_kiran-server.gschema.override
@@ -3,5 +3,9 @@ disable-suspend=true
 disable-hibernate=true
 
 [com.kylinsec.kiran.xsettings]
-net-icon-theme-name="Summer"
-net-theme-name="Kiran-dark"
\ No newline at end of file
+net-icon-theme-name="Spring"
+gtk-cursor-theme-name="Adwaita"
+net-theme-name="Kiran-dark"
+
+[org.mate.Marco.general]
+theme='Kiran-dark'
diff --git a/kiran-desktop.spec b/kiran-desktop.spec
index de9577fc5862c5ebb1a0d14402cfb5288128dcbb..c5533eee7e45506c1d9c833b5dba85372d5191e3 100644
--- a/kiran-desktop.spec
+++ b/kiran-desktop.spec
@@ -23,7 +23,7 @@
 
 Name:    kiran-desktop
 Version: 2.6.0
-Release: 22%{?dist}
+Release: 24%{?dist}
 Summary: Kiran desktop environment
 #Group:
 License: MulanPSL-2.0
@@ -36,8 +36,10 @@ Source1: 50_kiran-common.gschema.override
 Source2: 51_kiran-server.gschema.override
 # 服务器版本定制配置，禁用Xorg screensaver以及DPMS，需比lightdm-50-xserver-command.conf优先级高
 Source3: 51-disable-xorg-dpms.conf
+# Kiran桌面版本特定GSettings override文件
+Source4: 51_kiran-desktop.gschema.override
 # Kiran Mime Apps
-Source4: kiran-mimeapps.list
+Source5: kiran-mimeapps.list
 
 %if "%{kiran_for_openeuler}" == "0"
 Requires: mate-notification-daemon >= 1.22.0-1
@@ -140,7 +142,6 @@ Requires: system-config-printer
 Requires: fcitx-qt5
 Requires: fcitx-configtool
 Requires: glx-utils
-Requires: initial-setup-gui
 Requires: plymouth-system-theme
 
 Requires: p7zip
@@ -178,6 +179,10 @@ Requires: kiran-panel-libs
 ## 内部版本由于帮助手册相较于用户手册不全，暂时去掉kiran帮助手册用用户手册
 Requires: kiran-manual
 %endif
+%if "%{?build_for_v6}" == "1"
+Requires: xscreensaver
+%endif
+
 Obsoletes: kiran-cpanel-menu
 
 %description
@@ -192,13 +197,21 @@ Kiran desktop environment
 mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/
 cp %{_builddir}/%{name}-%{version}/RELEASE.md  %{buildroot}/%{_datadir}/doc/%{name}/
 
+#v6版本，拆分屏保以及锁屏
+%if "%{?build_for_v6}" == "1"
+sed -i 's/split-screensaver-and-lock=false/split-screensaver-and-lock=true/g' %SOURCE1
+%endif
 install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/50_kiran-common.gschema.override
+
 %if "%{kylinsec_server}" == "1"
 ## 安装针对服务器版本禁用相应的电源配置
 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
+%else
+install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/51_kiran-desktop.gschema.override
 %endif
-install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list
+
+install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list
 
 %post
 /usr/bin/update-desktop-database &> /dev/null || :
@@ -233,10 +246,20 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || :
 %if "%{kylinsec_server}" == "1"
 %config(noreplace) %{_datadir}/lightdm/lightdm.conf.d/51-disable-xorg-dpms.conf
 %config(noreplace) %{_datadir}/glib-2.0/schemas/51_kiran-server.gschema.override
+%else
+%config(noreplace) %{_datadir}/glib-2.0/schemas/51_kiran-desktop.gschema.override
 %endif
 
 
 %changelog
+* Thu Jul 31 2025 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-24
+- KYOS-B: Enable split screen saver and lock screen only for V6 version
+- KYOS-B: remove dep initial-setup-gui
+
+* Fri Apr 18 2025 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0.23
+- KYOS-F: Add 51_kiran-desktop.gschema.override to distinguish desktop and server.
+- KYOS-B: Add package dependencies xscreensaver for V6(#73664)
+
 * 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)