Add template block configuration in theme plugin + some fixes