Refactor: Add new props and fix color issues, remove extra functions from list#263