Replacing Weathertron thermostat with Honeywell





I am attempting to replace our Weathertron thermostat with a Honeywell RTH3100C. We have a Trane heatpump with emergency heat system. I am having trouble with the wiring. My wires don't match the 'less common wire designations' in the manual.
I have the following wires on the Weathertron:
R-red
T-brown
O-orange
G-green
Y-yellow
X2-black
B-blue
W-white
F-Pink

Here is what I have based on the Honeywell installation guide:
E=Weathertron X2
Aux=Weathertron W
Y=Weathertron Y
G=Weathertron G
O=Weathertron O
L=Weathertron F
R=Weathertron R
B=Weathertron ? (no wire connected to B on the RTH3100C)
C=Weathertron B

I have taped over the T wire, which I think is unused on the RTH3100C.

Do I have this right?

Thanks for the help.