Revert changes to s:NM, add s:NMi for inactive windows