diff --git a/init.lua b/init.lua
index 5717531..426d206 100644
--- a/init.lua
+++ b/init.lua
@@ -9,20 +9,20 @@ local vkbd = require("vkbd")
 local navbar = {
   iconSize = 96,
   iconPath = gears.filesystem.get_configuration_dir() .. "/awesome-navbar/",
-  launcher = "xfce4-appfinder"
+  launcher = launcher or "xfce4-appfinder"
 }
 
 function navbar.new(s)
   local landscape = s.geometry.width > s.geometry.height
   local portrait = not landscape
-  local tasklist = switcherpopup.new(s)
-  local launcher = launcherpopup.new(s)
+  s.tasklist = switcherpopup.new(s)
+  s.launcher = launcherpopup.new(s)
   local switcher_button = wibox.container.place(awful.widget.button({image = navbar.iconPath .. "/switcher.svg"}), "center", "center")
   switcher_button:buttons(gears.table.join(
     switcher_button:buttons(),
     awful.button({}, 1, nil, function()
-      launcher:hide()
-      tasklist:toggle()
+      s.launcher:hide()
+      s.tasklist:toggle()
     end)
   ))
   local kb_button = wibox.container.place(awful.widget.button({image = navbar.iconPath .. "/keyboard.svg"}), "center", "center")
@@ -34,8 +34,8 @@ function navbar.new(s)
   ))
   local launcher_button = wibox.container.place(awful.widget.button({image = navbar.iconPath .. "/launcher.svg"}), "center", "center")
   longpress.add(launcher_button,function()
-    tasklist:hide()
-    launcher:toggle()
+    s.tasklist:hide()
+    s.launcher:toggle()
    end,
    function()
      awful.spawn(navbar.launcher)