Clean up material theme
Merge pull request #27 from omihaz/Material-theme-clean-up

Material theme clean up