Made UI respect Theme colors