more updates to theme
updates and merge conflicts fixed