diff --git a/.Xdefaults b/.Xdefaults
index 0f91b89..baf191f 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,55 +1,55 @@
-urxvt*font:             xft:Fira Code Medium:size=8
-urxvt*termName:         rxvt-unicode
-urxvt*scrollBar:        false
-urxvt*perl-lib:         /usr/lib/urxvt/perl/
-urxvt*perl-ext-common:  default,matcher
-urxvt*urlLauncher:      firefox
-urxvt*matcher.button:   1
-urxvt*letterSpace:      -1
-urxvt*internalBorder:   6
-urxvt*fading:           40
-urxvt*fadeColor:        [50]#000000
+URxvt.font:             xft:Fira Code Medium:size=8
+URxvt.termName:         rxvt-unicode
+URxvt.scrollBar:        false
+URxvt.perl-lib:         /usr/lib/urxvt/perl/
+URxvt.perl-ext-common:  default,matcher
+URxvt.urlLauncher:      firefox
+URxvt.matcher.button:   1
+URxvt.letterSpace:      -1
+URxvt.internalBorder:   6
+URxvt.fading:           40
+URxvt.fadeColor:        [50]#000000
 
-Xft*dpi:                102
-Xft*antialias:          true
+Xft.dpi:                102
+Xft.antialias:          true
 Xft.rgba:               none
-Xft*hinting:            hintfull
+Xft.hinting:            hintfull
 
-urxvt*depth: 32
+URxvt.depth: 32
 
 ! special
-urxvt*foreground:   #eceff1
-urxvt*background:   [80]#161616
-urxvt*cursorColor:  #eceff1
+URxvt.foreground:   #eceff1
+URxvt.background:   [80]#161616
+URxvt.cursorColor:  #eceff1
 
 ! black
-urxvt*color0:       #263238
-urxvt*color8:       #37474f
+URxvt.color0:       #263238
+URxvt.color8:       #37474f
 
 ! red
-urxvt*color1:       #cc0000
-urxvt*color9:       #ef2929
+URxvt.color1:       #cc0000
+URxvt.color9:       #ef2929
 
 ! green
-urxvt*color2:       #8bc34a
-urxvt*color10:      #9ccc65
+URxvt.color2:       #8bc34a
+URxvt.color10:      #9ccc65
 
 ! yellow
-urxvt*color3:       #ffc107
-urxvt*color11:      #ffa000
+URxvt.color3:       #ffc107
+URxvt.color11:      #ffa000
 
 ! blue
-urxvt*color4:       #03a9f4
-urxvt*color12:      #81d4fa
+URxvt.color4:       #03a9f4
+URxvt.color12:      #81d4fa
 
 ! magenta
-urxvt*color5:       #e91e63
-urxvt*color13:      #ad1457
+URxvt.color5:       #e91e63
+URxvt.color13:      #ad1457
 
 ! cyan
-urxvt*color6:       #009688
-urxvt*color14:      #26a69a
+URxvt.color6:       #009688
+URxvt.color14:      #26a69a
 
 ! white
-urxvt*color7:       #cfd8dc
-urxvt*color15:      #eceff1
+URxvt.color7:       #cfd8dc
+URxvt.color15:      #eceff1
diff --git a/awesome/rc.lua b/awesome/rc.lua
index 386d6da..85e5262 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -191,6 +191,7 @@ local myawesomemenu = {
     { "restart", awesome.restart },
     { "quit", function() awesome.quit() end }
 }
+
 awful.util.mymainmenu = freedesktop.menu.build({
     icon_size = beautiful.menu_height or 16,
     before = {
@@ -294,6 +295,7 @@ globalkeys = awful.util.table.join(
             end
         end,
         {description = "go back", group = "client"}),
+
     awful.key({ modkey,           }, "Tab", function () awful.spawn("rofi -show window") end,
         {description = "go back", group = "client"}),
 
@@ -312,15 +314,13 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "]", function () lain.util.useless_gaps_resize(-1) end),
 
     -- Dynamic tagging
-    awful.key({ modkey, "Shift" }, "n", function () lain.util.add_tag() end),
-    awful.key({ modkey, "Shift" }, "r", function () lain.util.rename_tag() end),
-    awful.key({ modkey, "Shift" }, "Left", function () lain.util.move_tag(-1) end),  -- move to previous tag
-    awful.key({ modkey, "Shift" }, "Right", function () lain.util.move_tag(1) end),  -- move to next tag
-    awful.key({ modkey, "Shift" }, "d", function () lain.util.delete_tag() end),
+    awful.key({ modkey, "Shift" }, "n", function () lain.util.add_tag() end, { group = "Tagging", description = "Add tag" }),
+    awful.key({ modkey, "Shift" }, "r", function () lain.util.rename_tag() end, { group = "Tagging", description = "Rename current tag" }),
+    awful.key({ modkey, "Shift" }, "Left", function () lain.util.move_tag(-1) end, { group = "Tagging", description = "Move tag to left" }),  -- move to previous tag
+    awful.key({ modkey, "Shift" }, "Right", function () lain.util.move_tag(1) end, { group = "Tagging", description = "Move tag to right" }),  -- move to next tag
+    awful.key({ modkey, "Shift" }, "d", function () lain.util.delete_tag() end, { group = "Tagging", description = "Remove crrent tag" }),
 
     -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,
-              {description = "open a terminal", group = "launcher"}),
     awful.key({ modkey, "Control" }, "r", awesome.restart,
               {description = "reload awesome", group = "awesome"}),
     awful.key({ modkey, "Shift"   }, "q", awesome.quit,
@@ -354,9 +354,6 @@ globalkeys = awful.util.table.join(
               end,
               {description = "restore minimized", group = "client"}),
 
-    -- Dropdown application
-    awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end),
-
     -- Screenshots
     awful.key({ }, "Print", function () awful.spawn("flameshot gui") end),
 
@@ -366,31 +363,19 @@ globalkeys = awful.util.table.join(
 
     -- Copy primary to clipboard (terminals to gtk)
     awful.key({ modkey }, "c", function () awful.spawn("xsel | xsel -i -b") end),
+
     -- Copy clipboard to primary (gtk to terminals)
     awful.key({ modkey }, "v", function () awful.spawn("xsel -b | xsel") end),
 
     -- User programs
-    awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end),
-    awful.key({ modkey }, "q", function () awful.spawn(browser) end),
+    awful.key({ modkey }, "e",      function () awful.spawn(gui_editor) end, { group = "launcher", description = "Open GUI editor" }),
+    awful.key({ modkey }, "q",      function () awful.spawn(browser) end, { group = "launcher", description = "Open browser window" }),
+    awful.key({ modkey }, "Return", function () awful.spawn(terminal) end, { group = "launcher", description = "Open terminal" }),
 
+    -- Dropdown application
+    awful.key({ modkey }, "`", function () awful.screen.focused().quake:toggle() end, { group = "launcher", description = "Open quake style terminal" }),
     -- Prompt
-    awful.key({ modkey }, "r", function () awful.spawn("rofi -show run") end,
-              { description = "program launcher", group = "launcher" }),
-
-    -- awful.key({ modkey }, "tab", function () awful.spawn("rofi -show window") end,
-    --           { description = "show window selector", group = "launcher" }),
-
-    awful.key({ modkey }, "x",
-              function ()
-                  awful.prompt.run {
-                    prompt       = "Run Lua code: ",
-                    textbox      = awful.screen.focused().mypromptbox.widget,
-                    exe_callback = awful.util.eval,
-                    history_path = awful.util.get_cache_dir() .. "/history_eval"
-                  }
-              end,
-              {description = "lua execute prompt", group = "awesome"})
-    --]]
+    awful.key({ modkey }, "r", function () awful.spawn("rofi -show run") end, { description = "program launcher", group = "launcher" })
 )
 
 clientkeys = awful.util.table.join(
@@ -489,16 +474,17 @@ root.keys(globalkeys)
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = awful.client.focus.filter,
-                     raise = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons,
-                     screen = awful.screen.preferred,
-                     placement = awful.placement.no_overlap+awful.placement.no_offscreen,
-                     size_hints_honor = false,
-                     floating = false
+      properties = {
+         border_width = beautiful.border_width,
+         border_color = beautiful.border_normal,
+         focus = awful.client.focus.filter,
+         raise = true,
+         keys = clientkeys,
+         buttons = clientbuttons,
+         screen = awful.screen.preferred,
+         placement = awful.placement.no_overlap+awful.placement.no_offscreen,
+         size_hints_honor = false,
+         floating = false,
      }
     },
 
diff --git a/awesome/themes/kadet/theme.lua b/awesome/themes/kadet/theme.lua
index 53ff183..4bcc03c 100644
--- a/awesome/themes/kadet/theme.lua
+++ b/awesome/themes/kadet/theme.lua
@@ -213,7 +213,7 @@ local fs_widget =  wibox.container.background(wibox.container.margin(wibox.widge
 
 function theme.connect(s)
     -- Quake application
-    s.quake = lain.util.quake({ app = awful.util.terminal })
+    s.quake = lain.util.quake({ app = awful.util.terminal  })
 
     -- If wallpaper is a function, call it with the screen
     local wallpaper = theme.wallpaper