Added themes and fixed status indicator persistence.