Changes in edit repository theme, fixes #4623, etc