Conflict resolved in themes collection items

Added code for maintaining themes collection.