Converting to all toggle switches??

I tore apart the wiring under the dash today and started rewiring things. It actually was pretty easy. Seeing the back of the light switch and wiper switch definitely has convinced me to stay with the stock haha. And I know I said I'm not an electrical guy and Im not but I know at least the basics of it as far as replacing things electrically go. Enough to run a new wire harness underneathe and pull the old one out