Submarine Themes: some clean up