Dash Bulbs

[raceboy]

Currently in the process of fitting a stainless dash, and while I've got it all in bits I'm thinking maybe changing the bulbs and trying to get the non-working bits to work.
All the main dash bulbs currently work but light up really dim when in the instruments, the clock bulb doesn't light at all but the bulb is fine.
Is there a straight forward 'upgrade' bulb so I can see the speedo in the dark? And a few of the warning lights appear to be duff, the handbrake light and the 'lights on' light, any idea where to get replacements of these?