Improving material theme

still wip