Main and XP merge + no more MahApps + minor cleanup