Easy to understand diagram. If you have trouble following a diagram then you are advised to try and figure out what's going on with what you have. Most rewires end up being worse than when they started. You repair one circuit at a time by figuring out what works and what doesn't. Things that don't work need power and ground. Go to that device and work back to the switch.
