refactoring: refactored functions moved into includes
refactoring: reducing amount of theme functions, functions moved into includes/