Fixed several track themes to match the current API and organization changes