diff --git a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh
index 41e9b8ee31..43534504ab 100755
--- a/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh
+++ b/config/optional/boards/pinebook-pro/_config/desktop/_all_distributions/environments/xfce/debian/armbian-bsp-desktop/prepare.sh
@@ -1,5 +1,3 @@
-# powerconfig, touchpad, and special keys
-mkdir -p $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
-cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml      $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
-cp $SRC/packages/bsp/pinebook-pro/pointers.xml                 $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
-cp $SRC/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
+# special keys
+mkdir -p "$(destination)"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
+cp $SRC/packages/bsp/pinebook-pro/pointers.xml  "$(destination)"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
diff --git a/lib/desktop.sh b/lib/desktop.sh
index dee4d19c6e..0e328c19ad 100644
--- a/lib/desktop.sh
+++ b/lib/desktop.sh
@@ -132,6 +132,7 @@ create_bsp_desktop_package ()
 	Section: xorg
 	Priority: optional
 	Provides: armbian-bsp-desktop, armbian-bsp-desktop-${BOARD}
+	Depends: ${BSP_CLI_PACKAGE_NAME}
 	Description: Armbian Board Specific Packages for desktop users using $ARCH ${BOARD} machines
 	EOF
 
diff --git a/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml b/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index d8ed64be34..0000000000
--- a/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;F1" type="empty"/>
-      <property name="&lt;Alt&gt;F2" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Alt&gt;F3" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="empty"/>
-      <property name="XF86Display" type="empty"/>
-      <property name="&lt;Super&gt;p" type="empty"/>
-      <property name="&lt;Primary&gt;Escape" type="empty"/>
-      <property name="XF86WWW" type="empty"/>
-      <property name="XF86Mail" type="empty"/>
-      <property name="Print" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-applicationsmenu"/>
-      <property name="&lt;Alt&gt;F3" type="string" value="xfce4-appfinder"/>
-      <property name="&lt;Alt&gt;F2" type="string" value="xfce4-appfinder --collapsed"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
-      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-      <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
-      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
-      <property name="override" type="bool" value="true"/>
-      <property name="AudioMute" type="string" value="amixer set Master toggle"/>
-      <property name="AudioRaiseVolume" type="string" value="amixer set Master 5%+"/>
-      <property name="AudioLowerVolume" type="string" value="amixer set Master 5%-"/>
-    </property>
-  </property>
-  <property name="xfwm4" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;Insert" type="empty"/>
-      <property name="Escape" type="empty"/>
-      <property name="Left" type="empty"/>
-      <property name="Right" type="empty"/>
-      <property name="Up" type="empty"/>
-      <property name="Down" type="empty"/>
-      <property name="&lt;Alt&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="empty"/>
-      <property name="&lt;Alt&gt;F4" type="empty"/>
-      <property name="&lt;Alt&gt;F6" type="empty"/>
-      <property name="&lt;Alt&gt;F7" type="empty"/>
-      <property name="&lt;Alt&gt;F8" type="empty"/>
-      <property name="&lt;Alt&gt;F9" type="empty"/>
-      <property name="&lt;Alt&gt;F10" type="empty"/>
-      <property name="&lt;Alt&gt;F11" type="empty"/>
-      <property name="&lt;Alt&gt;F12" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="empty"/>
-      <property name="&lt;Alt&gt;space" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Super&gt;Tab" type="empty"/>
-      <property name="&lt;Primary&gt;F1" type="empty"/>
-      <property name="&lt;Primary&gt;F2" type="empty"/>
-      <property name="&lt;Primary&gt;F3" type="empty"/>
-      <property name="&lt;Primary&gt;F4" type="empty"/>
-      <property name="&lt;Primary&gt;F5" type="empty"/>
-      <property name="&lt;Primary&gt;F6" type="empty"/>
-      <property name="&lt;Primary&gt;F7" type="empty"/>
-      <property name="&lt;Primary&gt;F8" type="empty"/>
-      <property name="&lt;Primary&gt;F9" type="empty"/>
-      <property name="&lt;Primary&gt;F10" type="empty"/>
-      <property name="&lt;Primary&gt;F11" type="empty"/>
-      <property name="&lt;Primary&gt;F12" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Down" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;End" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;Home" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_1" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_2" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_3" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_4" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_5" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_6" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_7" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_8" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_9" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;d" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Control&gt;F1" type="empty"/>
-      <property name="&lt;Control&gt;F2" type="empty"/>
-      <property name="&lt;Control&gt;F3" type="empty"/>
-      <property name="&lt;Control&gt;F4" type="empty"/>
-      <property name="&lt;Control&gt;F5" type="empty"/>
-      <property name="&lt;Control&gt;F6" type="empty"/>
-      <property name="&lt;Control&gt;F7" type="empty"/>
-      <property name="&lt;Control&gt;F8" type="empty"/>
-      <property name="&lt;Control&gt;F9" type="empty"/>
-      <property name="&lt;Control&gt;F10" type="empty"/>
-      <property name="&lt;Control&gt;F11" type="empty"/>
-      <property name="&lt;Control&gt;F12" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Control&gt;F3" type="string" value="workspace_3_key"/>
-      <property name="&lt;Control&gt;F4" type="string" value="workspace_4_key"/>
-      <property name="&lt;Control&gt;F5" type="string" value="workspace_5_key"/>
-      <property name="&lt;Control&gt;F6" type="string" value="workspace_6_key"/>
-      <property name="&lt;Control&gt;F7" type="string" value="workspace_7_key"/>
-      <property name="&lt;Control&gt;F8" type="string" value="workspace_8_key"/>
-      <property name="&lt;Control&gt;F9" type="string" value="workspace_9_key"/>
-      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
-      <property name="Left" type="string" value="left_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
-      <property name="Up" type="string" value="up_key"/>
-      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
-      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
-      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
-      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
-      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
-      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
-      <property name="&lt;Super&gt;Tab" type="string" value="switch_window_key"/>
-      <property name="Escape" type="string" value="cancel_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
-      <property name="Down" type="string" value="down_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
-      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
-      <property name="Right" type="string" value="right_key"/>
-      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
-      <property name="&lt;Control&gt;F10" type="string" value="workspace_10_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;End" type="string" value="move_window_next_workspace_key"/>
-      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
-      <property name="&lt;Control&gt;F12" type="string" value="workspace_12_key"/>
-      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
-      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;Home" type="string" value="move_window_prev_workspace_key"/>
-      <property name="&lt;Control&gt;F2" type="string" value="workspace_2_key"/>
-      <property name="&lt;Control&gt;F1" type="string" value="workspace_1_key"/>
-      <property name="&lt;Control&gt;F11" type="string" value="workspace_11_key"/>
-      <property name="override" type="bool" value="true"/>
-    </property>
-  </property>
-  <property name="providers" type="array">
-    <value type="string" value="commands"/>
-    <value type="string" value="xfwm4"/>
-  </property>
-</channel>
diff --git a/packages/bsp/pinebook-pro/xfce4-power-manager.xml b/packages/bsp/pinebook-pro/xfce4-power-manager.xml
deleted file mode 100644
index 48d0d0cede..0000000000
--- a/packages/bsp/pinebook-pro/xfce4-power-manager.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-power-manager" version="1.0">
-  <property name="xfce4-power-manager" type="empty">
-    <property name="power-button-action" type="empty"/>
-    <property name="brightness-switch-restore-on-exit" type="int" value="-1"/>
-    <property name="brightness-switch" type="int" value="0"/>
-    <property name="show-tray-icon" type="int" value="1"/>
-    <property name="lid-action-on-battery" type="uint" value="1"/>
-    <property name="logind-handle-lid-switch" type="bool" value="false"/>
-    <property name="lid-action-on-ac" type="uint" value="0"/>
-    <property name="inactivity-sleep-mode-on-battery" type="uint" value="1"/>
-    <property name="sleep-button-action" type="uint" value="1"/>
-    <property name="hibernate-button-action" type="uint" value="1"/>
-    <property name="lock-screen-suspend-hibernate" type="bool" value="false"/>
-    <property name="critical-power-action" type="uint" value="4"/>
-    <property name="critical-power-level" type="uint" value="5"/>
-  </property>
-</channel>