30 cat changes & theme and plugin resync