Themes: Implementing NDCs

Themes: Implementing NDCs