port over fixes for narrative theme from welcome type