Removed useless theme stuff, painting without theme