Merge theme into full