Editing indicator, themes added