Implement custom breakpoints and some other new features from the original repo