Templates folder, new design