keep oil based with oil based, and water based with water based and you should be fine