submarine themes: some cleanups