Changed theme and some polish