04-service-builder - Bump up headers
10-themes-* - Add temporary title and reduce layout template headers