Catbox 2.0 changes. Closes #1465