We should probably also use `CMD_THEMES` after the change done with the Find commands