You can replace the switches for the light and the fan and use a plug-in module for the lamp. There are quite a few options available.
I would suggest that you decide on one line of wall switches and stick with it instead of mixing different brands. This gives a uniform appearance as well as making any programming simpiler. This will be more important if you later decide to expand your X10 system to other rooms of the house.
I would recommend that you go with receivers (switches and modules) that are scene-capable. Using scenes, instead of just the individual control of each light, produces a faster, more professional looking system.
Take a look at this page:
[Link: homeautomationnet.com]My first choice for wall switches is the PCS line. Another good line is the Switchlincs which are cheaper with similar features. For the lamp module I'd recommend the LampLinc as it is the only reasonably priced module which offers scene capability.
All of the lines offer switches which will control inductive loads which is what you need for your fan. One advantage to the PCS line is that each switch can be programmed to allow dimming or not which is important for fans as some fans will buzz if you try to control their speed with an inductive dimmer. With the PCS switch you can try speed control of the fan and, if it buzzes, reprogram the switch to non-dimming mode. (The buzzing comes from the windings in the fan motor moving slightly producing the buzz and it's impossible to predict which fans will buzz and which will not)
So, my recommondation would be the following prodcuts:
2 PCSS1L/S-600 $74.95ea $149.90
1 Lamplinc LS $23.99ea $ 23.99
If you choose the Switchlinc switches instead of PCS then this:
1 2386W (light) $58.95
1 2385W (fan) $34.50
1 Lamplinc LS $23.99