First round of changes, introducing more flexibility without aglyph usage.