Fixes to theme specific formatting