Rename, re-order, merge, delete, and add new classes in DarkMark