Changes to adapt theme to my tastes :-)