Merge "Add new constants for dark mode screen"