diff --git a/defaults/main.yml b/defaults/main.yml
index cd5353a..e35bae6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,10 +2,10 @@
 application_starters:
   - exo-web-browser
   - exo-mail-reader
-  - exo-file-manager
   - libreoffice-writer
   - libreoffice-calc
   - libreoffice-impress
+  - xfce-display-settings
   - xfce4-screenshooter
   - fotowall
   - org.kde.gwenview
@@ -15,3 +15,5 @@ install_fotowall: true
 install_cewe_fotobuch: true
 
 kiosk_unlocked_users: root
+
+xfwm4_use_compositing: true
diff --git a/files/xdg/xfce4/panel/datetime-10.rc b/files/xdg/xfce4/panel/datetime-10.rc
new file mode 100644
index 0000000..44b58e4
--- /dev/null
+++ b/files/xdg/xfce4/panel/datetime-10.rc
@@ -0,0 +1,5 @@
+layout=1
+date_font=Sans 16
+time_font=Sans Bold 28
+date_format=%a, %d.%m.
+time_format=%H:%M
diff --git a/files/xdg/xfce4/panel/whiskermenu-1.rc b/files/xdg/xfce4/panel/whiskermenu-1.rc
index 28984fc..61907b5 100644
--- a/files/xdg/xfce4/panel/whiskermenu-1.rc
+++ b/files/xdg/xfce4/panel/whiskermenu-1.rc
@@ -20,7 +20,7 @@ position-commands-alternate=false
 position-categories-alternate=false
 menu-width=600
 menu-height=600
-menu-opacity=70
+menu-opacity=90
 command-settings=xfce4-settings-manager
 show-command-settings=true
 command-lockscreen=xflock4
diff --git a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index e627052..c5b8011 100644
--- a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml version="1.0" encoding="UTF-8"?>
 
 <channel name="xfce4-desktop" version="1.0">
   <property name="backdrop" type="empty">
diff --git a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index 4940e78..24ce3ba 100644
--- a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<channel name="xsettings" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
+<channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
     <property name="ThemeName" type="string" value="Adwaita"/>
-    <property name="IconThemeName" type="string" value="Tango"/>
+    <property name="IconThemeName" type="string" value="gnome-brave"/>
     <property name="DoubleClickTime" type="empty"/>
     <property name="DoubleClickDistance" type="empty"/>
     <property name="DndDragThreshold" type="empty"/>
diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml
index d0e4639..01583a9 100644
--- a/tasks/xfce.yaml
+++ b/tasks/xfce.yaml
@@ -11,6 +11,21 @@
     - task-german-desktop
     - eog
     - dmz-cursor-theme
+    - gnome-brave-icon-theme
+    - gnome-dust-icon-theme
+    - gnome-human-icon-theme
+    - gnome-icon-theme
+    - gnome-icon-theme-extras
+    - gnome-icon-theme-gartoon
+    - gnome-icon-theme-nuovo
+    - gnome-icon-theme-suede
+    - gnome-icon-theme-symbolic
+    - gnome-icon-theme-yasis
+    - gnome-illustrious-icon-theme
+    - gnome-noble-icon-theme
+    - gnome-wine-icon-theme
+    - gnome-wise-icon-theme
+    - xfonts-terminus
 
 - name: xdg config
   copy:
@@ -21,3 +36,8 @@
   template:
     src: xfce4-panel.xml.j2
     dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+
+- name: xfwm4 config
+  template:
+    src: xfwm4.xml.j2
+    dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/templates/xfce4-panel.xml.j2 b/templates/xfce4-panel.xml.j2
index e39cd30..6c98474 100644
--- a/templates/xfce4-panel.xml.j2
+++ b/templates/xfce4-panel.xml.j2
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-{% set i = 12 %}
+{% set i = 13 %}
 
 <channel name="xfce4-panel" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
   <property name="configver" type="int" value="2"/>
   <property name="panels" type="array">
     <value type="int" value="1"/>
     <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=12;x=302;y=997"/>
+      <property name="position" type="string" value="p=12;x=0;y=997"/>
       <property name="length" type="uint" value="100"/>
       <property name="position-locked" type="bool" value="true"/>
-      <property name="size" type="uint" value="32"/>
+      <property name="size" type="uint" value="42"/>
       <property name="plugin-ids" type="array">
         <value type="int" value="1"/>
+        <value type="int" value="12"/>
 {% for app in application_starters %}
         <value type="int" value="{{ loop.index0 + i }}"/>
 {% endfor %}
@@ -32,9 +33,9 @@
       <property name="background-style" type="uint" value="1"/>
       <property name="background-alpha" type="uint" value="50"/>
       <property name="background-color" type="array">
-        <value type="uint" value="54965"/>
-        <value type="uint" value="54965"/>
-        <value type="uint" value="54965"/>
+        <value type="uint" value="58982"/>
+        <value type="uint" value="58982"/>
+        <value type="uint" value="58982"/>
         <value type="uint" value="65535"/>
       </property>
 
@@ -43,6 +44,18 @@
   <property name="plugins" type="empty">
     <property name="plugin-1" type="string" value="whiskermenu"/>
 
+    <property name="plugin-12" type="string" value="places">
+      <property name="show-button-type" type="int" value="2"/>
+      <property name="show-icons" type="bool" value="true"/>
+      <property name="button-label" type="string" value=""/>
+      <property name="search-cmd" type="string" value="gnome-search-tool"/>
+      <property name="mount-open-volumes" type="bool" value="true"/>
+      <property name="show-volumes" type="bool" value="true"/>
+      <property name="show-bookmarks" type="bool" value="true"/>
+      <property name="show-recent" type="bool" value="true"/>
+      <property name="show-recent-clear" type="bool" value="true"/>
+    </property>
+
 {% for app in application_starters %}
     <property name="plugin-{{ loop.index0 + i }}" type="string" value="launcher">
       <property name="items" type="array">
@@ -82,25 +95,25 @@
       <property name="rows" type="uint" value="2"/>
     </property>
 
-    <property name="plugin-7" type="string" value="systray"/>
+    <property name="plugin-7" type="string" value="systray">
+      <property name="size-max" type="uint" value="32"/>
+      <property name="show-frame" type="bool" value="false"/>
+    </property>
 
     <property name="plugin-8" type="string" value="pulseaudio">
       <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
     </property>
     <property name="plugin-9" type="string" value="power-manager-plugin"/>
 
-    <property name="plugin-10" type="string" value="clock">
-      <property name="digital-format" type="string" value="%a %d.%m. – %H:%M"/>
-      <property name="mode" type="uint" value="2"/>
-    </property>
+    <property name="plugin-10" type="string" value="datetime"/>
 
     <property name="plugin-11" type="string" value="actions">
       <property name="items" type="array">
         <value type="string" value="-separator"/>
         <value type="string" value="-logout-dialog"/>
         <value type="string" value="-switch-user"/>
-        <value type="string" value="+lock-screen"/>
         <value type="string" value="+logout"/>
+        <value type="string" value="+lock-screen"/>
         <value type="string" value="-hibernate"/>
         <value type="string" value="-suspend"/>
         <value type="string" value="-restart"/>
diff --git a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/templates/xfwm4.xml.j2
similarity index 97%
rename from files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to templates/xfwm4.xml.j2
index ab3603d..1bee490 100644
--- a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/templates/xfwm4.xml.j2
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<channel name="xfwm4" version="1.0"  locked="*" unlocked="{{kiosk_unlocked_users}}">
+<channel name="xfwm4" version="1.0">
   <property name="general" type="empty">
     <property name="activate_action" type="string" value="bring"/>
     <property name="borderless_maximize" type="bool" value="true"/>
@@ -69,7 +69,7 @@
     <property name="toggle_workspaces" type="bool" value="false"/>
     <property name="unredirect_overlays" type="bool" value="true"/>
     <property name="urgent_blink" type="bool" value="false"/>
-    <property name="use_compositing" type="bool" value="true"/>
+    <property name="use_compositing" type="bool" value="{{ xfwm4_use_compositing | ternary('true','false') }}"/>
     <property name="workspace_count" type="int" value="4"/>
     <property name="wrap_cycle" type="bool" value="true"/>
     <property name="wrap_layout" type="bool" value="true"/>