diff --git a/config/awesome/configuration/keys.lua b/config/awesome/configuration/keys.lua
index d4b4a0a..7875c25 100644
--- a/config/awesome/configuration/keys.lua
+++ b/config/awesome/configuration/keys.lua
@@ -39,178 +39,231 @@ awful.mouse.append_global_mousebindings({
 
 -- Client and Tabs Bindings
 awful.keyboard.append_global_keybindings({
-    awful.key({"Mod1"}, "a",
-              function() bling.module.tabbed.pick_with_dmenu() end,
-              {description = "pick client to add to tab group", group = "tabs"}),
-    awful.key({"Mod1"}, "s", function() bling.module.tabbed.iter() end,
-              {description = "iterate through tabbing group", group = "tabs"}),
-    awful.key({"Mod1"}, "d", function() bling.module.tabbed.pop() end, {
-        description = "remove focused client from tabbing group",
-        group = "tabs"
-    }), awful.key({modkey}, "Down", function()
+    awful.key({"Mod1"}, "a", function()
+        bling.module.tabbed.pick_with_dmenu()
+    end,
+    {description = "pick client to add to tab group", group = "tabs"}),
+    awful.key({"Mod1"}, "s", function()
+        bling.module.tabbed.iter()
+    end,
+    {description = "iterate through tabbing group", group = "tabs"}),
+    awful.key({"Mod1"}, "d", function()
+        bling.module.tabbed.pop()
+    end,
+    {description = "remove focused client from tabbing group",group = "tabs"}),
+    awful.key({modkey}, "Down", function()
         awful.client.focus.bydirection("down")
         bling.module.flash_focus.flashfocus(client.focus)
-    end, {description = "focus down", group = "client"}),
+    end,
+    {description = "focus down", group = "client"}),
     awful.key({modkey}, "Up", function()
         awful.client.focus.bydirection("up")
         bling.module.flash_focus.flashfocus(client.focus)
-    end, {description = "focus up", group = "client"}),
+    end,
+    {description = "focus up", group = "client"}),
     awful.key({modkey}, "Left", function()
         awful.client.focus.bydirection("left")
         bling.module.flash_focus.flashfocus(client.focus)
-    end, {description = "focus left", group = "client"}),
+    end,
+    {description = "focus left", group = "client"}),
     awful.key({modkey}, "Right", function()
         awful.client.focus.bydirection("right")
         bling.module.flash_focus.flashfocus(client.focus)
-    end, {description = "focus right", group = "client"}),
-    awful.key({modkey}, "j", function() awful.client.focus.byidx(1) end,
-              {description = "focus next by index", group = "client"}),
-    awful.key({modkey}, "k", function() awful.client.focus.byidx(-1) end,
-              {description = "focus previous by index", group = "client"}),
-    awful.key({modkey, "Shift"}, "j", function() awful.client.swap.byidx(1) end,
-              {description = "swap with next client by index", group = "client"}),
-    awful.key({modkey, "Shift"}, "k",
-              function() awful.client.swap.byidx(-1) end, {
-        description = "swap with previous client by index",
-        group = "client"
-    }), awful.key({modkey}, "u", awful.client.urgent.jumpto,
-                  {description = "jump to urgent client", group = "client"}),
+    end,
+    {description = "focus right", group = "client"}),
+    awful.key({modkey}, "j", function()
+        awful.client.focus.byidx(1)
+    end,
+    {description = "focus next by index", group = "client"}),
+    awful.key({modkey}, "k", function()
+        awful.client.focus.byidx(-1)
+    end,
+    {description = "focus previous by index", group = "client"}),
+    awful.key({modkey, "Shift"}, "j", function()
+        awful.client.swap.byidx(1)
+    end,
+    {description = "swap with next client by index", group = "client"}),
+    awful.key({modkey, "Shift"}, "k", function()
+        awful.client.swap.byidx(-1)
+    end,
+    {description = "swap with previous client by index", group = "client"}), 
+    awful.key({modkey}, "u", 
+        awful.client.urgent.jumpto,
+    {description = "jump to urgent client", group = "client"}),
     awful.key({altkey}, "Tab", function()
         awesome.emit_signal("bling::window_switcher::turn_on")
-    end, {description = "Window Switcher", group = "client"})
+    end,
+    {description = "Window Switcher", group = "client"})
 })
 
 -- Awesomewm
 awful.keyboard.append_global_keybindings({
+
+    -- Brightness Control
+    awful.key({}, "XF86MonBrightnessUp", function() 
+        awful.spawn("brightnessctl set 5%+ -q") 
+    end,
+    {description = "increase brightness", group = "awesome"}),
+    awful.key({}, "XF86MonBrightnessDown", function() 
+        awful.spawn("brightnessctl set 5%- -q") 
+    end,
+    {description = "decrease brightness", group = "awesome"}),
+
     -- Volume control
-    awful.key({}, "XF86AudioRaiseVolume",
-              function() awful.spawn("amixer -D pulse set Master 5%+") end,
-              {description = "increase volume", group = "awesome"}),
-    awful.key({}, "XF86AudioLowerVolume",
-              function() awful.spawn("amixer -D pulse set Master 5%-") end,
-              {description = "decrease volume", group = "awesome"}),
-    awful.key({}, "XF86AudioMute", function() awful.spawn("amixer -D pulse set Master 1+ toggle") end,
-              {description = "mute volume", group = "awesome"}), -- Media Control
-    awful.key({}, "XF86AudioPlay",
-              function() awful.spawn("playerctl play-pause") end,
-              {description = "toggle playerctl", group = "awesome"}),
-    awful.key({}, "XF86AudioPrev",
-              function() awful.spawn("playerctl previous") end,
-              {description = "playerctl previous", group = "awesome"}),
-    awful.key({}, "XF86AudioNext", function() awful.spawn("playerctl next") end,
-              {description = "playerctl next", group = "awesome"}),
+    awful.key({}, "XF86AudioRaiseVolume", function()
+        awful.spawn("amixer -D pulse set Master 5%+")
+    end,
+    {description = "increase volume", group = "awesome"}),
+    awful.key({}, "XF86AudioLowerVolume", function()
+        awful.spawn("amixer -D pulse set Master 5%-")
+    end,
+    {description = "decrease volume", group = "awesome"}),
+    awful.key({}, "XF86AudioMute", function()
+        awful.spawn("amixer -D pulse set Master 1+ toggle")
+    end,
+    {description = "mute volume", group = "awesome"}),
+
+    -- Media Control
+    awful.key({}, "XF86AudioPlay", function()
+        awful.spawn("playerctl play-pause")
+    end,
+    {description = "toggle playerctl", group = "awesome"}),
+    awful.key({}, "XF86AudioPrev", function()
+        awful.spawn("playerctl previous")
+    end,
+    {description = "playerctl previous", group = "awesome"}),
+    awful.key({}, "XF86AudioNext", function()
+        awful.spawn("playerctl next")
+    end,
+    {description = "playerctl next", group = "awesome"}),
 
     -- Screenshots
-    awful.key({}, "Print", 
-              function() awful.spawn.with_shell("screensht") end,
-              {description = "take a screenshot", group = "awesome"}),
-
-    -- Brightness
-    awful.key({}, "XF86MonBrightnessUp",
-              function() awful.spawn("brightnessctl set 5%+ -q") end,
-              {description = "increase brightness", group = "awesome"}),
-    awful.key({}, "XF86MonBrightnessDown",
-              function() awful.spawn("brightnessctl set 5%- -q") end,
-              {description = "decrease brightness", group = "awesome"}),
+    awful.key({}, "Print", function() 
+        awful.spawn.with_shell("screensht")
+    end,
+    {description = "take a screenshot", group = "awesome"}),
 
     -- Awesome stuff
-    awful.key({modkey}, "F1", hotkeys_popup.show_help,
-              {description = "show help", group = "awesome"}),
-    awful.key({modkey}, "Escape", awful.tag.history.restore,
-              {description = "go back", group = "tag"}),
+    awful.key({modkey}, "F1", 
+        hotkeys_popup.show_help,
+    {description = "show help", group = "awesome"}),
+    awful.key({modkey}, "Escape", 
+        awful.tag.history.restore,
+    {description = "go back", group = "tag"}),
     awful.key({modkey}, "x", function() 
         lock_screen_show() 
     end,
-              {description = "toggle lock screen", group = "awesome"}),
-    awful.key({modkey, "Control"}, "r", awesome.restart,
-              {description = "reload awesome", group = "awesome"}),
-    awful.key({modkey, "Shift"}, "q", awesome.quit,
-              {description = "quit awesome", group = "awesome"})
-
+    {description = "toggle lock screen", group = "awesome"}),
+    awful.key({modkey, "Control"}, "r", 
+        awesome.restart,
+    {description = "reload awesome", group = "awesome"}),
+    awful.key({modkey, "Shift"}, "q", 
+        awesome.quit,
+    {description = "quit awesome", group = "awesome"})
 })
 
 -- Layout Machi
 awful.keyboard.append_global_keybindings({
-    awful.key({modkey}, ".",
-              function() machi.default_editor.start_interactive() end, {
-        description = "edit the current layout if it is a machi layout",
-        group = "layout"
-    }),
-    awful.key({modkey}, "/", function() machi.switcher.start(client.focus) end,
-              {
-        description = "switch between windows for a machi layout",
-        group = "layout"
-    })
+    awful.key({modkey}, ".", function()
+        machi.default_editor.start_interactive()
+    end,
+    {description = "edit the current layout if it is a machi layout", group = "layout"}),
+    awful.key({modkey}, "/", function()
+        machi.switcher.start(client.focus)
+    end,
+    {description = "switch between windows for a machi layout", group = "layout"})
 })
 
--- Launcher and screen
+
 awful.keyboard.append_global_keybindings({
-    awful.key({modkey, "Control"}, "j",
-              function() awful.screen.focus_relative(1) end,
-              {description = "focus the next screen", group = "screen"}),
-    awful.key({modkey, "Control"}, "k",
-              function() awful.screen.focus_relative(-1) end,
-              {description = "focus the previous screen", group = "screen"}),
+    -- Screen
+    awful.key({modkey, "Control"}, "j", function()
+        awful.screen.focus_relative(1)
+    end,
+    {description = "focus the next screen", group = "screen"}),
+    awful.key({modkey, "Control"}, "k", function()
+        awful.screen.focus_relative(-1)
+    end,
+    {description = "focus the previous screen", group = "screen"}),
 
-    awful.key({modkey}, "Return", function() awful.spawn(terminal) end,
-              {description = "open terminal", group = "launcher"}),
+    -- Launcher
+    awful.key({modkey}, "Return", function()
+        awful.spawn(terminal)
+    end,
+    {description = "open terminal", group = "launcher"}),
+    awful.key({modkey}, "d", function()
+        awful.spawn(launcher)
+    end,
+    {description = "open applications menu", group = "launcher"}),
+    awful.key({modkey}, "z", function()
+        dash_toggle()
+    end,
+    {description = "Toggle dashboard", group = "launcher"}),
+    awful.key({modkey}, "f", function()
+        awful.spawn(filemanager)
+    end,
+    {description = "open file browser", group = "launcher"}),
+    awful.key({modkey}, "w", function()
+        awful.spawn.with_shell(browser)
+    end,
+    {description = "open firefox", group = "launcher"}),
 
-    awful.key({modkey}, "d", function() awful.spawn(launcher) end,
-              {description = "open applications menu", group = "launcher"}),
+    -- Layout
+    awful.key({modkey}, "l", function()
+        awful.tag.incmwfact(0.05)
+    end,
+    {description = "increase master width factor", group = "layout"}),
+    awful.key({modkey}, "h", function()
+        awful.tag.incmwfact(-0.05)
+    end,
+    {description = "decrease master width factor", group = "layout"}),
+    awful.key({modkey, "Shift"}, "h", function()
+        awful.tag.incnmaster(1, nil, true)
+    end,
+    {description = "increase the number of master clients", group = "layout"}),
+    awful.key({modkey, "Shift"}, "l", function()
+        awful.tag.incnmaster(-1, nil, true)
+    end, {description = "decrease the number of master clients", group = "layout"}),
+    awful.key({modkey, "Control"}, "h", function()
+        awful.tag.incncol(1, nil, true)
+    end,
+    {description = "increase the number of columns", group = "layout"}),
+    awful.key({modkey, "Control"}, "l", function()
+        awful.tag.incncol(-1, nil, true)
+    end,
+    {description = "decrease the number of columns", group = "layout"}),
+    awful.key({modkey}, "space", function()
+        awful.layout.inc(1)
+    end,
+    {description = "select next", group = "layout"}),
+    awful.key({modkey, "Shift"}, "space", function()
+        awful.layout.inc(-1)
+    end,
+    {description = "select previous", group = "layout"}),
 
-    awful.key({modkey}, "z", function() dash_toggle() end,
-              {description = "Toggle dashboard", group = "launcher"}),
-
-    awful.key({modkey}, "f", function() awful.spawn(filemanager) end,
-              {description = "open file browser", group = "launcher"}),
-
-    awful.key({modkey}, "w", function() awful.spawn.with_shell(browser) end,
-              {description = "open firefox", group = "launcher"}),
-
-    awful.key({modkey}, "l", function() awful.tag.incmwfact(0.05) end,
-              {description = "increase master width factor", group = "layout"}),
-    awful.key({modkey}, "h", function() awful.tag.incmwfact(-0.05) end,
-              {description = "decrease master width factor", group = "layout"}),
-
-    awful.key({modkey, "Shift"}, "h",
-              function() awful.tag.incnmaster(1, nil, true) end, {
-        description = "increase the number of master clients",
-        group = "layout"
-    }), awful.key({modkey, "Shift"}, "l",
-                  function() awful.tag.incnmaster(-1, nil, true) end, {
-        description = "decrease the number of master clients",
-        group = "layout"
-    }), awful.key({modkey, "Control"}, "h",
-                  function() awful.tag.incncol(1, nil, true) end, {
-        description = "increase the number of columns",
-        group = "layout"
-    }), awful.key({modkey, "Control"}, "l",
-                  function() awful.tag.incncol(-1, nil, true) end, {
-        description = "decrease the number of columns",
-        group = "layout"
-    }), 
-    
-    awful.key({modkey}, "space", function() awful.layout.inc(1) end,
-              {description = "select next", group = "layout"}),
-    awful.key({modkey, "Shift"}, "space", function() awful.layout.inc(-1) end,
-              {description = "select previous", group = "layout"}), -- Set Layout 
-    awful.key({modkey, "Control"}, "w",
-              function() awful.layout.set(awful.layout.suit.max) end,
-              {description = "set max layout", group = "tag"}),
-    awful.key({modkey}, "s",
-              function() awful.layout.set(awful.layout.suit.tile) end,
-              {description = "set tile layout", group = "tag"}),
-    awful.key({modkey, shift}, "s",
-              function() awful.layout.set(awful.layout.suit.floating) end,
-              {description = "set floating layout", group = "tag"}),
+    -- Set Layout
+    awful.key({modkey, "Control"}, "w", function()
+        awful.layout.set(awful.layout.suit.max)
+    end,
+    {description = "set max layout", group = "tag"}),
+    awful.key({modkey}, "s", function()
+        awful.layout.set(awful.layout.suit.tile)
+    end,
+    {description = "set tile layout", group = "tag"}),
+    awful.key({modkey, shift}, "s", function()
+        awful.layout.set(awful.layout.suit.floating)
+    end,
+    {description = "set floating layout", group = "tag"}),
 
+    --Client
     awful.key({modkey, "Control"}, "n", function()
         local c = awful.client.restore()
         -- Focus restored client
         if c then
             c:emit_signal("request::activate", "key.unminimize", {raise = true})
         end
-    end, {description = "restore minimized", group = "client"})
+    end,
+    {description = "restore minimized", group = "client"})
 })
 
 -- Client management keybinds