Started working on plugins
Got main app and theme generators working again