Theme and content fixes