[Default skin] Next step in harmonising menu's and code clean-up. Still many more to follow.
Merge remote-tracking branch 'origin/master'