Added new rules for background and image borders