BlackCoffee, initial commit based on macro-patches