set some defaults and clean up

Conflicts:

	res/values/strings.xml
	res/xml/preferences_dock.xml
	res/xml/preferences_homescreen.xml