Applied a theme, and made some changes