Add back AvalonDock

* Change to Aero theme
Rename theme