More work on mainmenu theme