Small fixes to override theme options