Theme update, menu panel, additional cleanup