Moved stages into block argument (former is now depcreated)
Moved stages into block argument (former is now depcreated)

- and code-layout improvements

svijee/theme-default,svijee/theme-default,svijee/theme-default,svijee/theme-default