Revert b085afd, mode-line adjusted back to theme colors. Change old modeline-face aliases to the current mode-line-faces.