added support for normal and highlighted images