Theme and locale fixes