Updating current repo with new theme changes

lots of changes here.