diff --git a/localconf.lua.template b/localconf.lua.template
index 78c312d..6bcfa02 100644
--- a/localconf.lua.template
+++ b/localconf.lua.template
@@ -1,3 +1,28 @@
-terminal = "urxvtc -e tmux"
-modkey = "Mod4"
-rule_screen=1
+local conf = {}
+local awful = awful
+
+-- modkey to use for most bindings
+conf.modkey = "Mod4"
+
+-- screen number, on which rules will put clients by default
+conf.rule_screen=1
+
+-- should mpd prompt clear playlist before adding matched songs
+conf.mpd_prompt_clear_before = true
+
+-- default programs (for keybindings)
+conf.cmd = {}
+conf.cmd.terminal = "g.zsh"        -- Mod-t
+conf.cmd.browser = "webbrowser"    -- Mod-c f
+conf.cmd.im_client = "im-client"   -- Mod-c i
+conf.cmd.irc_client = "sweechat"   -- Mod-c I
+conf.cmd.mail_client = "gmutt"     -- Mod-c m
+conf.cmd.mpd_client = "gmpc"       -- Mod-m g
+conf.cmd.editor = {}
+conf.cmd.editor.terminal = conf.cmd.terminal .. " -e vim"
+conf.cmd.editor.gui = "gvim"
+
+-- Mod-r binding for running programs
+conf.cmd.run = function() awful.util.spawn("dmenu_run -l 10 -y 350") end
+
+return conf
diff --git a/mpd.lua b/mpd.lua
index 99b3c9b..ac5ebfe 100644
--- a/mpd.lua
+++ b/mpd.lua
@@ -1,10 +1,12 @@
+-- MPD control and playlist editing
+-- prompts require dmpc script
 local M = {}
 local conf = conf
 local awful = awful
 local log = log
 
 -- local functions
-local dmenu, mpc_play_search, notify, mpc
+local dmenu, notify, mpc
 
 local defaults = {}
 local settings = {}
@@ -82,10 +84,6 @@ M.prompt.toggle_replace_on_search = function()
 			).. " the playlist")
 end
 
-function mpc_play_search(s)
-	notify("Found " .. (s) .. " matches");
-end
-
 -- }}}
 
 -- {{{ notify wrapper