I merged 'variable lines' and edited 'colors' to fix the resulting conflicts.  Travis passed the latter so I expect to merge it also.  To avoid more conflicts, you should wait to create the 'alignment' branch until 'colors' is merged and pulled into your clone.  (We should continue to keep having two pending patches for the same file rare.)

Counter-argument for menu location.  Window has 1 to n top-level window items.  Options will have just one item without Code Context.  So moving Zoom would make things more balanced.