I know this was controversial over at /r/BodyWeightFitness, but I had some good results with nick-e’s BWSF program. I did eventually need to modify it and split it up into an A/B routine because doing the full program took too long for me, but what nick-e put together is a really great resource. https://nick-e.com/bwsf/