Pulled in updates to theme1 from Maged and Ahmed B