Templates v3

@mohamedahmedawad93 @HebaElSobky please check the branch and the updates.. and review me.