keepin it simple
merged new styles and bug fixes
new colors