Added many things, removed many things...., changed theme