Merge "Update the dark theme and EDT description" into main