If you wish to continue with rollover budgeting, please consider the new Savings Budget which is an updated, more-performant envelope budget. (I just switched to it personally.)
There is a migration path (in the wiki documentation) from the Envelope Budget but it is somewhat manual.