Changed theme and formatting