Added themes API
Fixed merge conflict