Rebuilt via features. Some custom code needed to over-ride a contrib module so theme added also