Fix theme parsing error
Resolved conflicts