merging with standard theme