yes u have definitly mixed the wired up ,u can locate the switch wires by using a contiuity tester,but u will need to open the ceiling rose and the switch to do this ,with the power off,connect the wires at the switch together ,then with the continuity tester probe the wires,when it makes a noise th...