diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf
index faa967c..bac2fe1 100644
--- a/.config/ranger/rifle.conf
+++ b/.config/ranger/rifle.conf
@@ -54,31 +54,31 @@
 # Rarely installed browsers get higher priority; It is assumed that if you
 # install a rare browser, you probably use it.  Firefox/konqueror/w3m on the
 # other hand are often only installed as fallback browsers.
-ext x?html?, has surf,             X, flag f = surf -- file://"$1"
-ext x?html?, has vimprobable,      X, flag f = vimprobable -- "$@"
-ext x?html?, has vimprobable2,     X, flag f = vimprobable2 -- "$@"
-ext x?html?, has qutebrowser,      X, flag f = qutebrowser -- "$@"
-ext x?html?, has dwb,              X, flag f = dwb -- "$@"
-ext x?html?, has jumanji,          X, flag f = jumanji -- "$@"
-ext x?html?, has luakit,           X, flag f = luakit -- "$@"
-ext x?html?, has uzbl,             X, flag f = uzbl -- "$@"
-ext x?html?, has uzbl-tabbed,      X, flag f = uzbl-tabbed -- "$@"
-ext x?html?, has uzbl-browser,     X, flag f = uzbl-browser -- "$@"
-ext x?html?, has uzbl-core,        X, flag f = uzbl-core -- "$@"
-ext x?html?, has midori,           X, flag f = midori -- "$@"
-ext x?html?, has opera,            X, flag f = opera -- "$@"
-ext x?html?, has firefox,          X, flag f = firefox -- "$@"
-ext x?html?, has seamonkey,        X, flag f = seamonkey -- "$@"
-ext x?html?, has iceweasel,        X, flag f = iceweasel -- "$@"
-ext x?html?, has chromium-browser, X, flag f = chromium-browser -- "$@"
-ext x?html?, has chromium,         X, flag f = chromium -- "$@"
-ext x?html?, has google-chrome,    X, flag f = google-chrome -- "$@"
-ext x?html?, has epiphany,         X, flag f = epiphany -- "$@"
-ext x?html?, has konqueror,        X, flag f = konqueror -- "$@"
+ext x?html?, has surf,             X, flag f = surf file://"$1"
+ext x?html?, has vimprobable,      X, flag f = vimprobable "$@"
+ext x?html?, has vimprobable2,     X, flag f = vimprobable2 "$@"
+ext x?html?, has qutebrowser,      X, flag f = qutebrowser "$@"
+ext x?html?, has dwb,              X, flag f = dwb "$@"
+ext x?html?, has jumanji,          X, flag f = jumanji "$@"
+ext x?html?, has luakit,           X, flag f = luakit "$@"
+ext x?html?, has uzbl,             X, flag f = uzbl "$@"
+ext x?html?, has uzbl-tabbed,      X, flag f = uzbl-tabbed "$@"
+ext x?html?, has uzbl-browser,     X, flag f = uzbl-browser "$@"
+ext x?html?, has uzbl-core,        X, flag f = uzbl-core "$@"
+ext x?html?, has midori,           X, flag f = midori "$@"
+ext x?html?, has opera,            X, flag f = opera "$@"
+ext x?html?, has firefox,          X, flag f = firefox "$@"
+ext x?html?, has seamonkey,        X, flag f = seamonkey "$@"
+ext x?html?, has iceweasel,        X, flag f = iceweasel "$@"
+ext x?html?, has chromium-browser, X, flag f = chromium-browser "$@"
+ext x?html?, has chromium,         X, flag f = chromium "$@"
+ext x?html?, has google-chrome,    X, flag f = google-chrome "$@"
+ext x?html?, has epiphany,         X, flag f = epiphany "$@"
+ext x?html?, has konqueror,        X, flag f = konqueror "$@"
 ext x?html?, has elinks,            terminal = elinks "$@"
 ext x?html?, has links2,            terminal = links2 "$@"
 ext x?html?, has links,             terminal = links "$@"
-ext x?html?, has lynx,              terminal = lynx -- "$@"
+ext x?html?, has lynx,              terminal = lynx "$@"
 ext x?html?, has w3m,               terminal = w3m "$@"
 
 #-------------------------------------------
@@ -100,100 +100,100 @@ name ^[mM]akefile$            = make
 #--------------------------------------------
 # Scripts
 #-------------------------------------------
-ext py  = python -- "$1"
-ext pl  = perl -- "$1"
-ext rb  = ruby -- "$1"
-ext js  = node -- "$1"
-ext sh  = sh -- "$1"
-ext php = php -- "$1"
+ext py  = python "$1"
+ext pl  = perl "$1"
+ext rb  = ruby "$1"
+ext js  = node "$1"
+ext sh  = sh "$1"
+ext php = php "$1"
 
 #--------------------------------------------
 # Audio without X
 #-------------------------------------------
-mime ^audio|ogg$, terminal, has mpv      = mpv -- "$@"
-mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@"
-mime ^audio|ogg$, terminal, has mplayer  = mplayer -- "$@"
-ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
+mime ^audio|ogg$, terminal, has mpv      = mpv "$@"
+mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 "$@"
+mime ^audio|ogg$, terminal, has mplayer  = mplayer "$@"
+ext midi?,        terminal, has wildmidi = wildmidi "$@"
 
 #--------------------------------------------
 # Video/Audio with a GUI
 #-------------------------------------------
-mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
+mime ^video|audio, has gmplayer, X, flag f = gmplayer "$@"
 mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
-mime ^video,       has mpv,      X, flag f = mpv -- "$@"
-mime ^video,       has mpv,      X, flag f = mpv --fs -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -- "$@"
-mime ^video,       has mplayer2, X, flag f = mplayer2 -fs -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -- "$@"
-mime ^video,       has mplayer,  X, flag f = mplayer -fs -- "$@"
-mime ^video|audio, has vlc,      X, flag f = vlc -- "$@"
-mime ^video|audio, has totem,    X, flag f = totem -- "$@"
-mime ^video|audio, has totem,    X, flag f = totem --fullscreen -- "$@"
+mime ^video,       has mpv,      X, flag f = mpv "$@"
+mime ^video,       has mpv,      X, flag f = mpv --fs "$@"
+mime ^video,       has mplayer2, X, flag f = mplayer2 "$@"
+mime ^video,       has mplayer2, X, flag f = mplayer2 -fs "$@"
+mime ^video,       has mplayer,  X, flag f = mplayer "$@"
+mime ^video,       has mplayer,  X, flag f = mplayer -fs "$@"
+mime ^video|audio, has vlc,      X, flag f = vlc "$@"
+mime ^video|audio, has totem,    X, flag f = totem "$@"
+mime ^video|audio, has totem,    X, flag f = totem --fullscreen "$@"
 
 #--------------------------------------------
 # Video without X
 #-------------------------------------------
-mime ^video, terminal, !X, has mpv       = mpv -- "$@"
-mime ^video, terminal, !X, has mplayer2  = mplayer2 -- "$@"
-mime ^video, terminal, !X, has mplayer   = mplayer -- "$@"
+mime ^video, terminal, !X, has mpv       = mpv "$@"
+mime ^video, terminal, !X, has mplayer2  = mplayer2 "$@"
+mime ^video, terminal, !X, has mplayer   = mplayer "$@"
 
 #-------------------------------------------
 # Documents
 #-------------------------------------------
 ext pdf, has llpp,     X, flag f = llpp "$@"
-ext pdf, has zathura,  X, flag f = zathura -- "$@"
+ext pdf, has zathura,  X, flag f = zathura "$@"
 ext pdf, has mupdf,    X, flag f = mupdf "$@"
 ext pdf, has mupdf-x11,X, flag f = mupdf-x11 "$@"
-ext pdf, has apvlv,    X, flag f = apvlv -- "$@"
-ext pdf, has xpdf,     X, flag f = xpdf -- "$@"
-ext pdf, has evince,   X, flag f = evince -- "$@"
-ext pdf, has atril,    X, flag f = atril -- "$@"
-ext pdf, has okular,   X, flag f = okular -- "$@"
-ext pdf, has epdfview, X, flag f = epdfview -- "$@"
+ext pdf, has apvlv,    X, flag f = apvlv "$@"
+ext pdf, has xpdf,     X, flag f = xpdf "$@"
+ext pdf, has evince,   X, flag f = evince "$@"
+ext pdf, has atril,    X, flag f = atril "$@"
+ext pdf, has okular,   X, flag f = okular "$@"
+ext pdf, has epdfview, X, flag f = epdfview "$@"
 ext pdf, has qpdfview, X, flag f = qpdfview "$@"
 ext pdf, has open,     X, flag f = open "$@"
 
-ext docx?, has catdoc,       terminal = catdoc -- "$@" | "$PAGER"
+ext docx?, has catdoc,       terminal = catdoc "$@" | "$PAGER"
 
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric,    X, flag f = gnumeric -- "$@"
-ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread,     X, flag f = kspread -- "$@"
+ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric,    X, flag f = gnumeric "$@"
+ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread,     X, flag f = kspread "$@"
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has soffice,     X, flag f = soffice "$@"
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has ooffice,     X, flag f = ooffice "$@"
 
-ext djvu, has zathura,X, flag f = zathura -- "$@"
-ext djvu, has evince, X, flag f = evince -- "$@"
-ext djvu, has atril,  X, flag f = atril -- "$@"
-ext djvu, has djview, X, flag f = djview -- "$@"
+ext djvu, has zathura,X, flag f = zathura "$@"
+ext djvu, has evince, X, flag f = evince "$@"
+ext djvu, has atril,  X, flag f = atril "$@"
+ext djvu, has djview, X, flag f = djview "$@"
 
-ext epub, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
-ext epub, has zathura,      X, flag f = zathura -- "$@"
-ext epub, has mupdf,        X, flag f = mupdf -- "$@"
-ext mobi, has ebook-viewer, X, flag f = ebook-viewer -- "$@"
+ext epub, has ebook-viewer, X, flag f = ebook-viewer "$@"
+ext epub, has zathura,      X, flag f = zathura "$@"
+ext epub, has mupdf,        X, flag f = mupdf "$@"
+ext mobi, has ebook-viewer, X, flag f = ebook-viewer "$@"
 
-ext cbr,  has zathura,      X, flag f = zathura -- "$@"
-ext cbz,  has zathura,      X, flag f = zathura -- "$@"
+ext cbr,  has zathura,      X, flag f = zathura "$@"
+ext cbz,  has zathura,      X, flag f = zathura "$@"
 
 #-------------------------------------------
 # Images
 #-------------------------------------------
-mime ^image/svg, has inkscape, X, flag f = inkscape -- "$@"
-mime ^image/svg, has display,  X, flag f = display -- "$@"
+mime ^image/svg, has inkscape, X, flag f = inkscape "$@"
+mime ^image/svg, has display,  X, flag f = display "$@"
 
-mime ^image, has imv,       X, flag f = imv -- "$@"
-mime ^image, has pqiv,      X, flag f = pqiv -- "$@"
-mime ^image, has sxiv,      X, flag f = sxiv -- "$@"
-mime ^image, has feh,       X, flag f = feh -- "$@"
-mime ^image, has mirage,    X, flag f = mirage -- "$@"
+mime ^image, has imv,       X, flag f = imv "$@"
+mime ^image, has pqiv,      X, flag f = pqiv "$@"
+mime ^image, has sxiv,      X, flag f = sxiv "$@"
+mime ^image, has feh,       X, flag f = feh "$@"
+mime ^image, has mirage,    X, flag f = mirage "$@"
 mime ^image, has ristretto, X, flag f = ristretto "$@"
-mime ^image, has eog,       X, flag f = eog -- "$@"
-mime ^image, has eom,       X, flag f = eom -- "$@"
-mime ^image, has nomacs,    X, flag f = nomacs -- "$@"
-mime ^image, has geeqie,    X, flag f = geeqie -- "$@"
-mime ^image, has gpicview,  X, flag f = gpicview -- "$@"
-mime ^image, has gwenview,  X, flag f = gwenview -- "$@"
-mime ^image, has gimp,      X, flag f = gimp -- "$@"
-ext xcf,                    X, flag f = gimp -- "$@"
+mime ^image, has eog,       X, flag f = eog "$@"
+mime ^image, has eom,       X, flag f = eom "$@"
+mime ^image, has nomacs,    X, flag f = nomacs "$@"
+mime ^image, has geeqie,    X, flag f = geeqie "$@"
+mime ^image, has gpicview,  X, flag f = gpicview "$@"
+mime ^image, has gwenview,  X, flag f = gwenview "$@"
+mime ^image, has gimp,      X, flag f = gimp "$@"
+ext xcf,                    X, flag f = gimp "$@"
 
 #-------------------------------------------
 # Archives
@@ -202,10 +202,10 @@ ext xcf,                    X, flag f = gimp -- "$@"
 # avoid password prompt by providing empty password
 ext 7z, has 7z = 7z -p l "$@" | "$PAGER"
 # This requires atool
-ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,     has atool = atool --list --each -- "$@" | "$PAGER"
-ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each -- "$@" | "$PAGER"
-ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has atool = atool --extract --each -- "$@"
-ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each -- "$@"
+ext ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,     has atool = atool --list --each "$@" | "$PAGER"
+ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --list --each "$@" | "$PAGER"
+ext 7z|ace|ar|arc|bz2?|cab|cpio|cpt|deb|dgc|dmg|gz,  has atool = atool --extract --each "$@"
+ext iso|jar|msi|pkg|rar|shar|tar|tgz|xar|xpi|xz|zip, has atool = atool --extract --each "$@"
 
 # Listing and extracting archives without atool:
 ext tar|gz|bz2|xz, has tar = tar vvtf "$1" | "$PAGER"
@@ -231,7 +231,7 @@ mime ^font, has fontforge, X, flag f = fontforge "$@"
 # gnome-terminal/konsole/xterm on the other hand are often installed as part of
 # a desktop environment or as fallback terminal emulators.
 mime ^ranger/x-terminal-emulator, has terminology = terminology -e "$@"
-mime ^ranger/x-terminal-emulator, has kitty = kitty -- "$@"
+mime ^ranger/x-terminal-emulator, has kitty = kitty "$@"
 mime ^ranger/x-terminal-emulator, has alacritty = alacritty -e "$@"
 mime ^ranger/x-terminal-emulator, has sakura = sakura -e "$@"
 mime ^ranger/x-terminal-emulator, has lilyterm = lilyterm -e "$@"
@@ -248,7 +248,7 @@ mime ^ranger/x-terminal-emulator, has lxterminal = lxterminal -e "$@"
 mime ^ranger/x-terminal-emulator, has mate-terminal = mate-terminal -x "$@"
 mime ^ranger/x-terminal-emulator, has xfce4-terminal = xfce4-terminal -x "$@"
 mime ^ranger/x-terminal-emulator, has konsole = konsole -e "$@"
-mime ^ranger/x-terminal-emulator, has gnome-terminal = gnome-terminal -- "$@"
+mime ^ranger/x-terminal-emulator, has gnome-terminal = gnome-terminal "$@"
 mime ^ranger/x-terminal-emulator, has xterm = xterm -e "$@"
 
 #-------------------------------------------
@@ -262,8 +262,8 @@ label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1"
 #-------------------------------------------
 # Generic file openers
 #-------------------------------------------
-label open, has xdg-open = xdg-open -- "$@"
-label open, has open     = open -- "$@"
+label open, has xdg-open = xdg-open "$@"
+label open, has open     = open "$@"
 
 # Define the editor for non-text files + pager as last action
               !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = ask
@@ -280,5 +280,5 @@ label pager,  !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = "$PAGER"
 mime application/x-executable = "$1"
 
 # Move the file to trash using trash-cli.
-label trash, has trash-put = trash-put -- "$@"
-label trash = mkdir -p -- ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash; mv -- "$@" ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash
+label trash, has trash-put = trash-put "$@"
+label trash = mkdir -p ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash; mv "$@" ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash
diff --git a/.local/bin/launch_emacs.sh b/.local/bin/launch_emacs.sh
index 24952a8..c6cfef5 100755
--- a/.local/bin/launch_emacs.sh
+++ b/.local/bin/launch_emacs.sh
@@ -2,7 +2,7 @@
 
 emacsclient -n -e "(> (length (frame-list)) 1)" | grep -q t
 if [ "$?" = "1" ]; then
-    emacsclient -c -n -a "" "$@"
+    emacsclient -c -n -a " " "$@"
 else
-    emacsclient -n -a "" "$@"
+    emacsclient -n -a " " "$@"
 fi
diff --git a/user/.zshrc b/user/.zshrc
index 9ee40ca..57075c8 100644
--- a/user/.zshrc
+++ b/user/.zshrc
@@ -32,7 +32,7 @@ export LS_COLORS
 setopt globdots
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 
-export EDITOR="launch_emacs.sh"
+export EDITOR="launch_ttyemacs.sh"
 export VISUAL="launch_emacs.sh"
 
 zle_highlight=(default:bold,fg=white)