diff --git a/Xsession b/Xsession
index 81981c0..d64b401 100755
--- a/Xsession
+++ b/Xsession
@@ -25,8 +25,8 @@ export SSH_AUTH_SOCK
 /usr/bin/compton -b
 /usr/bin/parcellite &
 /usr/bin/dropboxd &
-/usr/bin/xscreensaver -no-splash &
-~/.config/awesome/bin/mcabber-watch-xscreensaver &
+#/usr/bin/xscreensaver -no-splash &
+#~/.config/awesome/bin/mcabber-watch-xscreensaver &
 
 # Starts polkit server
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
diff --git a/rc.lua b/rc.lua
index 39009f1..b1cdc7b 100644
--- a/rc.lua
+++ b/rc.lua
@@ -62,7 +62,7 @@ editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
 -- Lock screen command
-xlock = "xscreensaver-command -lock"
+xlock = string.format("i3lock -i %s", beautiful.lockscreen)
 
 -- Default modkey.
 -- Usually, Mod4 is the key with a logo between Control and Alt.
diff --git a/themes/gits/lockscreen1.png b/themes/gits/lockscreen1.png
new file mode 100644
index 0000000..63da063
Binary files /dev/null and b/themes/gits/lockscreen1.png differ
diff --git a/themes/gits/lockscreen2.jpg b/themes/gits/lockscreen2.jpg
new file mode 100644
index 0000000..04b6ecb
Binary files /dev/null and b/themes/gits/lockscreen2.jpg differ
diff --git a/themes/gits/lockscreen_camera.png b/themes/gits/lockscreen_camera.png
new file mode 100644
index 0000000..f4ca3b7
Binary files /dev/null and b/themes/gits/lockscreen_camera.png differ
diff --git a/themes/gits/lockscreen_default.png b/themes/gits/lockscreen_default.png
new file mode 100644
index 0000000..dfe0d1f
Binary files /dev/null and b/themes/gits/lockscreen_default.png differ
diff --git a/themes/gits/theme.lua b/themes/gits/theme.lua
index bf427a6..4975dd5 100644
--- a/themes/gits/theme.lua
+++ b/themes/gits/theme.lua
@@ -20,6 +20,9 @@ themes        = config .. "/themes"
 themename     = "/gits"
 themedir      = themes .. themename
 wallpaper    = themedir .. "/background_default.jpg"
+lockscreen   = home .. "/.lockscreen.png"
+theme.wallpaper = wallpaper
+theme.lockscreen = lockscreen
 theme.wallpaper_cmd = { "awsetbg -a " .. wallpaper }
 
 if awful.util.file_readable(config .. "/vain/init.lua") then