Styled knob, added steps of 6 minutes
Fixed merge (hopefully)
Actually fixed merge