Serious hacking and cleanups to get all keys in the right format and stored to the proper files.
Please do mind that I remove the Bullet2,etc... information now, I will dynamically add this at an later stage.
Related-To: ticket:117