UI theme refinements 1/n

Conflicts:

	res/values/themes.xml