better theme and some spaces