Changes to allow theme to be used with upgraded Alaveteli 

WIP