Added new theme files
removing some merge conflicts