Fix issues reported by the Theme Reviewer
Fix #90