JAL-1360 refactored for consistent lighter/darker for