Fix based on theme check plugin results