Several fixes for themes and boardtypes