Light Theme refactoring.