theme update
index handling fix