Switched themes again to better design