Added themes & fixed start screen