THEME ENGINE (2/2)

Conflicts:
	res/xml/settings_headers.xml