#3 : Improve classic desktop (wip)