Weren't the original ones OSS?
If so, will you commit them to the CSSU?
You could also have used Advanced Clock Plugin and Advanced Power Control.