Dark Theme refactoring.