First round of changes to new theme