Moving towards custom templates