Blackcoffee - try Dior's Waterproof liner in Intense Brown. It's got everything you are looking for.