diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua
index 9166ee2..f842be0 100644
--- a/themes/blackburn/theme.lua
+++ b/themes/blackburn/theme.lua
@@ -209,10 +209,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua
index 6192277..04864f1 100644
--- a/themes/copland/theme.lua
+++ b/themes/copland/theme.lua
@@ -293,10 +293,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/dremora/theme.lua b/themes/dremora/theme.lua
index 570a165..f412df6 100644
--- a/themes/dremora/theme.lua
+++ b/themes/dremora/theme.lua
@@ -191,10 +191,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua
index 6a6083f..7d5d2d6 100644
--- a/themes/holo/theme.lua
+++ b/themes/holo/theme.lua
@@ -290,10 +290,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua
index 68dcef2..fff376e 100644
--- a/themes/multicolor/theme.lua
+++ b/themes/multicolor/theme.lua
@@ -255,10 +255,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/powerarrow-dark/theme.lua b/themes/powerarrow-dark/theme.lua
index fe07f3e..caf18d4 100644
--- a/themes/powerarrow-dark/theme.lua
+++ b/themes/powerarrow-dark/theme.lua
@@ -249,10 +249,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/powerarrow/theme.lua b/themes/powerarrow/theme.lua
index 0519a73..433fbc5 100644
--- a/themes/powerarrow/theme.lua
+++ b/themes/powerarrow/theme.lua
@@ -286,10 +286,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua
index 1efb073..7408736 100644
--- a/themes/rainbow/theme.lua
+++ b/themes/rainbow/theme.lua
@@ -213,10 +213,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua
index c97e420..10309d5 100644
--- a/themes/steamburn/theme.lua
+++ b/themes/steamburn/theme.lua
@@ -207,10 +207,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)
diff --git a/themes/vertex/theme.lua b/themes/vertex/theme.lua
index 7b5f6dc..7a0fd40 100644
--- a/themes/vertex/theme.lua
+++ b/themes/vertex/theme.lua
@@ -387,10 +387,11 @@ function theme.at_screen_connect(s)
     s.quake = lain.util.quake({ app = awful.util.terminal, border = theme.border_width })
 
     -- If wallpaper is a function, call it with the screen
-    if type(theme.wallpaper) == "function" then
-        theme.wallpaper = theme.wallpaper(s)
+    local wallpaper = theme.wallpaper
+    if type(wallpaper) == "function" then
+        wallpaper = wallpaper(s)
     end
-    gears.wallpaper.maximized(theme.wallpaper, s, true)
+    gears.wallpaper.maximized(wallpaper, s, true)
 
     -- Tags
     awful.tag(awful.util.tagnames, s, awful.layout.layouts)