Added many more features, such as custom buttons