diff --git a/awesome/options.lua b/awesome/options.lua
new file mode 100644
index 0000000..5bb2f11
--- /dev/null
+++ b/awesome/options.lua
@@ -0,0 +1,4 @@
+return {
+    browser="optirun firefox",
+    terminal="terminator"
+}
diff --git a/awesome/rc.lua b/awesome/rc.lua
index 7724206..2e495d5 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -12,7 +12,7 @@ local vicious = require('vicious')
 naughty = require("naughty")
 local menubar = require("menubar")
 local vicious = require("vicious")
-local browser = require("browser")
+local options = require("options")
 
 home = os.getenv('HOME')
 
@@ -91,7 +91,7 @@ local battery = require("battery")
 local calendar = require("calendar")
 
 -- This is used later as the default terminal and editor to run.
-terminal = "urxvt"
+terminal = options.terminal
 editor = os.getenv("EDITOR") or "nano"
 editor_cmd = terminal .. " -e " .. editor
 
@@ -381,9 +381,9 @@ globalkeys = awful.util.table.join(
 
     -- Chromium
     awful.key({ }, "XF86HomePage", function () os.execute('$BROWSER &') end),
-    awful.key({ modkey}, "a", function () os.execute(browser .. '&')
+    awful.key({ modkey}, "a", function () os.execute(options.browser .. '&')
         naughty.notify({
-            title = browser .. " starting...",
+            title = options.browser .. " starting...",
             text = awesome.startup_errors })
         end
     ),