more sensible theme numbering