[master] added background and highlighting