Rename color scheme back to wombat; remove surround plugin.