Theme Integration with first draft of Model