Should Faith or Theology be the Basis of Catechesis?

"Only when Revelation and faith are totally integrated do they, in their unity, meet all human situations and generations."