Submarine themes GTK3: some cleanups