fixed theme review issues