diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown
index e37c3990..13a2bf5c 100644
--- a/doc/rofi-manpage.markdown
+++ b/doc/rofi-manpage.markdown
@@ -191,7 +191,7 @@ Example: Have a mode 'Workspaces' using the `i3_switch_workspaces.sh` script:
     rofi -modi "window,run,ssh,Workspaces:i3_switch_workspaces.sh" -show Workspaces
 
 Notes: The I3 Window manager does not like commas in the command when specifying an exec command.
-For that case '/' can be used as an separator.
+For that case '#' can be used as an separator.
 
 `-case-sensitive`
 
@@ -467,7 +467,7 @@ To get one merge view, of window,run,ssh:
     rofi -show combi -combi-modi "window,run,ssh" -modi combi
 
 Notes: The I3 Window manager does not like commas in the command when specifying an exec command.
-For that case '/' can be used as an separator.
+For that case '#' can be used as an separator.
 
 ### History and Sorting
 
diff --git a/doc/rofi-theme.5 b/doc/rofi-theme.5
index 61c7c868..0c55db71 100644
--- a/doc/rofi-theme.5
+++ b/doc/rofi-theme.5
@@ -1,5 +1,5 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI\-THEME\-MANPAGE" "" "2017-03-20" "" ""
+.TH "ROFI\-THEME\-MANPAGE" "" "March 2017" "" ""
 
diff --git a/doc/rofi.1 b/doc/rofi.1
index 0847dfa2..bc56070d 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI\-MANPAGE" "" "2017-03-31" "" ""
+.TH "ROFI\-MANPAGE" "" "March 2017" "" ""
 .
 .SH "NAME"
 \fBrofi\fR \- A window switcher, application launcher, ssh dialog and dmenu replacement
@@ -268,7 +268,7 @@ rofi \-modi "window,run,ssh,Workspaces:i3_switch_workspaces\.sh" \-show Workspac
 .IP "" 0
 .
 .P
-Notes: The I3 Window manager does not like commas in the command when specifying an exec command\. For that case \'/\' can be used as an separator\.
+Notes: The I3 Window manager does not like commas in the command when specifying an exec command\. For that case \'#\' can be used as an separator\.
 .
 .P
 \fB\-case\-sensitive\fR
@@ -712,7 +712,7 @@ rofi \-show combi \-combi\-modi "window,run,ssh" \-modi combi
 .IP "" 0
 .
 .P
-Notes: The I3 Window manager does not like commas in the command when specifying an exec command\. For that case \'/\' can be used as an separator\.
+Notes: The I3 Window manager does not like commas in the command when specifying an exec command\. For that case \'#\' can be used as an separator\.
 .
 .SS "History and Sorting"
 \fB\-disable\-history\fR \fB\-no\-disable\-history\fR (re\-enable history)
diff --git a/source/dialogs/combi.c b/source/dialogs/combi.c
index 986e153f..f1e041c3 100644
--- a/source/dialogs/combi.c
+++ b/source/dialogs/combi.c
@@ -63,7 +63,7 @@ static void combi_mode_parse_switchers ( Mode *sw )
     char                 *savept = NULL;
     // Make a copy, as strtok will modify it.
     char                 *switcher_str = g_strdup ( config.combi_modi );
-    const char * const   sep           = ",/";
+    const char * const   sep           = ",#";
     // Split token on ','. This modifies switcher_str.
     for ( char *token = strtok_r ( switcher_str, sep, &savept ); token != NULL;
           token = strtok_r ( NULL, sep, &savept ) ) {
diff --git a/source/rofi.c b/source/rofi.c
index 0c47b753..e4e3ccbe 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -611,7 +611,7 @@ static int add_mode ( const char * token )
 }
 static void setup_modi ( void )
 {
-    const char *const sep     = ",/";
+    const char *const sep     = ",#";
     char              *savept = NULL;
     // Make a copy, as strtok will modify it.
     char              *switcher_str = g_strdup ( config.modi );