Update Content module, remove theme functionality from Phire, put into Content module