Color themes, fix toolbar