Some more consistency

Making sure we’ve got consistent usage between light and dark themes.