Add Theme Manager Support

Conflicts:
	config/common.mk
Derped