First version - wallpaper template implementation.
Merge remote-tracking branch 'origin/master'