Some fixes to the theme