.... to Fog light switch red with blue stripe

Dash light-
.....with red stripe to same on Fog light switch
...... Red with green stripe to same on Fog light switch


86 to Fog light switch yellow
87 to ground

Power to distribution block-
85 to distribution block feeder
30 directly to + terminal of battery with inline 25A fuse
Marlin:
Stupid question, (but I've been writing finals all night & braindead), so:

-30, 85, 86, 87 are those terminal numbers like on a schematic?
-you reference going to colored wires on the new fog switch. Since mine came w/o pigtails I have no colors to reference. Tracking on the other switches--just have metal terminals on mine, no pigtail wires to splice off of.

I might be able to figure it out with my volt meter, you and deermagnet, and Moncha's diagram.