Update to new theme, lots of changes