Resolved theme BUG