Ensure theme types are specified for non D.O. Build