Brought back to a stable state - still working on cleaning up themes