Updated theme to work with latest tools