[WIP] [FEATURE] refactored templates