I'm so glad you're enjoying it, thank you!
To answer your question, major arcana is correct - putting them back into the deck allows the possibility of drawing the same major arcana cards in the next act. You can actually put the minor arcana aside at the end of the act because you won't be using them anymore. Hope that helps!