Merges theme-4.0