Close GH-45: Fix antigen theme integration..