Got main app and theme generators working again