more changes for themes compliance