Kits and methods that combine whitening/stain removal of teeth with remineralization are disclosed. These kits advantageously comprise separate compositions comprising a soluble calcium salt, a soluble orthophosphate salt, and a soluble peroxide, in order to optimize the stability of these components for storage and/or the activity of these components upon use. The active ingredients may also be separated in a solid composition (e.g., a powder) or in a stable dispersion comprising a non-aqueous dispersion medium.