More theming work. NM applet settings fixed.