Refined and changed theme