templates: Cycles changed

Cycles templates rewritten
(first pull-request)