diff --git a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc
new file mode 100644
index 0000000..c16d166
--- /dev/null
+++ b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc
@@ -0,0 +1,13 @@
+# Calculate format=kde
+[Global]
+MoveFirst=false
+ArrowPosition=0
+
+[Entry 0]
+Name=Web Browser
+Comment=Surf the internet
+Icon=browser
+Exec=firefox
+Path=/home/#-ur_login-#
+Terminal=false
+
diff --git a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc
new file mode 100644
index 0000000..1af6a85
--- /dev/null
+++ b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc
@@ -0,0 +1,13 @@
+# Calculate format=kde
+[Entry 0]
+Name=Mail Reader
+Comment=Mail Reader
+Icon=claws-mail
+Exec=claws-mail
+Path=/home/#-ur_login-#
+Terminal=false
+
+[Global]
+MoveFirst=false
+ArrowPosition=0
+
diff --git a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc
new file mode 100644
index 0000000..0a203c8
--- /dev/null
+++ b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc
@@ -0,0 +1,12 @@
+# Calculate format=kde
+[Global]
+MoveFirst=false
+ArrowPosition=0
+
+[Entry 0]
+Name=Command Prompt
+Comment=X terminal emulator
+Icon=utilities-terminal
+Exec=Terminal
+Terminal=false
+
diff --git a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
index a6fac62..e6e2d47 100644
--- a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -3,11 +3,12 @@
 
 <channel name="xfce4-keyboard-shortcuts" version="1.0">
   <property name="commands" type="empty">
-    <property name="default" type="empty">
+    <property name="custom" type="empty">
       <property name="Scroll_Lock" type="string" value="xflock4"/>
       <property name="Print" type="string" value="xfce4-screenshooter -f"/>
       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
       <property name="&lt;Shift&gt;&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout --logout"/>
+      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
     </property>
   </property>
 </channel>
diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc
index 8373b3a..c16d166 100644
--- a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc
+++ b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc
@@ -7,7 +7,7 @@ ArrowPosition=0
 Name=Web Browser
 Comment=Surf the internet
 Icon=browser
-Exec=exo-open --launch WebBrowser
+Exec=firefox
 Path=/home/#-ur_login-#
 Terminal=false
 
diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-31.rc b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-31.rc
index 4018a3f..1af6a85 100644
--- a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-31.rc
+++ b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-31.rc
@@ -3,7 +3,7 @@
 Name=Mail Reader
 Comment=Mail Reader
 Icon=claws-mail
-Exec=exo-open --launch MailReader
+Exec=claws-mail
 Path=/home/#-ur_login-#
 Terminal=false
 
diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-43.rc b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-43.rc
index 9a92996..0a203c8 100644
--- a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-43.rc
+++ b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-43.rc
@@ -7,6 +7,6 @@ ArrowPosition=0
 Name=Command Prompt
 Comment=X terminal emulator
 Icon=utilities-terminal
-Exec=exo-open --launch TerminalEmulator
+Exec=Terminal
 Terminal=false
 
diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
index a6fac62..4439c05 100644
--- a/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -8,6 +8,7 @@
       <property name="Print" type="string" value="xfce4-screenshooter -f"/>
       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
       <property name="&lt;Shift&gt;&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout --logout"/>
+      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
     </property>
   </property>
 </channel>