Merge "Theme fixit for Car Sys UI"