Port all of Desktop to rewrite format