More tweaks

Conflicts:
	Modules/FindThea.cmake
Merging