diff --git a/rc.lua.template b/rc.lua.template
index db10f14..eae0513 100644
--- a/rc.lua.template
+++ b/rc.lua.template
@@ -89,11 +89,12 @@ local themes = {
 local chosen_theme = themes[5]
 local modkey       = "Mod4"
 local altkey       = "Mod1"
-local terminal     = "urxvtc"
+local vi_focus     = false
+local terminal     = os.getenv("TERMINAL") or "urxvtc"
 local editor       = os.getenv("EDITOR") or "vim"
-local gui_editor   = "gvim"
-local browser      = "firefox"
-local guieditor    = "atom"
+local gui_editor   = os.getenv("GUI_EDITOR") or "gedit"
+local browser      = os.getenv("BROWSER") or "firefox"
+local guieditor    = os.getenv("GUI_EDITOR") or "aton"
 local scrlocker    = "slock"
 
 awful.util.terminal = terminal
@@ -751,7 +752,7 @@ end)
 
 -- Enable sloppy focus, so that focus follows mouse.
 client.connect_signal("mouse::enter", function(c)
-    c:emit_signal("request::activate", "mouse_enter", {raise = true})
+    c:emit_signal("request::activate", "mouse_enter", {raise = vi_focus})
 end)
 
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)