*9036* Improve body IDs for theming