bringing master theme branch up to date from improvements