Revert "Music videos in main menu, submenu, skin settings toggle, background customiser, 1 additional custom main menu entry after music videos."

This reverts commit a7891a2b7d507241e77ff208ea0a51b549e2f8c8.
Revert "Revert "Music videos in main menu, submenu, skin settings toggle, background customiser, 1 additional custom main menu entry after music videos.""

This reverts commit 2bbbb74cb3348febeed9f51a68a56d673258ee2c.
Indentation fixes