fix bug of data merging
theme module enhanced with locals