Pushed theme functionality into the theme [tracker #1981]