Revert to basic theme and 3.3.0 update