diff --git a/rc.lua b/rc.lua
index eaf183c..c3e189f 100644
--- a/rc.lua
+++ b/rc.lua
@@ -58,13 +58,11 @@ config.layouts = {
    awful.layout.suit.floating,
 }
 config.hostname = awful.util.pread('uname -n'):gsub('\n', '')
-config.browser = "firefox"
 
 -- Remaining modules
 loadrc("appearance")		-- theme and appearance settings
 loadrc("debug")			-- debugging primitive `dbg()`
 
-loadrc("start")			-- programs to run on start
 loadrc("bindings")		-- keybindings
 loadrc("wallpaper")		-- wallpaper settings
 loadrc("widgets")		-- widgets configuration
diff --git a/rc/start.lua b/rc/start.lua
deleted file mode 100644
index 6d50edc..0000000
--- a/rc/start.lua
+++ /dev/null
@@ -1,13 +0,0 @@
--- Start idempotent commands
-local execute = {
-   -- Default browser
-   "xdg-mime default " .. config.browser .. ".desktop " ..
-      "x-scheme-handler/http " ..
-      "x-scheme-handler/https " ..
-      "text/html",
-   -- Default MIME types
-   "xdg-mime default org.gnome.Evince.desktop application/pdf",
-   "xdg-mime default gpicview.desktop image/png image/x-apple-ios-png image/jpeg image/jpg image/gif"
-}
-
-os.execute(table.concat(execute, ";"))
diff --git a/rc/tags.lua b/rc/tags.lua
index 66935c3..65cbaf7 100644
--- a/rc/tags.lua
+++ b/rc/tags.lua
@@ -17,7 +17,7 @@ shifty.config.tags = {
       exclusive = true,
       max_clients = 1,
       screen = math.min(screen.count(), 2),
-      spawn = config.browser,
+      spawn = "firefox",
       icon = tagicon("web")
    },
    emacs = {
diff --git a/systemd/misc-x@.service b/systemd/misc-x@.service
index 2719f10..bad285f 100644
--- a/systemd/misc-x@.service
+++ b/systemd/misc-x@.service
@@ -5,5 +5,8 @@ PartOf=graphical-session@%i.target
 [Service]
 Environment=DISPLAY=%I
 ExecStart=/usr/bin/xset -b
+ExecStart=/usr/bin/xdg-mime default firefox.desktop x-scheme-handler/http x-scheme-handler/https text/html
+ExecStart=/usr/bin/xdg-mime default org.gnome.Evince.desktop application/pdf
+ExecStart=/usr/bin/xdg-mime default gpicview.desktop image/png image/jpeg image/jpg image/gif image/webp
 Type=oneshot
 RemainAfterExit=false