Fix up Themes conflict