Added sorting by theme and label