Cleaned up settings and templates