Rejigger template blocks