#2421 - Light theme updates