Merge "CM3: Add support for dark themes"