Update changelog, reorder themes