new old tags.. ohh google

Conflicts:

	default.xml