Adding theme components
Fixed missing references to index