Improve theme design