Layouts and colors functional, not pretty
manual merge