image and theme fixes