Massive update to the wip new theme