I am not sure if i remember this right but if you flash with the vanilla doesn't the themes and maps get deleted too? So maybe a backup of those first would be recommended..