diff -ur a/exo-helper/helpers/aterm.desktop.in.in b/exo-helper/helpers/aterm.desktop.in.in
--- a/exo-helper/helpers/aterm.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/aterm.desktop.in.in	2014-11-19 12:43:54.296629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=aterm;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=%B -e %s;
+X-XFCE-CommandsWithParameter=%B -e "%s";
diff -ur a/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in b/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in
--- a/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in	2014-11-19 12:43:54.300629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=x-terminal-emulator;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=%B -e %s;
+X-XFCE-CommandsWithParameter=%B -e "%s";
diff -ur a/exo-helper/helpers/firefox.desktop.in.in b/exo-helper/helpers/firefox.desktop.in.in
--- a/exo-helper/helpers/firefox.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/firefox.desktop.in.in	2014-11-19 12:43:54.300629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
+X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
diff -ur a/exo-helper/helpers/gnome-terminal.desktop.in.in b/exo-helper/helpers/gnome-terminal.desktop.in.in
--- a/exo-helper/helpers/gnome-terminal.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/gnome-terminal.desktop.in.in	2014-11-19 12:43:54.300629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=gnome-terminal;gnometerminal;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=%B -x %s;
+X-XFCE-CommandsWithParameter=%B -x "%s";
diff -ur a/exo-helper/helpers/iceweasel.desktop.in.in b/exo-helper/helpers/iceweasel.desktop.in.in
--- a/exo-helper/helpers/iceweasel.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/iceweasel.desktop.in.in	2014-11-19 12:43:54.304629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=iceweasel;iceweasel-gtk2;iceweasel-gtk;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
+X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
diff -ur a/exo-helper/helpers/links.desktop.in.in b/exo-helper/helpers/links.desktop.in.in
--- a/exo-helper/helpers/links.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/links.desktop.in.in	2014-11-19 12:43:54.304629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=links;links-current;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B "%s";
diff -ur a/exo-helper/helpers/lynx.desktop.in.in b/exo-helper/helpers/lynx.desktop.in.in
--- a/exo-helper/helpers/lynx.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/lynx.desktop.in.in	2014-11-19 12:43:54.304629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=lynx;lynx-current;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B "%s";
diff -ur a/exo-helper/helpers/mozilla-browser.desktop.in.in b/exo-helper/helpers/mozilla-browser.desktop.in.in
--- a/exo-helper/helpers/mozilla-browser.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/mozilla-browser.desktop.in.in	2014-11-19 12:43:54.308629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s;
+X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B "%s";
diff -ur a/exo-helper/helpers/netscape-navigator.desktop.in.in b/exo-helper/helpers/netscape-navigator.desktop.in.in
--- a/exo-helper/helpers/netscape-navigator.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/netscape-navigator.desktop.in.in	2014-11-19 12:43:54.308629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=netscape;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s;
+X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B "%s";
diff -ur a/exo-helper/helpers/nxterm.desktop.in.in b/exo-helper/helpers/nxterm.desktop.in.in
--- a/exo-helper/helpers/nxterm.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/nxterm.desktop.in.in	2014-11-19 12:43:54.308629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=nxterm;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=%B -e %s;
+X-XFCE-CommandsWithParameter=%B -e "%s";
diff -ur a/exo-helper/helpers/Terminal.desktop.in.in b/exo-helper/helpers/Terminal.desktop.in.in
--- a/exo-helper/helpers/Terminal.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/Terminal.desktop.in.in	2014-11-19 12:43:54.312629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=Terminal;xterminal;xfce4-terminal;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=%B -x %s;
+X-XFCE-CommandsWithParameter=%B -x "%s";
diff -ur a/exo-helper/helpers/urxvt.desktop.in.in b/exo-helper/helpers/urxvt.desktop.in.in
--- a/exo-helper/helpers/urxvt.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/urxvt.desktop.in.in	2014-11-19 12:43:54.312629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=urxvt;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=%B -e %s;
+X-XFCE-CommandsWithParameter=%B -e "%s";
diff -ur a/exo-helper/helpers/w3m.desktop.in.in b/exo-helper/helpers/w3m.desktop.in.in
--- a/exo-helper/helpers/w3m.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/w3m.desktop.in.in	2014-11-19 12:43:54.312629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=w3m;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B "%s";
diff -ur a/exo-helper/helpers/xterm.desktop.in.in b/exo-helper/helpers/xterm.desktop.in.in
--- a/exo-helper/helpers/xterm.desktop.in.in	2012-04-29 00:01:42.000000000 +0400
+++ b/exo-helper/helpers/xterm.desktop.in.in	2014-11-19 12:43:54.312629928 +0300
@@ -7,4 +7,4 @@
 X-XFCE-Binaries=xterm;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=%B -e %s;
+X-XFCE-CommandsWithParameter=%B -e "%s";