Merged master theme