switch theme & initial rework