Improve theme.html