merge changes on OldTheme branch