Updated theme and rearrange items.