Further fixes to 'Theme Settings' for theme.