Changed to fit square images as well and colours