Updated coffee-mode