Theme review issues fixed