Fixed up some changes missed in the merge and removed the blackcoin
themeing.