Merge "Polish UI and refactor theme color resources(3/N)"