blacklight-inspired changes