Switched to Gnome Preferences - restructuered Code