Adjusting preferences dialog, modified make fix-glade to replace swapped=* due to glade warnings