various update on theme and edit related bahavior