"Yes", as they say, or put otherwise, those aren't mutually exclusive. Columbus has been celebrated in a number of different ways over time, but the trends of the 20th century were driven in large part by the Italian-American, and to a lesser extent, Catholic-American communities. This older answer might be of interest with contributions from myself as well as /u/takeoffdpantsnjaket, /u/edhistory101 and /u/snapshot52 .