refactor for preparing splitting into files; start of theme;