Re-do settings dialogs with new theme

Conflicts:

	index.html
	lib/client/main.js