Added extra theme, changed some styling gubbins