Fix format storing
Properly handle image mode
Add variations to images