Theme related changes are done