OXYGEN #2: Reorganized theme selection, added indexing support