Base files
Style updates
Style updates
Merge github.com:xzien/canary
Another update