Misc
Cleanup settings code, will apply to plugins nicely now
More of the same, now for database/add-plugin dialog
Continue previous work, more or less working; Still needs more