Improve theme