Theme fix and index