[#67391550] Adds more theming and fixes menu bugs.