Theme and link fixes