Updated themes to work with new pagination system