Fix issue 57 for CP Images and select custom templates