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