Fixed merge conflicts
Cleaned up/changed bundles. New color scheme
Merged upstream changes