diff --git a/awesome/keys.lua b/awesome/keys.lua
index 575dfa8..7824c3d 100644
--- a/awesome/keys.lua
+++ b/awesome/keys.lua
@@ -258,13 +258,6 @@ keys.globalkeys = gears.table.join(
         {description = "-10%", group = "hotkeys"}
     ),
 
-    -- Brightness
-    awful.key({ }, "XF86MonBrightnessDown", function ()
-        awful.spawn("xbacklight -dec 15") end),
-
-    awful.key({ }, "XF86MonBrightnessUp", function ()
-        awful.spawn("xbacklight -inc 15") end),
-
     -- ALSA volume control
     awful.key({}, "XF86AudioRaiseVolume",
         function()
@@ -665,6 +658,15 @@ keys.clientkeys = gears.table.join(
             c:raise()
         end,
         {description = "(un)maximize", group = "client"}
+    ),
+
+    -- Full Screen
+    awful.key({modkey}, "F11",
+        function(c)
+            c.fullscreen = not c.fullscreen
+            c:raise()
+        end,
+        {description = "(un)fullscreen", group = "client"}
     )
 )