Update to border images, etc