diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 327e513..9796a6c 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -343,12 +343,11 @@ function end_switcher ()
 
     -- Set the master window
     for _, c in ipairs(client.get()) do
-        awful.client.setslave(c)
         c.border_width = 0
         awful.titlebar.hide(c)
     end
 
-    awful.client.setmaster(client.focus)
+    client.focus:swap(awful.client.getmaster())
 
     -- Disable all bars
     for s in screen do
diff --git a/.config/awesome/theme.lua b/.config/awesome/theme.lua
index d45d83b..8b721c1 100644
--- a/.config/awesome/theme.lua
+++ b/.config/awesome/theme.lua
@@ -19,7 +19,7 @@ theme.bg_urgent     = "#ff0000"
 theme.bg_minimize   = "#444444"
 theme.bg_systray    = theme.bg_normal
 
-theme.fg_normal     = "#aaaaaa"
+theme.fg_normal     = "#f0f0f0"
 theme.fg_focus      = "#ffffff"
 theme.fg_urgent     = "#ffffff"
 theme.fg_minimize   = "#ffffff"