Improved templates, thumb dir