Cleanup card semantics and build theme