Decided to swap all the old bulbs with new LED lights. These things are a LOT brighter.
Getting the cluster out was a lot easier said than done. The connections are made from pretty brittle plastics and dont want to be disconnected easily. The biggest PITA was the speedo cable though, this thing was the bane of my existance for a little while.
I finally got everything pulled together just to find out that my dimmer switch is acting a but funky but I guess I can just mend that too.