nested element theme cleanup