diff --git a/home-manager/common/desktops/xfce/default.nix b/home-manager/common/desktops/xfce/default.nix
index 6fd55282..607e0eaa 100644
--- a/home-manager/common/desktops/xfce/default.nix
+++ b/home-manager/common/desktops/xfce/default.nix
@@ -61,7 +61,7 @@
   };
   xdg.configFile."xsettings.xml" = {
     enable = true;
-    target = "xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.xml";
-    text = builtins.readFile ./xfconf/xsettings.xml.xml;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xsettings.xml";
+    text = builtins.readFile ./xfconf/xsettings.xml;
   };
 }
diff --git a/home-manager/common/desktops/xfce/xfconf/displays.xml b/home-manager/common/desktops/xfce/xfconf/displays.xml
index 0dc41fc8..428afb76 100644
--- a/home-manager/common/desktops/xfce/xfconf/displays.xml
+++ b/home-manager/common/desktops/xfce/xfconf/displays.xml
@@ -2,4 +2,43 @@
 
 <channel name="displays" version="1.0">
   <property name="ActiveProfile" type="string" value="Default"/>
+  <property name="Default" type="empty">
+    <property name="rdp0" type="string" value="rdp0">
+      <property name="Active" type="bool" value="true"/>
+      <property name="EDID" type="string" value=""/>
+      <property name="Resolution" type="string" value="2560x1440"/>
+      <property name="RefreshRate" type="double" value="50"/>
+      <property name="Rotation" type="int" value="0"/>
+      <property name="Reflection" type="string" value="0"/>
+      <property name="Primary" type="bool" value="false"/>
+      <property name="Scale" type="empty">
+        <property name="X" type="double" value="1"/>
+        <property name="Y" type="double" value="1"/>
+      </property>
+      <property name="Position" type="empty">
+        <property name="X" type="int" value="0"/>
+        <property name="Y" type="int" value="0"/>
+      </property>
+    </property>
+  </property>
+  <property name="Fallback" type="empty">
+    <property name="rdp0" type="string" value="rdp0">
+      <property name="Active" type="bool" value="true"/>
+      <property name="EDID" type="string" value=""/>
+      <property name="Resolution" type="string" value="2560x1440"/>
+      <property name="RefreshRate" type="double" value="50"/>
+      <property name="Rotation" type="int" value="0"/>
+      <property name="Reflection" type="string" value="0"/>
+      <property name="Primary" type="bool" value="false"/>
+      <property name="Scale" type="empty">
+        <property name="X" type="double" value="1"/>
+        <property name="Y" type="double" value="1"/>
+      </property>
+      <property name="Position" type="empty">
+        <property name="X" type="int" value="0"/>
+        <property name="Y" type="int" value="0"/>
+      </property>
+    </property>
+  </property>
+  <property name="Notify" type="int" value="1"/>
 </channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/thunar.xml b/home-manager/common/desktops/xfce/xfconf/thunar.xml
deleted file mode 100644
index a46e5cd9..00000000
--- a/home-manager/common/desktops/xfce/xfconf/thunar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="thunar" version="1.0">
-  <property name="last-view" type="string" value="ThunarIconView"/>
-  <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_100_PERCENT"/>
-  <property name="last-menubar-visible" type="bool" value="false"/>
-  <property name="last-window-width" type="int" value="894"/>
-  <property name="last-window-height" type="int" value="686"/>
-  <property name="last-window-maximized" type="bool" value="false"/>
-  <property name="last-separator-position" type="int" value="170"/>
-</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/thunar.xml b/home-manager/common/desktops/xfce/xfconf/thunar.xml
new file mode 120000
index 00000000..39eaa986
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/thunar.xml
@@ -0,0 +1 @@
+/nix/store/s0qm4ff5ajhv30gi9d0s9hqg56zkx3h3-home-manager-files/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
\ No newline at end of file
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml
deleted file mode 100644
index 7129a7a1..00000000
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-appfinder" version="1.0">
-  <property name="last" type="empty">
-    <property name="window-height" type="int" value="422"/>
-    <property name="window-width" type="int" value="580"/>
-    <property name="pane-position" type="int" value="180"/>
-  </property>
-  <property name="actions" type="array">
-    <value type="int" value="5"/>
-    <value type="int" value="4"/>
-    <value type="int" value="3"/>
-    <value type="int" value="2"/>
-    <value type="int" value="1"/>
-    <property name="action-5" type="empty">
-      <property name="type" type="int" value="0"/>
-      <property name="pattern" type="string" value="/"/>
-      <property name="command" type="string" value="exo-open --launch FileManager %S"/>
-      <property name="save" type="bool" value="false"/>
-    </property>
-    <property name="action-4" type="empty">
-      <property name="type" type="int" value="0"/>
-      <property name="pattern" type="string" value="#"/>
-      <property name="command" type="string" value="exo-open --launch TerminalEmulator man %s"/>
-      <property name="save" type="bool" value="false"/>
-    </property>
-    <property name="action-3" type="empty">
-      <property name="type" type="int" value="0"/>
-      <property name="pattern" type="string" value="!w"/>
-      <property name="command" type="string" value="exo-open --launch WebBrowser http://en.wikipedia.org/wiki/%s"/>
-      <property name="save" type="bool" value="false"/>
-    </property>
-    <property name="action-2" type="empty">
-      <property name="type" type="int" value="0"/>
-      <property name="pattern" type="string" value="$"/>
-      <property name="command" type="string" value="exo-open --launch TerminalEmulator %s"/>
-      <property name="save" type="bool" value="true"/>
-    </property>
-    <property name="action-1" type="empty">
-      <property name="type" type="int" value="1"/>
-      <property name="pattern" type="string" value="^(file|http|https):\/\/(.*)$"/>
-      <property name="command" type="string" value="exo-open \0"/>
-      <property name="save" type="bool" value="false"/>
-    </property>
-  </property>
-</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml
new file mode 120000
index 00000000..1e7ed08a
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml
@@ -0,0 +1 @@
+/nix/store/s0qm4ff5ajhv30gi9d0s9hqg56zkx3h3-home-manager-files/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
\ No newline at end of file
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-desktop.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-desktop.xml
index 94217366..58fde17a 100644
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-desktop.xml
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-desktop.xml
@@ -40,12 +40,32 @@
         <property name="image-path" type="string" value="/config/Downloads/wallhaven-l8r9jp.jpg"/>
         <property name="image-show" type="bool" value="true"/>
         <property name="image-style" type="int" value="5"/>
+        <property name="workspace0" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/config/Downloads/wallhaven-l8r9jp.jpg"/>
+        </property>
+        <property name="workspace1" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/config/Downloads/wallhaven-l8r9jp.jpg"/>
+        </property>
+        <property name="workspace2" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/config/Downloads/wallhaven-l8r9jp.jpg"/>
+        </property>
+        <property name="workspace3" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/config/Downloads/wallhaven-l8r9jp.jpg"/>
+        </property>
       </property>
     </property>
   </property>
   <property name="last" type="empty">
-    <property name="window-width" type="int" value="619"/>
-    <property name="window-height" type="int" value="522"/>
+    <property name="window-width" type="int" value="684"/>
+    <property name="window-height" type="int" value="572"/>
   </property>
   <property name="desktop-icons" type="empty">
     <property name="file-icons" type="empty">
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index 2e09df45..00000000
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,196 +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="HomePage" type="empty"/>
-      <property name="XF86Mail" type="empty"/>
-      <property name="Print" type="empty"/>
-      <property name="&lt;Alt&gt;Print" type="empty"/>
-      <property name="&lt;Shift&gt;Print" type="empty"/>
-      <property name="&lt;Super&gt;e" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="empty"/>
-      <property name="&lt;Super&gt;r" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Alt&gt;&lt;Super&gt;s" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Alt&gt;F2" type="string" value="xfce4-appfinder --collapsed">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
-      <property name="&lt;Super&gt;r" type="string" value="xfce4-appfinder -c">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
-      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-      <property name="&lt;Alt&gt;F3" type="string" value="xfce4-appfinder">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="Print" type="string" value="xfce4-screenshooter"/>
-      <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
-      <property name="&lt;Shift&gt;Print" type="string" value="xfce4-screenshooter -r"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
-      <property name="&lt;Alt&gt;&lt;Super&gt;s" type="string" value="orca"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="string" value="thunar"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
-      <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-applicationsmenu"/>
-      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="string" value="xfce4-taskmanager"/>
-      <property name="&lt;Super&gt;e" type="string" value="thunar"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
-      <property name="HomePage" type="string" value="exo-open --launch WebBrowser"/>
-      <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="override" type="bool" value="true"/>
-    </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;Super&gt;KP_Left" type="empty"/>
-      <property name="&lt;Super&gt;KP_Right" type="empty"/>
-      <property name="&lt;Super&gt;KP_Down" type="empty"/>
-      <property name="&lt;Super&gt;KP_Up" type="empty"/>
-      <property name="&lt;Super&gt;KP_Page_Up" type="empty"/>
-      <property name="&lt;Super&gt;KP_Home" type="empty"/>
-      <property name="&lt;Super&gt;KP_End" type="empty"/>
-      <property name="&lt;Super&gt;KP_Next" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Primary&gt;F12" type="string" value="workspace_12_key"/>
-      <property name="&lt;Super&gt;KP_Down" type="string" value="tile_down_key"/>
-      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
-      <property name="&lt;Primary&gt;F2" type="string" value="workspace_2_key"/>
-      <property name="&lt;Primary&gt;F6" type="string" value="workspace_6_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
-      <property name="&lt;Super&gt;KP_Up" type="string" value="tile_up_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="string" value="move_window_next_workspace_key"/>
-      <property name="&lt;Primary&gt;F8" type="string" value="workspace_8_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
-      <property name="&lt;Super&gt;KP_Right" type="string" value="tile_right_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
-      <property name="Right" type="string" value="right_key"/>
-      <property name="Down" type="string" value="down_key"/>
-      <property name="&lt;Primary&gt;F3" type="string" value="workspace_3_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
-      <property name="&lt;Primary&gt;F9" type="string" value="workspace_9_key"/>
-      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
-      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
-      <property name="&lt;Primary&gt;F11" type="string" value="workspace_11_key"/>
-      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
-      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
-      <property name="&lt;Super&gt;Tab" type="string" value="switch_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
-      <property name="&lt;Primary&gt;F4" type="string" value="workspace_4_key"/>
-      <property name="&lt;Super&gt;KP_Page_Up" type="string" value="tile_up_right_key"/>
-      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
-      <property name="Up" type="string" value="up_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
-      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
-      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
-      <property name="&lt;Super&gt;KP_Home" type="string" value="tile_up_left_key"/>
-      <property name="Escape" type="string" value="cancel_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
-      <property name="&lt;Super&gt;KP_Next" type="string" value="tile_down_right_key"/>
-      <property name="&lt;Super&gt;KP_Left" type="string" value="tile_left_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="string" value="move_window_prev_workspace_key"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
-      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
-      <property name="&lt;Primary&gt;F5" type="string" value="workspace_5_key"/>
-      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
-      <property name="&lt;Super&gt;KP_End" type="string" value="tile_down_left_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
-      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
-      <property name="&lt;Primary&gt;F7" type="string" value="workspace_7_key"/>
-      <property name="&lt;Primary&gt;F10" type="string" value="workspace_10_key"/>
-      <property name="Left" type="string" value="left_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
-      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
-      <property name="&lt;Primary&gt;F1" type="string" value="workspace_1_key"/>
-      <property name="override" type="bool" value="true"/>
-    </property>
-  </property>
-  <property name="providers" type="array">
-    <value type="string" value="xfwm4"/>
-    <value type="string" value="commands"/>
-  </property>
-</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml
new file mode 120000
index 00000000..6929bf3b
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml
@@ -0,0 +1 @@
+/nix/store/s0qm4ff5ajhv30gi9d0s9hqg56zkx3h3-home-manager-files/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
\ No newline at end of file
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-notifyd.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-notifyd.xml
index 70c80b62..db31b32c 100644
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-notifyd.xml
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-notifyd.xml
@@ -9,7 +9,7 @@
       <value type="string" value="Xfce4-notifyd settings"/>
     </property>
   </property>
-  <property name="do-not-disturb" type="bool" value="true"/>
+  <property name="do-not-disturb" type="bool" value="false"/>
   <property name="date-time-custom-format" type="string" value="%a %H:%M:%S"/>
   <property name="theme" type="string" value="Default"/>
   <property name="notify-location" type="string" value="top-right"/>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml
index 71656f1c..f81c83f0 100644
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml
@@ -20,7 +20,6 @@
         <value type="int" value="4"/>
         <value type="int" value="5"/>
         <value type="int" value="6"/>
-        <value type="int" value="8"/>
         <value type="int" value="10"/>
         <value type="int" value="11"/>
         <value type="int" value="12"/>
@@ -35,7 +34,7 @@
   </property>
   <property name="plugins" type="empty">
     <property name="plugin-1" type="string" value="applicationsmenu">
-      <property name="button-icon" type="string" value="archlinux-logo"/>
+      <property name="button-icon" type="string" value="/etc/nixos/git/docs/icons/nixos/white.png"/>
       <property name="show-menu-icons" type="bool" value="true"/>
       <property name="show-button-title" type="bool" value="false"/>
       <property name="show-generic-names" type="bool" value="false"/>
@@ -62,11 +61,6 @@
         <value type="string" value="remmina-icon"/>
       </property>
     </property>
-    <property name="plugin-8" type="string" value="pulseaudio">
-      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
-      <property name="show-notifications" type="bool" value="true"/>
-      <property name="known-players" type="string" value="firefox"/>
-    </property>
     <property name="plugin-10" type="string" value="notification-plugin"/>
     <property name="plugin-11" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
@@ -79,7 +73,7 @@
     </property>
     <property name="plugin-17" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="17022621551.desktop"/>
+        <value type="string" value="17123095583.desktop"/>
       </property>
     </property>
     <property name="plugin-19" type="string" value="separator">
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml
deleted file mode 100644
index a4119d00..00000000
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml
+++ /dev/null
@@ -1,8 +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="brightness-switch-restore-on-exit" type="int" value="1"/>
-    <property name="brightness-switch" type="int" value="0"/>
-  </property>
-</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml
new file mode 120000
index 00000000..5dbdf835
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml
@@ -0,0 +1 @@
+/nix/store/s0qm4ff5ajhv30gi9d0s9hqg56zkx3h3-home-manager-files/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
\ No newline at end of file
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-screenshotter.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-screenshotter.xml
new file mode 120000
index 00000000..261b5024
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-screenshotter.xml
@@ -0,0 +1 @@
+/nix/store/s0qm4ff5ajhv30gi9d0s9hqg56zkx3h3-home-manager-files/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screenshotter.xml
\ No newline at end of file
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml
deleted file mode 100644
index a7c84531..00000000
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-settings-editor" version="1.0">
-  <property name="last" type="empty">
-    <property name="window-width" type="int" value="640"/>
-    <property name="window-height" type="int" value="500"/>
-    <property name="paned-position" type="int" value="180"/>
-  </property>
-</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml
new file mode 120000
index 00000000..7de2f0d6
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml
@@ -0,0 +1 @@
+/nix/store/s0qm4ff5ajhv30gi9d0s9hqg56zkx3h3-home-manager-files/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml
\ No newline at end of file
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml
index e588d383..acca3607 100644
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml
@@ -18,7 +18,7 @@
   <property name="tab-activity-color" type="string" value="#aa0000"/>
   <property name="misc-show-unsafe-paste-dialog" type="bool" value="false"/>
   <property name="font-name" type="string" value="Hack Nerd Font 10"/>
-  <property name="font-use-system" type="bool" value="false"/>
+  <property name="font-use-system" type="bool" value="true"/>
   <property name="word-chars" type="string" value=""/>
   <property name="encoding" type="string" value="UTF-8"/>
   <property name="misc-copy-on-select" type="bool" value="true"/>
@@ -26,4 +26,5 @@
   <property name="text-blink-mode" type="string" value="TERMINAL_TEXT_BLINK_MODE_ALWAYS"/>
   <property name="misc-menubar-default" type="bool" value="false"/>
   <property name="misc-toolbar-default" type="bool" value="false"/>
+  <property name="background-mode" type="string" value="TERMINAL_BACKGROUND_IMAGE"/>
 </channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xsettings.xml b/home-manager/common/desktops/xfce/xfconf/xsettings.xml
index 26f49872..866d64de 100644
--- a/home-manager/common/desktops/xfce/xfconf/xsettings.xml
+++ b/home-manager/common/desktops/xfce/xfconf/xsettings.xml
@@ -3,7 +3,7 @@
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
     <property name="ThemeName" type="string" value="Arc-Darker"/>
-    <property name="IconThemeName" type="string" value="Arc"/>
+    <property name="IconThemeName" type="string" value="Papirus"/>
     <property name="DoubleClickTime" type="empty"/>
     <property name="DoubleClickDistance" type="empty"/>
     <property name="DndDragThreshold" type="empty"/>
diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix
index 1df68447..ee1fc40a 100644
--- a/nixos/common/desktops/xfce/default.nix
+++ b/nixos/common/desktops/xfce/default.nix
@@ -1,4 +1,8 @@
 { pkgs, ... }: {
+  imports = [
+    ../../modules/fonts.nix
+  ];
+
   # Enable sound with pipewire.
   sound.enable = true;
   hardware.pulseaudio.enable = false;
@@ -26,5 +30,6 @@
     papirus-nord
     xfce.xfwm4-themes
     dconf2nix # https://github.com/gvolpe/dconf2nix
+    arc-theme
   ];
 }
diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix
index 27d5661b..88e77fb3 100644
--- a/nixos/hosts/framework-server/containers.nix
+++ b/nixos/hosts/framework-server/containers.nix
@@ -1,7 +1,6 @@
 { lib, self, inputs, outputs, stateVersion, hmStateVersion, ... }:
 let 
   libx = import ../../../lib { inherit lib self inputs outputs stateVersion hmStateVersion; };
-  lanInterface = "enp0s13f0u4";
 in {
   containers = {
     rdesktop = libx.mkContainer { hostname = "rdesktop"; unfree = true; desktop = "xfce"; };