Moved CWA to the theme core