Added theme sorting