Initial commit
fixed conflicts
changed theme name
updated default config
various fixes to get it working with the main cluster