Improve theme dropdown