Added CMPUI_AngelWithRegenSetupCW
Some fixes
Finished refactoring