move templates to theme (basix) to avoid confilct on admin pages
remove whitespace
remove mapping system