diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index e1979ed..0c2bfe4 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -613,10 +613,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/rc.lua.copland b/rc.lua.copland
index dcf3db6..ba98930 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -706,10 +706,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/rc.lua.dremora b/rc.lua.dremora
index ff7daed..0a17ef4 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -642,10 +642,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/rc.lua.holo b/rc.lua.holo
index 8594453..b372f8e 100644
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -748,10 +748,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index 95c1ca1..10eeafb 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -676,10 +676,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker
index c143005..18b5593 100644
--- a/rc.lua.powerarrow-darker
+++ b/rc.lua.powerarrow-darker
@@ -665,10 +665,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 9f58f3a..c4fed85 100644
--- a/rc.lua.rainbow
+++ b/rc.lua.rainbow
@@ -611,10 +611,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/rc.lua.steamburn b/rc.lua.steamburn
index f116819..6a84208 100644
--- a/rc.lua.steamburn
+++ b/rc.lua.steamburn
@@ -620,10 +620,8 @@ end)
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
-            c.border_width = 0
             c.border_color = beautiful.border_normal
         else
-            c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
         end
     end)
diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua
index c89f643..ffd70f6 100644
--- a/themes/copland/theme.lua
+++ b/themes/copland/theme.lua
@@ -48,7 +48,7 @@ theme.disk                                      = theme.dir .. "/icons/disk.png"
 theme.ac                                        = theme.dir .. "/icons/ac.png"
 theme.bat                                       = theme.dir .. "/icons/bat.png"
 theme.bat_low                                   = theme.dir .. "/icons/bat_low.png"
-theme.bat_no                                 = theme.dir .. "/icons/bat_no.png"
+theme.bat_no                                    = theme.dir .. "/icons/bat_no.png"
 theme.play                                      = theme.dir .. "/icons/play.png"
 theme.pause                                     = theme.dir .. "/icons/pause.png"
 
@@ -92,14 +92,14 @@ theme.titlebar_maximized_button_normal_inactive = theme.dir .. "/icons/titlebar/
 theme.useless_gap_width                         = 10
 theme.layout_centerfair                         = theme.dir .. "/icons/centerfair.png"
 theme.layout_termfair                           = theme.dir .. "/icons/termfair.png"
-theme.layout_centerwork                     = theme.dir .. "/icons/centerwork.png"
+theme.layout_centerwork                         = theme.dir .. "/icons/centerwork.png"
 theme.layout_uselessfair                        = theme.dir .. "/icons/fairv.png"
 theme.layout_uselessfairh                       = theme.dir .. "/icons/fairh.png"
 theme.layout_uselessdwindle                     = theme.dir .. "/icons/dwindle.png"
 theme.layout_uselesstile                        = theme.dir .. "/icons/tile.png"
 theme.layout_uselesstiletop                     = theme.dir .. "/icons/tiletop.png"
 theme.layout_uselesstileleft                    = theme.dir .. "/icons/tileleft.png"
-theme.layout_uselesstilebottom              = theme.dir .. "/icons/tilebottom.png"
+theme.layout_uselesstilebottom                  = theme.dir .. "/icons/tilebottom.png"
 theme.layout_uselesspiral                       = theme.dir .. "/icons/spiral.png"
 
 return theme