Fix issues by theme cheker