fixes for images and new feature for theme option