Merge "Update edit mode colors" into main