Fixed templates in DSDisplay code