Minor fixes to theme