updated with material theme