diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 7f64d40..2eb4828 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -524,6 +524,7 @@ function start_switcher ()
     for _, tag in ipairs(root.tags()) do
         layout_table[tag] = tag.layout
         tag.layout = switcher_layout
+        tag.selected = true
     end
 
     -- Enable all bars
@@ -546,6 +547,9 @@ function end_switcher ()
     -- Restore layout of all tags
     for _, tag in ipairs(root.tags()) do
         tag.layout = layout_table[tag]
+        if tag ~= client.focus.first_tag then
+            tag.selected = false
+        end
     end
 
     -- Set the master window
@@ -790,6 +794,12 @@ clientkeys = gears.table.join(
               {description = "close", group = "client"}),
     awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
               {description = "toggle floating", group = "client"}),
+    awful.key({ modkey, "Control", "Shift" }, "space", function (c)  
+        c.maximized = false 
+        c.maximized_vertical = false
+        c.maximized_horizontal = false
+    end,
+              {description = "toggle floating", group = "client"}),
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
               {description = "move to master", group = "client"}),
     awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,
@@ -891,7 +901,11 @@ awful.rules.rules = {
                      keys = clientkeys,
                      buttons = clientbuttons,
                      screen = awful.screen.preferred,
-                     placement = awful.placement.no_overlap+awful.placement.no_offscreen
+                     placement = awful.placement.no_overlap+awful.placement.no_offscreen,
+                     maximized_vertical   = false,
+                     maximized_horizontal = false,
+                     floating = false,
+                     maximized = false
      }
     },