Bring MNF theme in line with trunk