Improve theme support, fine-tune light theme