From 6e674bd7cbbcdee41d5a3a6353f3ff8b26e3b461 Mon Sep 17 00:00:00 2001
From: fredvs <fiens@hotmail.com>
Date: Sat, 21 Nov 2020 05:47:33 +0100
Subject: [PATCH]  Fixed glyph color in carbon style.(2)

---
 src/commander.mfm     |  88 +++---
 src/commander.pas     |  49 +---
 src/commander_mfm.pas | 612 +++++++++++++++++++++---------------------
 src/main.pas          |  20 +-
 src/strumpract.prj    |  90 ++++---
 5 files changed, 419 insertions(+), 440 deletions(-)

diff --git a/src/commander.mfm b/src/commander.mfm
index f157d94..e96b884 100644
--- a/src/commander.mfm
+++ b/src/commander.mfm
@@ -1701,48 +1701,6 @@ object commanderfo: tcommanderfo
       font.localprops = [flp_color, flp_height]
       onexecute = onexecbutlght
     end
-    object nameplayers2: tstringdisp
-      color = -2147483645
-      frame.localprops = []
-      frame.localprops1 = []
-      frame.template = tframecomp2
-      face.localprops = []
-      face.template = mainfo.tfaceplayerlight
-      taborder = 37
-      hint = 'Player 2'
-      bounds_x = 192
-      bounds_y = 3
-      bounds_cx = 32
-      bounds_cy = 14
-      font.color = 3881787
-      font.height = 10
-      font.name = 'stf_default'
-      font.localprops = [flp_color, flp_height]
-      textflags = [tf_xcentered, tf_ycentered]
-      value = 'Play2'
-      reffontheight = 13
-    end
-    object nameplayers: tstringdisp
-      color = -2147483645
-      frame.localprops = []
-      frame.localprops1 = []
-      frame.template = tframecomp2
-      face.localprops = []
-      face.template = mainfo.tfaceplayerlight
-      taborder = 38
-      hint = 'Player 1'
-      bounds_x = 42
-      bounds_y = 3
-      bounds_cx = 32
-      bounds_cy = 14
-      font.color = 3881787
-      font.height = 10
-      font.name = 'stf_default'
-      font.localprops = [flp_color, flp_height]
-      textflags = [tf_xcentered, tf_ycentered]
-      value = 'Play1'
-      reffontheight = 13
-    end
     object hintpanel: tgroupbox
       frame.localprops = [frl_optionsskin]
       frame.localprops1 = []
@@ -1785,8 +1743,8 @@ object commanderfo: tcommanderfo
       frame.localprops1 = []
       taborder = 29
       visible = False
-      bounds_x = -35
-      bounds_y = 40
+      bounds_x = 18
+      bounds_y = 47
       bounds_cx = 84
       bounds_cy = 83
       reffontheight = 15
@@ -2036,6 +1994,48 @@ object commanderfo: tcommanderfo
         value = True
       end
     end
+    object nameplayers: tstringdisp
+      color = -2147483645
+      frame.localprops = []
+      frame.localprops1 = []
+      frame.template = tframecomp2
+      face.localprops = []
+      face.template = mainfo.tfaceplayerlight
+      taborder = 37
+      hint = 'Player 1'
+      bounds_x = 42
+      bounds_y = 3
+      bounds_cx = 32
+      bounds_cy = 14
+      font.color = 3881787
+      font.height = 10
+      font.name = 'stf_default'
+      font.localprops = [flp_color, flp_height]
+      textflags = [tf_xcentered, tf_ycentered]
+      value = 'Play1'
+      reffontheight = 13
+    end
+    object nameplayers2: tstringdisp
+      color = -2147483645
+      frame.localprops = []
+      frame.localprops1 = []
+      frame.template = tframecomp2
+      face.localprops = []
+      face.template = mainfo.tfaceplayerlight
+      taborder = 38
+      hint = 'Player 2'
+      bounds_x = 192
+      bounds_y = 3
+      bounds_cx = 32
+      bounds_cy = 14
+      font.color = 3881787
+      font.height = 10
+      font.name = 'stf_default'
+      font.localprops = [flp_color, flp_height]
+      textflags = [tf_xcentered, tf_ycentered]
+      value = 'Play2'
+      reffontheight = 13
+    end
   end
   object tfacecomp7: tfacecomp
     template.fade_pos.count = 2
diff --git a/src/commander.pas b/src/commander.pas
index e65cdf4..0cbfaec 100644
--- a/src/commander.pas
+++ b/src/commander.pas
@@ -4,46 +4,12 @@
 interface
 
 uses
-  msetypes,
-  mseglob,
-  mseguiglob,
-  mseguiintf,
-  mseapplication,
-  msestat,
-  msemenus,
-  Math,
-  msegui,
-  msetimer,
-  msegraphics,
-  msegraphutils,
-  mseevent,
-  mseclasses,
-  mseforms,
-  msedock,
-  msedragglob,
-  msesimplewidgets,
-  msewidgets,
-  mseact,
-  msebitmap,
-  msedataedits,
-  msedatanodes,
-  mseedit,
-  msefiledialogx,
-  msegrids,
-  mseificomp,
-  mseificompglob,
-  mseifiglob,
-  mselistbrowser,
-  msestatfile,
-  msestream,
-  msestrings,
-  msesys,
-  SysUtils,
-  msegraphedits,
-  msescrollbar,
-  msedispwidgets,
-  mserichstring,
-  mseimage;
+ msetypes,mseglob,mseguiglob,mseguiintf,mseapplication,msestat,msemenus,Math,
+ msegui,msetimer,msegraphics,msegraphutils,mseevent,mseclasses,mseforms,msedock,
+ msedragglob,msesimplewidgets,msewidgets,mseact,msebitmap,msedataedits,
+ msedatanodes,mseedit,msefiledialogx,msegrids,mseificomp,mseificompglob,
+ mseifiglob,mselistbrowser,msestatfile,msestream,msestrings,msesys,SysUtils,
+ msegraphedits,msescrollbar,msedispwidgets,mserichstring,mseimage;
 
 type
   tcommanderfo = class(tdockform)
@@ -131,6 +97,9 @@   tcommanderfo = class(tdockform)
     tfacegreen: tfacecomp;
     tfacegreendark: tfacecomp;
     ttimer1: ttimer;
+   nameplayers: tstringdisp;
+   nameplayers2: tstringdisp;
+   namegen: tstringdisp;
     procedure formcreated(const Sender: TObject);
     procedure visiblechangeev(const Sender: TObject);
     procedure onplay(const Sender: TObject);
diff --git a/src/commander_mfm.pas b/src/commander_mfm.pas
index 2fc5679..5046d7f 100644
--- a/src/commander_mfm.pas
+++ b/src/commander_mfm.pas
@@ -2244,95 +2244,178 @@ implementation
   101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,108,112,114,111,
   112,115,11,9,102,108,112,95,99,111,108,111,114,10,102,108,112,95,104,101,
   105,103,104,116,0,9,111,110,101,120,101,99,117,116,101,7,13,111,110,101,
-  120,101,99,98,117,116,108,103,104,116,0,0,11,116,115,116,114,105,110,103,
-  100,105,115,112,12,110,97,109,101,112,108,97,121,101,114,115,50,5,99,111,
-  108,111,114,4,3,0,0,128,16,102,114,97,109,101,46,108,111,99,97,108,
-  112,114,111,112,115,11,0,17,102,114,97,109,101,46,108,111,99,97,108,112,
+  120,101,99,98,117,116,108,103,104,116,0,0,9,116,103,114,111,117,112,98,
+  111,120,9,104,105,110,116,112,97,110,101,108,16,102,114,97,109,101,46,108,
+  111,99,97,108,112,114,111,112,115,11,15,102,114,108,95,111,112,116,105,111,
+  110,115,115,107,105,110,0,17,102,114,97,109,101,46,108,111,99,97,108,112,
   114,111,112,115,49,11,0,14,102,114,97,109,101,46,116,101,109,112,108,97,
   116,101,7,11,116,102,114,97,109,101,99,111,109,112,50,15,102,97,99,101,
   46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,116,
-  101,109,112,108,97,116,101,7,23,109,97,105,110,102,111,46,116,102,97,99,
-  101,112,108,97,121,101,114,108,105,103,104,116,8,116,97,98,111,114,100,101,
-  114,2,37,4,104,105,110,116,6,8,80,108,97,121,101,114,32,50,8,98,
-  111,117,110,100,115,95,120,3,192,0,8,98,111,117,110,100,115,95,121,2,
-  3,9,98,111,117,110,100,115,95,99,120,2,32,9,98,111,117,110,100,115,
-  95,99,121,2,14,10,102,111,110,116,46,99,111,108,111,114,4,59,59,59,
-  0,11,102,111,110,116,46,104,101,105,103,104,116,2,10,9,102,111,110,116,
-  46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,15,102,
+  101,109,112,108,97,116,101,7,18,109,97,105,110,102,111,46,116,102,97,99,
+  101,111,114,97,110,103,101,8,116,97,98,111,114,100,101,114,2,20,7,118,
+  105,115,105,98,108,101,8,8,98,111,117,110,100,115,95,120,2,33,8,98,
+  111,117,110,100,115,95,121,2,49,9,98,111,117,110,100,115,95,99,120,3,
+  221,0,9,98,111,117,110,100,115,95,99,121,2,36,9,102,111,110,116,46,
+  110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,15,102,111,
+  110,116,46,108,111,99,97,108,112,114,111,112,115,11,0,0,6,116,108,97,
+  98,101,108,9,104,105,110,116,108,97,98,101,108,8,98,111,117,110,100,115,
+  95,120,2,26,8,98,111,117,110,100,115,95,121,2,1,9,98,111,117,110,
+  100,115,95,99,120,3,169,0,9,98,111,117,110,100,115,95,99,121,2,15,
+  7,99,97,112,116,105,111,110,6,29,73,110,118,97,108,105,100,32,118,97,
+  108,117,101,46,32,32,82,101,115,101,116,32,116,111,32,49,48,48,46,9,
+  102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,
+  108,116,15,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,0,
+  9,116,101,120,116,102,108,97,103,115,11,12,116,102,95,120,99,101,110,116,
+  101,114,101,100,12,116,102,95,121,99,101,110,116,101,114,101,100,0,13,114,
+  101,102,102,111,110,116,104,101,105,103,104,116,2,15,0,0,6,116,108,97,
+  98,101,108,10,104,105,110,116,108,97,98,101,108,50,8,116,97,98,111,114,
+  100,101,114,2,1,8,98,111,117,110,100,115,95,120,2,3,8,98,111,117,
+  110,100,115,95,121,2,17,9,98,111,117,110,100,115,95,99,120,3,215,0,
+  9,98,111,117,110,100,115,95,99,121,2,15,7,99,97,112,116,105,111,110,
+  6,36,79,114,32,112,114,101,115,115,32,69,115,99,32,107,101,121,32,102,
+  111,114,32,112,114,101,118,105,111,117,115,32,118,97,108,117,101,46,9,102,
+  111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,
+  116,15,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,0,13,
+  114,101,102,102,111,110,116,104,101,105,103,104,116,2,15,0,0,0,11,116,
+  115,116,114,105,110,103,100,105,115,112,12,116,115,116,114,105,110,103,100,105,
+  115,112,49,16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,
+  11,0,17,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,
+  11,0,8,116,97,98,111,114,100,101,114,2,29,7,118,105,115,105,98,108,
+  101,8,8,98,111,117,110,100,115,95,120,2,18,8,98,111,117,110,100,115,
+  95,121,2,47,9,98,111,117,110,100,115,95,99,120,2,84,9,98,111,117,
+  110,100,115,95,99,121,2,83,13,114,101,102,102,111,110,116,104,101,105,103,
+  104,116,2,15,0,12,116,98,111,111,108,101,97,110,101,100,105,116,9,100,
+  105,114,101,99,116,109,105,120,5,99,111,108,111,114,4,3,0,0,128,17,
+  102,114,97,109,101,46,104,105,100,100,101,110,101,100,103,101,115,11,9,101,
+  100,103,95,114,105,103,104,116,7,101,100,103,95,116,111,112,8,101,100,103,
+  95,108,101,102,116,10,101,100,103,95,98,111,116,116,111,109,0,17,102,114,
+  97,109,101,46,99,111,108,111,114,99,108,105,101,110,116,4,230,255,252,0,
+  13,102,114,97,109,101,46,99,97,112,116,105,111,110,6,2,48,115,16,102,
+  114,97,109,101,46,99,97,112,116,105,111,110,112,111,115,7,6,99,112,95,
+  116,111,112,17,102,114,97,109,101,46,99,97,112,116,105,111,110,100,105,115,
+  116,2,0,16,102,114,97,109,101,46,102,111,110,116,46,99,111,108,111,114,
+  4,61,61,61,0,17,102,114,97,109,101,46,102,111,110,116,46,104,101,105,
+  103,104,116,2,10,15,102,114,97,109,101,46,102,111,110,116,46,110,97,109,
+  101,6,11,115,116,102,95,100,101,102,97,117,108,116,21,102,114,97,109,101,
+  46,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,9,102,108,
+  112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,116,0,16,
+  102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,102,114,
+  108,95,104,105,100,100,101,110,101,100,103,101,115,15,102,114,108,95,99,111,
+  108,111,114,99,108,105,101,110,116,0,17,102,114,97,109,101,46,108,111,99,
+  97,108,112,114,111,112,115,49,11,16,102,114,108,49,95,99,97,112,116,105,
+  111,110,100,105,115,116,0,16,102,114,97,109,101,46,111,117,116,101,114,102,
+  114,97,109,101,1,2,0,2,15,2,0,2,0,0,15,102,97,99,101,46,
+  108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,116,101,
+  109,112,108,97,116,101,7,23,109,97,105,110,102,111,46,116,102,97,99,101,
+  112,108,97,121,101,114,108,105,103,104,116,4,104,105,110,116,6,28,32,68,
+  105,114,101,99,116,32,77,73,88,32,40,48,32,115,101,99,111,110,100,32,
+  116,105,109,101,41,32,8,98,111,117,110,100,115,95,120,2,35,8,98,111,
+  117,110,100,115,95,121,2,41,9,98,111,117,110,100,115,95,99,121,2,26,
+  8,115,116,97,116,102,105,108,101,7,17,109,97,105,110,102,111,46,116,115,
+  116,97,116,102,105,108,101,49,8,111,110,99,104,97,110,103,101,7,17,111,
+  110,99,104,97,110,103,101,100,105,114,101,99,116,109,105,120,10,99,111,108,
+  111,114,103,108,121,112,104,4,74,74,74,0,0,0,12,116,98,111,111,108,
+  101,97,110,101,100,105,116,4,118,117,105,110,5,99,111,108,111,114,4,3,
+  0,0,128,17,102,114,97,109,101,46,104,105,100,100,101,110,101,100,103,101,
+  115,11,9,101,100,103,95,114,105,103,104,116,7,101,100,103,95,116,111,112,
+  8,101,100,103,95,108,101,102,116,10,101,100,103,95,98,111,116,116,111,109,
+  0,17,102,114,97,109,101,46,99,111,108,111,114,99,108,105,101,110,116,4,
+  230,255,252,0,13,102,114,97,109,101,46,99,97,112,116,105,111,110,6,2,
+  86,85,16,102,114,97,109,101,46,99,97,112,116,105,111,110,112,111,115,7,
+  7,99,112,95,108,101,102,116,17,102,114,97,109,101,46,99,97,112,116,105,
+  111,110,100,105,115,116,2,3,16,102,114,97,109,101,46,102,111,110,116,46,
+  99,111,108,111,114,4,61,61,61,0,17,102,114,97,109,101,46,102,111,110,
+  116,46,104,101,105,103,104,116,2,10,15,102,114,97,109,101,46,102,111,110,
+  116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,21,
+  102,114,97,109,101,46,102,111,110,116,46,108,111,99,97,108,112,114,111,112,
+  115,11,9,102,108,112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,
+  103,104,116,0,16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,
+  115,11,15,102,114,108,95,104,105,100,100,101,110,101,100,103,101,115,15,102,
+  114,108,95,99,111,108,111,114,99,108,105,101,110,116,0,17,102,114,97,109,
+  101,46,108,111,99,97,108,112,114,111,112,115,49,11,16,102,114,108,49,95,
+  99,97,112,116,105,111,110,100,105,115,116,0,16,102,114,97,109,101,46,111,
+  117,116,101,114,102,114,97,109,101,1,2,19,2,2,2,0,2,2,0,15,
+  102,97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,
+  99,101,46,116,101,109,112,108,97,116,101,7,23,109,97,105,110,102,111,46,
+  116,102,97,99,101,112,108,97,121,101,114,108,105,103,104,116,8,116,97,98,
+  111,114,100,101,114,2,1,4,104,105,110,116,6,20,32,86,105,101,119,32,
+  77,101,116,101,114,115,32,111,110,47,111,102,102,32,8,98,111,117,110,100,
+  115,95,120,2,42,8,98,111,117,110,100,115,95,121,2,33,9,98,111,117,
+  110,100,115,95,99,120,2,32,9,98,111,117,110,100,115,95,99,121,2,15,
+  8,115,116,97,116,102,105,108,101,7,17,109,97,105,110,102,111,46,116,115,
+  116,97,116,102,105,108,101,49,8,111,110,99,104,97,110,103,101,7,13,111,
+  110,99,104,97,110,103,101,118,117,115,101,116,10,99,111,108,111,114,103,108,
+  121,112,104,4,74,74,74,0,10,111,110,115,101,116,118,97,108,117,101,7,
+  7,111,110,115,101,116,118,117,0,0,12,116,98,111,111,108,101,97,110,101,
+  100,105,116,7,97,117,116,111,109,105,120,5,99,111,108,111,114,4,3,0,
+  0,128,17,102,114,97,109,101,46,104,105,100,100,101,110,101,100,103,101,115,
+  11,9,101,100,103,95,114,105,103,104,116,7,101,100,103,95,116,111,112,8,
+  101,100,103,95,108,101,102,116,10,101,100,103,95,98,111,116,116,111,109,0,
+  17,102,114,97,109,101,46,99,111,108,111,114,99,108,105,101,110,116,4,230,
+  255,252,0,13,102,114,97,109,101,46,99,97,112,116,105,111,110,6,2,65,
+  77,17,102,114,97,109,101,46,99,97,112,116,105,111,110,100,105,115,116,2,
+  3,16,102,114,97,109,101,46,102,111,110,116,46,99,111,108,111,114,4,61,
+  61,61,0,17,102,114,97,109,101,46,102,111,110,116,46,104,101,105,103,104,
+  116,2,10,15,102,114,97,109,101,46,102,111,110,116,46,110,97,109,101,6,
+  11,115,116,102,95,100,101,102,97,117,108,116,21,102,114,97,109,101,46,102,
   111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,9,102,108,112,95,
-  99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,116,0,9,116,101,
-  120,116,102,108,97,103,115,11,12,116,102,95,120,99,101,110,116,101,114,101,
-  100,12,116,102,95,121,99,101,110,116,101,114,101,100,0,5,118,97,108,117,
-  101,6,5,80,108,97,121,50,13,114,101,102,102,111,110,116,104,101,105,103,
-  104,116,2,13,0,0,11,116,115,116,114,105,110,103,100,105,115,112,11,110,
-  97,109,101,112,108,97,121,101,114,115,5,99,111,108,111,114,4,3,0,0,
-  128,16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,0,
-  17,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,11,0,
-  14,102,114,97,109,101,46,116,101,109,112,108,97,116,101,7,11,116,102,114,
-  97,109,101,99,111,109,112,50,15,102,97,99,101,46,108,111,99,97,108,112,
-  114,111,112,115,11,0,13,102,97,99,101,46,116,101,109,112,108,97,116,101,
-  7,23,109,97,105,110,102,111,46,116,102,97,99,101,112,108,97,121,101,114,
-  108,105,103,104,116,8,116,97,98,111,114,100,101,114,2,38,4,104,105,110,
-  116,6,8,80,108,97,121,101,114,32,49,8,98,111,117,110,100,115,95,120,
-  2,42,8,98,111,117,110,100,115,95,121,2,3,9,98,111,117,110,100,115,
-  95,99,120,2,32,9,98,111,117,110,100,115,95,99,121,2,14,10,102,111,
-  110,116,46,99,111,108,111,114,4,59,59,59,0,11,102,111,110,116,46,104,
-  101,105,103,104,116,2,10,9,102,111,110,116,46,110,97,109,101,6,11,115,
-  116,102,95,100,101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,
-  108,112,114,111,112,115,11,9,102,108,112,95,99,111,108,111,114,10,102,108,
-  112,95,104,101,105,103,104,116,0,9,116,101,120,116,102,108,97,103,115,11,
-  12,116,102,95,120,99,101,110,116,101,114,101,100,12,116,102,95,121,99,101,
-  110,116,101,114,101,100,0,5,118,97,108,117,101,6,5,80,108,97,121,49,
-  13,114,101,102,102,111,110,116,104,101,105,103,104,116,2,13,0,0,9,116,
-  103,114,111,117,112,98,111,120,9,104,105,110,116,112,97,110,101,108,16,102,
-  114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,102,114,108,
-  95,111,112,116,105,111,110,115,115,107,105,110,0,17,102,114,97,109,101,46,
-  108,111,99,97,108,112,114,111,112,115,49,11,0,14,102,114,97,109,101,46,
-  116,101,109,112,108,97,116,101,7,11,116,102,114,97,109,101,99,111,109,112,
-  50,15,102,97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,
-  102,97,99,101,46,116,101,109,112,108,97,116,101,7,18,109,97,105,110,102,
-  111,46,116,102,97,99,101,111,114,97,110,103,101,8,116,97,98,111,114,100,
-  101,114,2,20,7,118,105,115,105,98,108,101,8,8,98,111,117,110,100,115,
-  95,120,2,33,8,98,111,117,110,100,115,95,121,2,49,9,98,111,117,110,
-  100,115,95,99,120,3,221,0,9,98,111,117,110,100,115,95,99,121,2,36,
-  9,102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,
-  117,108,116,15,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,
-  0,0,6,116,108,97,98,101,108,9,104,105,110,116,108,97,98,101,108,8,
-  98,111,117,110,100,115,95,120,2,26,8,98,111,117,110,100,115,95,121,2,
-  1,9,98,111,117,110,100,115,95,99,120,3,169,0,9,98,111,117,110,100,
-  115,95,99,121,2,15,7,99,97,112,116,105,111,110,6,29,73,110,118,97,
-  108,105,100,32,118,97,108,117,101,46,32,32,82,101,115,101,116,32,116,111,
-  32,49,48,48,46,9,102,111,110,116,46,110,97,109,101,6,11,115,116,102,
-  95,100,101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,108,112,
-  114,111,112,115,11,0,9,116,101,120,116,102,108,97,103,115,11,12,116,102,
-  95,120,99,101,110,116,101,114,101,100,12,116,102,95,121,99,101,110,116,101,
-  114,101,100,0,13,114,101,102,102,111,110,116,104,101,105,103,104,116,2,15,
-  0,0,6,116,108,97,98,101,108,10,104,105,110,116,108,97,98,101,108,50,
-  8,116,97,98,111,114,100,101,114,2,1,8,98,111,117,110,100,115,95,120,
-  2,3,8,98,111,117,110,100,115,95,121,2,17,9,98,111,117,110,100,115,
-  95,99,120,3,215,0,9,98,111,117,110,100,115,95,99,121,2,15,7,99,
-  97,112,116,105,111,110,6,36,79,114,32,112,114,101,115,115,32,69,115,99,
-  32,107,101,121,32,102,111,114,32,112,114,101,118,105,111,117,115,32,118,97,
-  108,117,101,46,9,102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,
-  100,101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,108,112,114,
-  111,112,115,11,0,13,114,101,102,102,111,110,116,104,101,105,103,104,116,2,
-  15,0,0,0,11,116,115,116,114,105,110,103,100,105,115,112,12,116,115,116,
-  114,105,110,103,100,105,115,112,49,16,102,114,97,109,101,46,108,111,99,97,
-  108,112,114,111,112,115,11,0,17,102,114,97,109,101,46,108,111,99,97,108,
-  112,114,111,112,115,49,11,0,8,116,97,98,111,114,100,101,114,2,29,7,
-  118,105,115,105,98,108,101,8,8,98,111,117,110,100,115,95,120,2,221,8,
-  98,111,117,110,100,115,95,121,2,40,9,98,111,117,110,100,115,95,99,120,
-  2,84,9,98,111,117,110,100,115,95,99,121,2,83,13,114,101,102,102,111,
-  110,116,104,101,105,103,104,116,2,15,0,12,116,98,111,111,108,101,97,110,
-  101,100,105,116,9,100,105,114,101,99,116,109,105,120,5,99,111,108,111,114,
-  4,3,0,0,128,17,102,114,97,109,101,46,104,105,100,100,101,110,101,100,
-  103,101,115,11,9,101,100,103,95,114,105,103,104,116,7,101,100,103,95,116,
-  111,112,8,101,100,103,95,108,101,102,116,10,101,100,103,95,98,111,116,116,
-  111,109,0,17,102,114,97,109,101,46,99,111,108,111,114,99,108,105,101,110,
-  116,4,230,255,252,0,13,102,114,97,109,101,46,99,97,112,116,105,111,110,
-  6,2,48,115,16,102,114,97,109,101,46,99,97,112,116,105,111,110,112,111,
-  115,7,6,99,112,95,116,111,112,17,102,114,97,109,101,46,99,97,112,116,
-  105,111,110,100,105,115,116,2,0,16,102,114,97,109,101,46,102,111,110,116,
+  99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,116,0,16,102,114,
+  97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,102,114,108,95,
+  104,105,100,100,101,110,101,100,103,101,115,15,102,114,108,95,99,111,108,111,
+  114,99,108,105,101,110,116,0,17,102,114,97,109,101,46,108,111,99,97,108,
+  112,114,111,112,115,49,11,16,102,114,108,49,95,99,97,112,116,105,111,110,
+  100,105,115,116,0,16,102,114,97,109,101,46,111,117,116,101,114,102,114,97,
+  109,101,1,2,0,2,1,2,21,2,2,0,15,102,97,99,101,46,108,111,
+  99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,116,101,109,112,
+  108,97,116,101,7,23,109,97,105,110,102,111,46,116,102,97,99,101,112,108,
+  97,121,101,114,108,105,103,104,116,8,116,97,98,111,114,100,101,114,2,2,
+  4,104,105,110,116,6,20,32,65,117,116,111,32,77,105,120,105,110,103,32,
+  111,110,47,111,102,102,32,8,98,111,117,110,100,115,95,120,2,9,8,98,
+  111,117,110,100,115,95,121,2,31,9,98,111,117,110,100,115,95,99,120,2,
+  34,9,98,111,117,110,100,115,95,99,121,2,15,8,115,116,97,116,102,105,
+  108,101,7,17,109,97,105,110,102,111,46,116,115,116,97,116,102,105,108,101,
+  49,10,99,111,108,111,114,103,108,121,112,104,4,74,74,74,0,5,118,97,
+  108,117,101,9,12,118,97,108,117,101,100,101,102,97,117,108,116,9,0,0,
+  12,116,98,111,111,108,101,97,110,101,100,105,116,8,115,112,101,99,99,97,
+  108,99,5,99,111,108,111,114,4,3,0,0,128,17,102,114,97,109,101,46,
+  104,105,100,100,101,110,101,100,103,101,115,11,9,101,100,103,95,114,105,103,
+  104,116,7,101,100,103,95,116,111,112,8,101,100,103,95,108,101,102,116,10,
+  101,100,103,95,98,111,116,116,111,109,0,17,102,114,97,109,101,46,99,111,
+  108,111,114,99,108,105,101,110,116,4,230,255,252,0,13,102,114,97,109,101,
+  46,99,97,112,116,105,111,110,6,2,83,67,16,102,114,97,109,101,46,99,
+  97,112,116,105,111,110,112,111,115,7,7,99,112,95,108,101,102,116,17,102,
+  114,97,109,101,46,99,97,112,116,105,111,110,100,105,115,116,2,3,16,102,
+  114,97,109,101,46,102,111,110,116,46,99,111,108,111,114,4,61,61,61,0,
+  17,102,114,97,109,101,46,102,111,110,116,46,104,101,105,103,104,116,2,10,
+  15,102,114,97,109,101,46,102,111,110,116,46,110,97,109,101,6,11,115,116,
+  102,95,100,101,102,97,117,108,116,21,102,114,97,109,101,46,102,111,110,116,
+  46,108,111,99,97,108,112,114,111,112,115,11,9,102,108,112,95,99,111,108,
+  111,114,10,102,108,112,95,104,101,105,103,104,116,0,16,102,114,97,109,101,
+  46,108,111,99,97,108,112,114,111,112,115,11,15,102,114,108,95,104,105,100,
+  100,101,110,101,100,103,101,115,15,102,114,108,95,99,111,108,111,114,99,108,
+  105,101,110,116,0,17,102,114,97,109,101,46,108,111,99,97,108,112,114,111,
+  112,115,49,11,16,102,114,108,49,95,99,97,112,116,105,111,110,100,105,115,
+  116,0,16,102,114,97,109,101,46,111,117,116,101,114,102,114,97,109,101,1,
+  2,18,2,1,2,0,2,2,0,15,102,97,99,101,46,108,111,99,97,108,
+  112,114,111,112,115,11,0,13,102,97,99,101,46,116,101,109,112,108,97,116,
+  101,7,23,109,97,105,110,102,111,46,116,102,97,99,101,112,108,97,121,101,
+  114,108,105,103,104,116,8,116,97,98,111,114,100,101,114,2,3,4,104,105,
+  110,116,6,41,32,69,110,97,98,108,101,32,83,112,101,99,116,114,117,109,
+  32,70,114,101,113,117,101,110,99,105,101,115,32,67,97,108,99,117,108,97,
+  116,105,111,110,32,8,98,111,117,110,100,115,95,120,2,43,8,98,111,117,
+  110,100,115,95,121,2,17,9,98,111,117,110,100,115,95,99,120,2,31,9,
+  98,111,117,110,100,115,95,99,121,2,15,8,115,116,97,116,102,105,108,101,
+  7,17,109,97,105,110,102,111,46,116,115,116,97,116,102,105,108,101,49,10,
+  99,111,108,111,114,103,108,121,112,104,4,74,74,74,0,5,118,97,108,117,
+  101,9,12,118,97,108,117,101,100,101,102,97,117,108,116,9,0,0,12,116,
+  98,111,111,108,101,97,110,101,100,105,116,6,103,117,105,109,105,120,5,99,
+  111,108,111,114,4,3,0,0,128,17,102,114,97,109,101,46,104,105,100,100,
+  101,110,101,100,103,101,115,11,9,101,100,103,95,114,105,103,104,116,7,101,
+  100,103,95,116,111,112,8,101,100,103,95,108,101,102,116,10,101,100,103,95,
+  98,111,116,116,111,109,0,17,102,114,97,109,101,46,99,111,108,111,114,99,
+  108,105,101,110,116,4,230,255,252,0,13,102,114,97,109,101,46,99,97,112,
+  116,105,111,110,6,3,71,77,32,17,102,114,97,109,101,46,99,97,112,116,
+  105,111,110,100,105,115,116,2,2,16,102,114,97,109,101,46,102,111,110,116,
   46,99,111,108,111,114,4,61,61,61,0,17,102,114,97,109,101,46,102,111,
   110,116,46,104,101,105,103,104,116,2,10,15,102,114,97,109,101,46,102,111,
   110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,
@@ -2343,233 +2426,150 @@ implementation
   102,114,108,95,99,111,108,111,114,99,108,105,101,110,116,0,17,102,114,97,
   109,101,46,108,111,99,97,108,112,114,111,112,115,49,11,16,102,114,108,49,
   95,99,97,112,116,105,111,110,100,105,115,116,0,16,102,114,97,109,101,46,
-  111,117,116,101,114,102,114,97,109,101,1,2,0,2,15,2,0,2,0,0,
+  111,117,116,101,114,102,114,97,109,101,1,2,0,2,2,2,24,2,2,0,
   15,102,97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,
   97,99,101,46,116,101,109,112,108,97,116,101,7,23,109,97,105,110,102,111,
-  46,116,102,97,99,101,112,108,97,121,101,114,108,105,103,104,116,4,104,105,
-  110,116,6,28,32,68,105,114,101,99,116,32,77,73,88,32,40,48,32,115,
-  101,99,111,110,100,32,116,105,109,101,41,32,8,98,111,117,110,100,115,95,
-  120,2,35,8,98,111,117,110,100,115,95,121,2,41,9,98,111,117,110,100,
-  115,95,99,121,2,26,8,115,116,97,116,102,105,108,101,7,17,109,97,105,
-  110,102,111,46,116,115,116,97,116,102,105,108,101,49,8,111,110,99,104,97,
-  110,103,101,7,17,111,110,99,104,97,110,103,101,100,105,114,101,99,116,109,
-  105,120,10,99,111,108,111,114,103,108,121,112,104,4,74,74,74,0,0,0,
-  12,116,98,111,111,108,101,97,110,101,100,105,116,4,118,117,105,110,5,99,
-  111,108,111,114,4,3,0,0,128,17,102,114,97,109,101,46,104,105,100,100,
-  101,110,101,100,103,101,115,11,9,101,100,103,95,114,105,103,104,116,7,101,
-  100,103,95,116,111,112,8,101,100,103,95,108,101,102,116,10,101,100,103,95,
-  98,111,116,116,111,109,0,17,102,114,97,109,101,46,99,111,108,111,114,99,
-  108,105,101,110,116,4,230,255,252,0,13,102,114,97,109,101,46,99,97,112,
-  116,105,111,110,6,2,86,85,16,102,114,97,109,101,46,99,97,112,116,105,
-  111,110,112,111,115,7,7,99,112,95,108,101,102,116,17,102,114,97,109,101,
-  46,99,97,112,116,105,111,110,100,105,115,116,2,3,16,102,114,97,109,101,
-  46,102,111,110,116,46,99,111,108,111,114,4,61,61,61,0,17,102,114,97,
-  109,101,46,102,111,110,116,46,104,101,105,103,104,116,2,10,15,102,114,97,
-  109,101,46,102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,
-  102,97,117,108,116,21,102,114,97,109,101,46,102,111,110,116,46,108,111,99,
-  97,108,112,114,111,112,115,11,9,102,108,112,95,99,111,108,111,114,10,102,
-  108,112,95,104,101,105,103,104,116,0,16,102,114,97,109,101,46,108,111,99,
-  97,108,112,114,111,112,115,11,15,102,114,108,95,104,105,100,100,101,110,101,
-  100,103,101,115,15,102,114,108,95,99,111,108,111,114,99,108,105,101,110,116,
-  0,17,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,11,
-  16,102,114,108,49,95,99,97,112,116,105,111,110,100,105,115,116,0,16,102,
-  114,97,109,101,46,111,117,116,101,114,102,114,97,109,101,1,2,19,2,2,
-  2,0,2,2,0,15,102,97,99,101,46,108,111,99,97,108,112,114,111,112,
-  115,11,0,13,102,97,99,101,46,116,101,109,112,108,97,116,101,7,23,109,
-  97,105,110,102,111,46,116,102,97,99,101,112,108,97,121,101,114,108,105,103,
-  104,116,8,116,97,98,111,114,100,101,114,2,1,4,104,105,110,116,6,20,
-  32,86,105,101,119,32,77,101,116,101,114,115,32,111,110,47,111,102,102,32,
-  8,98,111,117,110,100,115,95,120,2,42,8,98,111,117,110,100,115,95,121,
-  2,33,9,98,111,117,110,100,115,95,99,120,2,32,9,98,111,117,110,100,
-  115,95,99,121,2,15,8,115,116,97,116,102,105,108,101,7,17,109,97,105,
-  110,102,111,46,116,115,116,97,116,102,105,108,101,49,8,111,110,99,104,97,
-  110,103,101,7,13,111,110,99,104,97,110,103,101,118,117,115,101,116,10,99,
-  111,108,111,114,103,108,121,112,104,4,74,74,74,0,10,111,110,115,101,116,
-  118,97,108,117,101,7,7,111,110,115,101,116,118,117,0,0,12,116,98,111,
-  111,108,101,97,110,101,100,105,116,7,97,117,116,111,109,105,120,5,99,111,
-  108,111,114,4,3,0,0,128,17,102,114,97,109,101,46,104,105,100,100,101,
-  110,101,100,103,101,115,11,9,101,100,103,95,114,105,103,104,116,7,101,100,
-  103,95,116,111,112,8,101,100,103,95,108,101,102,116,10,101,100,103,95,98,
-  111,116,116,111,109,0,17,102,114,97,109,101,46,99,111,108,111,114,99,108,
-  105,101,110,116,4,230,255,252,0,13,102,114,97,109,101,46,99,97,112,116,
-  105,111,110,6,2,65,77,17,102,114,97,109,101,46,99,97,112,116,105,111,
-  110,100,105,115,116,2,3,16,102,114,97,109,101,46,102,111,110,116,46,99,
-  111,108,111,114,4,61,61,61,0,17,102,114,97,109,101,46,102,111,110,116,
-  46,104,101,105,103,104,116,2,10,15,102,114,97,109,101,46,102,111,110,116,
-  46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,21,102,
-  114,97,109,101,46,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,
-  11,9,102,108,112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,103,
-  104,116,0,16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,
-  11,15,102,114,108,95,104,105,100,100,101,110,101,100,103,101,115,15,102,114,
-  108,95,99,111,108,111,114,99,108,105,101,110,116,0,17,102,114,97,109,101,
-  46,108,111,99,97,108,112,114,111,112,115,49,11,16,102,114,108,49,95,99,
-  97,112,116,105,111,110,100,105,115,116,0,16,102,114,97,109,101,46,111,117,
-  116,101,114,102,114,97,109,101,1,2,0,2,1,2,21,2,2,0,15,102,
-  97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,
-  101,46,116,101,109,112,108,97,116,101,7,23,109,97,105,110,102,111,46,116,
-  102,97,99,101,112,108,97,121,101,114,108,105,103,104,116,8,116,97,98,111,
-  114,100,101,114,2,2,4,104,105,110,116,6,20,32,65,117,116,111,32,77,
-  105,120,105,110,103,32,111,110,47,111,102,102,32,8,98,111,117,110,100,115,
-  95,120,2,9,8,98,111,117,110,100,115,95,121,2,31,9,98,111,117,110,
-  100,115,95,99,120,2,34,9,98,111,117,110,100,115,95,99,121,2,15,8,
-  115,116,97,116,102,105,108,101,7,17,109,97,105,110,102,111,46,116,115,116,
-  97,116,102,105,108,101,49,10,99,111,108,111,114,103,108,121,112,104,4,74,
-  74,74,0,5,118,97,108,117,101,9,12,118,97,108,117,101,100,101,102,97,
-  117,108,116,9,0,0,12,116,98,111,111,108,101,97,110,101,100,105,116,8,
-  115,112,101,99,99,97,108,99,5,99,111,108,111,114,4,3,0,0,128,17,
-  102,114,97,109,101,46,104,105,100,100,101,110,101,100,103,101,115,11,9,101,
-  100,103,95,114,105,103,104,116,7,101,100,103,95,116,111,112,8,101,100,103,
-  95,108,101,102,116,10,101,100,103,95,98,111,116,116,111,109,0,17,102,114,
-  97,109,101,46,99,111,108,111,114,99,108,105,101,110,116,4,230,255,252,0,
-  13,102,114,97,109,101,46,99,97,112,116,105,111,110,6,2,83,67,16,102,
-  114,97,109,101,46,99,97,112,116,105,111,110,112,111,115,7,7,99,112,95,
-  108,101,102,116,17,102,114,97,109,101,46,99,97,112,116,105,111,110,100,105,
-  115,116,2,3,16,102,114,97,109,101,46,102,111,110,116,46,99,111,108,111,
-  114,4,61,61,61,0,17,102,114,97,109,101,46,102,111,110,116,46,104,101,
-  105,103,104,116,2,10,15,102,114,97,109,101,46,102,111,110,116,46,110,97,
-  109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,21,102,114,97,109,
-  101,46,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,9,102,
-  108,112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,116,0,
-  16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,102,
-  114,108,95,104,105,100,100,101,110,101,100,103,101,115,15,102,114,108,95,99,
-  111,108,111,114,99,108,105,101,110,116,0,17,102,114,97,109,101,46,108,111,
-  99,97,108,112,114,111,112,115,49,11,16,102,114,108,49,95,99,97,112,116,
-  105,111,110,100,105,115,116,0,16,102,114,97,109,101,46,111,117,116,101,114,
-  102,114,97,109,101,1,2,18,2,1,2,0,2,2,0,15,102,97,99,101,
-  46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,116,
-  101,109,112,108,97,116,101,7,23,109,97,105,110,102,111,46,116,102,97,99,
-  101,112,108,97,121,101,114,108,105,103,104,116,8,116,97,98,111,114,100,101,
-  114,2,3,4,104,105,110,116,6,41,32,69,110,97,98,108,101,32,83,112,
-  101,99,116,114,117,109,32,70,114,101,113,117,101,110,99,105,101,115,32,67,
-  97,108,99,117,108,97,116,105,111,110,32,8,98,111,117,110,100,115,95,120,
-  2,43,8,98,111,117,110,100,115,95,121,2,17,9,98,111,117,110,100,115,
-  95,99,120,2,31,9,98,111,117,110,100,115,95,99,121,2,15,8,115,116,
-  97,116,102,105,108,101,7,17,109,97,105,110,102,111,46,116,115,116,97,116,
-  102,105,108,101,49,10,99,111,108,111,114,103,108,121,112,104,4,74,74,74,
-  0,5,118,97,108,117,101,9,12,118,97,108,117,101,100,101,102,97,117,108,
-  116,9,0,0,12,116,98,111,111,108,101,97,110,101,100,105,116,6,103,117,
-  105,109,105,120,5,99,111,108,111,114,4,3,0,0,128,17,102,114,97,109,
+  46,116,102,97,99,101,112,108,97,121,101,114,108,105,103,104,116,8,116,97,
+  98,111,114,100,101,114,2,4,4,104,105,110,116,6,54,71,114,97,112,104,
+  105,99,45,97,110,105,109,32,119,104,105,108,101,32,109,105,120,105,110,103,
+  32,40,105,102,32,99,112,117,32,116,111,111,32,108,111,119,32,115,101,116,
+  32,105,116,32,111,102,102,41,32,8,98,111,117,110,100,115,95,120,2,5,
+  8,98,111,117,110,100,115,95,121,2,17,9,98,111,117,110,100,115,95,99,
+  120,2,37,9,98,111,117,110,100,115,95,99,121,2,15,8,115,116,97,116,
+  102,105,108,101,7,17,109,97,105,110,102,111,46,116,115,116,97,116,102,105,
+  108,101,49,10,99,111,108,111,114,103,108,121,112,104,4,74,74,74,0,0,
+  0,12,116,98,111,111,108,101,97,110,101,100,105,116,8,108,105,110,107,118,
+  111,108,50,5,99,111,108,111,114,4,3,0,0,128,17,102,114,97,109,101,
+  46,104,105,100,100,101,110,101,100,103,101,115,11,9,101,100,103,95,114,105,
+  103,104,116,7,101,100,103,95,116,111,112,8,101,100,103,95,108,101,102,116,
+  10,101,100,103,95,98,111,116,116,111,109,0,17,102,114,97,109,101,46,99,
+  111,108,111,114,99,108,105,101,110,116,4,230,255,252,0,13,102,114,97,109,
+  101,46,99,97,112,116,105,111,110,6,4,32,32,76,50,16,102,114,97,109,
+  101,46,99,97,112,116,105,111,110,112,111,115,7,7,99,112,95,108,101,102,
+  116,17,102,114,97,109,101,46,99,97,112,116,105,111,110,100,105,115,116,2,
+  3,16,102,114,97,109,101,46,102,111,110,116,46,99,111,108,111,114,4,61,
+  61,61,0,17,102,114,97,109,101,46,102,111,110,116,46,104,101,105,103,104,
+  116,2,10,15,102,114,97,109,101,46,102,111,110,116,46,110,97,109,101,6,
+  11,115,116,102,95,100,101,102,97,117,108,116,21,102,114,97,109,101,46,102,
+  111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,9,102,108,112,95,
+  99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,116,0,16,102,114,
+  97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,102,114,108,95,
+  104,105,100,100,101,110,101,100,103,101,115,15,102,114,108,95,99,111,108,111,
+  114,99,108,105,101,110,116,0,17,102,114,97,109,101,46,108,111,99,97,108,
+  112,114,111,112,115,49,11,16,102,114,108,49,95,99,97,112,116,105,111,110,
+  100,105,115,116,0,16,102,114,97,109,101,46,111,117,116,101,114,102,114,97,
+  109,101,1,2,23,2,1,2,0,2,2,0,15,102,97,99,101,46,108,111,
+  99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,116,101,109,112,
+  108,97,116,101,7,23,109,97,105,110,102,111,46,116,102,97,99,101,112,108,
+  97,121,101,114,108,105,103,104,116,8,116,97,98,111,114,100,101,114,2,5,
+  4,104,105,110,116,6,37,32,76,111,99,107,32,108,101,102,116,32,97,110,
+  100,32,114,105,103,104,116,32,118,111,108,117,109,101,32,80,108,97,121,101,
+  114,32,50,32,8,98,111,117,110,100,115,95,120,2,38,8,98,111,117,110,
+  100,115,95,121,2,1,9,98,111,117,110,100,115,95,99,120,2,36,9,98,
+  111,117,110,100,115,95,99,121,2,15,8,115,116,97,116,102,105,108,101,7,
+  17,109,97,105,110,102,111,46,116,115,116,97,116,102,105,108,101,49,10,99,
+  111,108,111,114,103,108,121,112,104,4,74,74,74,0,5,118,97,108,117,101,
+  9,0,0,12,116,98,111,111,108,101,97,110,101,100,105,116,7,108,105,110,
+  107,118,111,108,5,99,111,108,111,114,4,3,0,0,128,17,102,114,97,109,
   101,46,104,105,100,100,101,110,101,100,103,101,115,11,9,101,100,103,95,114,
   105,103,104,116,7,101,100,103,95,116,111,112,8,101,100,103,95,108,101,102,
   116,10,101,100,103,95,98,111,116,116,111,109,0,17,102,114,97,109,101,46,
   99,111,108,111,114,99,108,105,101,110,116,4,230,255,252,0,13,102,114,97,
-  109,101,46,99,97,112,116,105,111,110,6,3,71,77,32,17,102,114,97,109,
-  101,46,99,97,112,116,105,111,110,100,105,115,116,2,2,16,102,114,97,109,
-  101,46,102,111,110,116,46,99,111,108,111,114,4,61,61,61,0,17,102,114,
-  97,109,101,46,102,111,110,116,46,104,101,105,103,104,116,2,10,15,102,114,
-  97,109,101,46,102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,
-  101,102,97,117,108,116,21,102,114,97,109,101,46,102,111,110,116,46,108,111,
-  99,97,108,112,114,111,112,115,11,9,102,108,112,95,99,111,108,111,114,10,
-  102,108,112,95,104,101,105,103,104,116,0,16,102,114,97,109,101,46,108,111,
-  99,97,108,112,114,111,112,115,11,15,102,114,108,95,104,105,100,100,101,110,
-  101,100,103,101,115,15,102,114,108,95,99,111,108,111,114,99,108,105,101,110,
-  116,0,17,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,
-  11,16,102,114,108,49,95,99,97,112,116,105,111,110,100,105,115,116,0,16,
-  102,114,97,109,101,46,111,117,116,101,114,102,114,97,109,101,1,2,0,2,
-  2,2,24,2,2,0,15,102,97,99,101,46,108,111,99,97,108,112,114,111,
-  112,115,11,0,13,102,97,99,101,46,116,101,109,112,108,97,116,101,7,23,
-  109,97,105,110,102,111,46,116,102,97,99,101,112,108,97,121,101,114,108,105,
-  103,104,116,8,116,97,98,111,114,100,101,114,2,4,4,104,105,110,116,6,
-  54,71,114,97,112,104,105,99,45,97,110,105,109,32,119,104,105,108,101,32,
-  109,105,120,105,110,103,32,40,105,102,32,99,112,117,32,116,111,111,32,108,
-  111,119,32,115,101,116,32,105,116,32,111,102,102,41,32,8,98,111,117,110,
-  100,115,95,120,2,5,8,98,111,117,110,100,115,95,121,2,17,9,98,111,
-  117,110,100,115,95,99,120,2,37,9,98,111,117,110,100,115,95,99,121,2,
-  15,8,115,116,97,116,102,105,108,101,7,17,109,97,105,110,102,111,46,116,
-  115,116,97,116,102,105,108,101,49,10,99,111,108,111,114,103,108,121,112,104,
-  4,74,74,74,0,0,0,12,116,98,111,111,108,101,97,110,101,100,105,116,
-  8,108,105,110,107,118,111,108,50,5,99,111,108,111,114,4,3,0,0,128,
-  17,102,114,97,109,101,46,104,105,100,100,101,110,101,100,103,101,115,11,9,
-  101,100,103,95,114,105,103,104,116,7,101,100,103,95,116,111,112,8,101,100,
-  103,95,108,101,102,116,10,101,100,103,95,98,111,116,116,111,109,0,17,102,
-  114,97,109,101,46,99,111,108,111,114,99,108,105,101,110,116,4,230,255,252,
-  0,13,102,114,97,109,101,46,99,97,112,116,105,111,110,6,4,32,32,76,
-  50,16,102,114,97,109,101,46,99,97,112,116,105,111,110,112,111,115,7,7,
-  99,112,95,108,101,102,116,17,102,114,97,109,101,46,99,97,112,116,105,111,
-  110,100,105,115,116,2,3,16,102,114,97,109,101,46,102,111,110,116,46,99,
-  111,108,111,114,4,61,61,61,0,17,102,114,97,109,101,46,102,111,110,116,
-  46,104,101,105,103,104,116,2,10,15,102,114,97,109,101,46,102,111,110,116,
-  46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,21,102,
-  114,97,109,101,46,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,
-  11,9,102,108,112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,103,
-  104,116,0,16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,
-  11,15,102,114,108,95,104,105,100,100,101,110,101,100,103,101,115,15,102,114,
-  108,95,99,111,108,111,114,99,108,105,101,110,116,0,17,102,114,97,109,101,
-  46,108,111,99,97,108,112,114,111,112,115,49,11,16,102,114,108,49,95,99,
-  97,112,116,105,111,110,100,105,115,116,0,16,102,114,97,109,101,46,111,117,
-  116,101,114,102,114,97,109,101,1,2,23,2,1,2,0,2,2,0,15,102,
-  97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,
-  101,46,116,101,109,112,108,97,116,101,7,23,109,97,105,110,102,111,46,116,
-  102,97,99,101,112,108,97,121,101,114,108,105,103,104,116,8,116,97,98,111,
-  114,100,101,114,2,5,4,104,105,110,116,6,37,32,76,111,99,107,32,108,
-  101,102,116,32,97,110,100,32,114,105,103,104,116,32,118,111,108,117,109,101,
-  32,80,108,97,121,101,114,32,50,32,8,98,111,117,110,100,115,95,120,2,
-  38,8,98,111,117,110,100,115,95,121,2,1,9,98,111,117,110,100,115,95,
-  99,120,2,36,9,98,111,117,110,100,115,95,99,121,2,15,8,115,116,97,
-  116,102,105,108,101,7,17,109,97,105,110,102,111,46,116,115,116,97,116,102,
-  105,108,101,49,10,99,111,108,111,114,103,108,121,112,104,4,74,74,74,0,
-  5,118,97,108,117,101,9,0,0,12,116,98,111,111,108,101,97,110,101,100,
-  105,116,7,108,105,110,107,118,111,108,5,99,111,108,111,114,4,3,0,0,
-  128,17,102,114,97,109,101,46,104,105,100,100,101,110,101,100,103,101,115,11,
-  9,101,100,103,95,114,105,103,104,116,7,101,100,103,95,116,111,112,8,101,
-  100,103,95,108,101,102,116,10,101,100,103,95,98,111,116,116,111,109,0,17,
-  102,114,97,109,101,46,99,111,108,111,114,99,108,105,101,110,116,4,230,255,
-  252,0,13,102,114,97,109,101,46,99,97,112,116,105,111,110,6,5,76,49,
-  32,32,32,17,102,114,97,109,101,46,99,97,112,116,105,111,110,100,105,115,
-  116,2,3,16,102,114,97,109,101,46,102,111,110,116,46,99,111,108,111,114,
-  4,61,61,61,0,17,102,114,97,109,101,46,102,111,110,116,46,104,101,105,
-  103,104,116,2,10,15,102,114,97,109,101,46,102,111,110,116,46,110,97,109,
-  101,6,11,115,116,102,95,100,101,102,97,117,108,116,21,102,114,97,109,101,
-  46,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,9,102,108,
-  112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,116,0,16,
-  102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,102,114,
-  108,95,104,105,100,100,101,110,101,100,103,101,115,15,102,114,108,95,99,111,
-  108,111,114,99,108,105,101,110,116,0,17,102,114,97,109,101,46,108,111,99,
-  97,108,112,114,111,112,115,49,11,16,102,114,108,49,95,99,97,112,116,105,
-  111,110,100,105,115,116,0,16,102,114,97,109,101,46,111,117,116,101,114,102,
-  114,97,109,101,1,2,0,2,1,2,26,2,2,0,15,102,97,99,101,46,
-  108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,116,101,
-  109,112,108,97,116,101,7,23,109,97,105,110,102,111,46,116,102,97,99,101,
-  112,108,97,121,101,114,108,105,103,104,116,8,116,97,98,111,114,100,101,114,
-  2,6,4,104,105,110,116,6,37,32,76,111,99,107,32,108,101,102,116,32,
-  97,110,100,32,114,105,103,104,116,32,118,111,108,117,109,101,32,80,108,97,
-  121,101,114,32,49,32,8,98,111,117,110,100,115,95,120,2,5,8,98,111,
-  117,110,100,115,95,121,2,1,9,98,111,117,110,100,115,95,99,120,2,39,
-  9,98,111,117,110,100,115,95,99,121,2,15,8,115,116,97,116,102,105,108,
-  101,7,17,109,97,105,110,102,111,46,116,115,116,97,116,102,105,108,101,49,
-  10,99,111,108,111,114,103,108,121,112,104,4,74,74,74,0,5,118,97,108,
-  117,101,9,0,0,12,116,98,111,111,108,101,97,110,101,100,105,116,10,108,
-  105,110,107,118,111,108,103,101,110,5,99,111,108,111,114,4,3,0,0,128,
-  17,102,114,97,109,101,46,104,105,100,100,101,110,101,100,103,101,115,11,9,
-  101,100,103,95,114,105,103,104,116,7,101,100,103,95,116,111,112,8,101,100,
-  103,95,108,101,102,116,10,101,100,103,95,98,111,116,116,111,109,0,17,102,
-  114,97,109,101,46,99,111,108,111,114,99,108,105,101,110,116,4,230,255,252,
-  0,13,102,114,97,109,101,46,99,97,112,116,105,111,110,6,8,32,32,32,
-  32,32,32,32,32,16,102,114,97,109,101,46,99,97,112,116,105,111,110,112,
-  111,115,7,7,99,112,95,108,101,102,116,17,102,114,97,109,101,46,99,97,
-  112,116,105,111,110,100,105,115,116,2,3,16,102,114,97,109,101,46,102,111,
-  110,116,46,99,111,108,111,114,4,61,61,61,0,17,102,114,97,109,101,46,
-  102,111,110,116,46,104,101,105,103,104,116,2,10,15,102,114,97,109,101,46,
-  102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,117,
-  108,116,21,102,114,97,109,101,46,102,111,110,116,46,108,111,99,97,108,112,
-  114,111,112,115,11,9,102,108,112,95,99,111,108,111,114,10,102,108,112,95,
-  104,101,105,103,104,116,0,16,102,114,97,109,101,46,108,111,99,97,108,112,
-  114,111,112,115,11,15,102,114,108,95,104,105,100,100,101,110,101,100,103,101,
-  115,15,102,114,108,95,99,111,108,111,114,99,108,105,101,110,116,0,17,102,
-  114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,11,16,102,114,
-  108,49,95,99,97,112,116,105,111,110,100,105,115,116,0,16,102,114,97,109,
-  101,46,111,117,116,101,114,102,114,97,109,101,1,2,29,2,1,2,0,2,
-  2,0,15,102,97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,
-  13,102,97,99,101,46,116,101,109,112,108,97,116,101,7,21,109,97,105,110,
-  102,111,46,116,102,97,99,101,98,117,116,108,116,103,114,97,121,8,116,97,
-  98,111,114,100,101,114,2,7,4,104,105,110,116,6,36,32,76,105,110,107,
-  32,108,101,102,116,32,97,110,100,32,114,105,103,104,116,32,118,111,108,117,
-  109,101,32,103,101,110,101,114,97,108,32,8,98,111,117,110,100,115,95,120,
-  2,17,8,98,111,117,110,100,115,95,121,2,67,9,98,111,117,110,100,115,
-  95,99,120,2,42,9,98,111,117,110,100,115,95,99,121,2,15,8,115,116,
-  97,116,102,105,108,101,7,17,109,97,105,110,102,111,46,116,115,116,97,116,
-  102,105,108,101,49,10,99,111,108,111,114,103,108,121,112,104,4,74,74,74,
-  0,5,118,97,108,117,101,9,0,0,0,0,9,116,102,97,99,101,99,111,
+  109,101,46,99,97,112,116,105,111,110,6,5,76,49,32,32,32,17,102,114,
+  97,109,101,46,99,97,112,116,105,111,110,100,105,115,116,2,3,16,102,114,
+  97,109,101,46,102,111,110,116,46,99,111,108,111,114,4,61,61,61,0,17,
+  102,114,97,109,101,46,102,111,110,116,46,104,101,105,103,104,116,2,10,15,
+  102,114,97,109,101,46,102,111,110,116,46,110,97,109,101,6,11,115,116,102,
+  95,100,101,102,97,117,108,116,21,102,114,97,109,101,46,102,111,110,116,46,
+  108,111,99,97,108,112,114,111,112,115,11,9,102,108,112,95,99,111,108,111,
+  114,10,102,108,112,95,104,101,105,103,104,116,0,16,102,114,97,109,101,46,
+  108,111,99,97,108,112,114,111,112,115,11,15,102,114,108,95,104,105,100,100,
+  101,110,101,100,103,101,115,15,102,114,108,95,99,111,108,111,114,99,108,105,
+  101,110,116,0,17,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,
+  115,49,11,16,102,114,108,49,95,99,97,112,116,105,111,110,100,105,115,116,
+  0,16,102,114,97,109,101,46,111,117,116,101,114,102,114,97,109,101,1,2,
+  0,2,1,2,26,2,2,0,15,102,97,99,101,46,108,111,99,97,108,112,
+  114,111,112,115,11,0,13,102,97,99,101,46,116,101,109,112,108,97,116,101,
+  7,23,109,97,105,110,102,111,46,116,102,97,99,101,112,108,97,121,101,114,
+  108,105,103,104,116,8,116,97,98,111,114,100,101,114,2,6,4,104,105,110,
+  116,6,37,32,76,111,99,107,32,108,101,102,116,32,97,110,100,32,114,105,
+  103,104,116,32,118,111,108,117,109,101,32,80,108,97,121,101,114,32,49,32,
+  8,98,111,117,110,100,115,95,120,2,5,8,98,111,117,110,100,115,95,121,
+  2,1,9,98,111,117,110,100,115,95,99,120,2,39,9,98,111,117,110,100,
+  115,95,99,121,2,15,8,115,116,97,116,102,105,108,101,7,17,109,97,105,
+  110,102,111,46,116,115,116,97,116,102,105,108,101,49,10,99,111,108,111,114,
+  103,108,121,112,104,4,74,74,74,0,5,118,97,108,117,101,9,0,0,12,
+  116,98,111,111,108,101,97,110,101,100,105,116,10,108,105,110,107,118,111,108,
+  103,101,110,5,99,111,108,111,114,4,3,0,0,128,17,102,114,97,109,101,
+  46,104,105,100,100,101,110,101,100,103,101,115,11,9,101,100,103,95,114,105,
+  103,104,116,7,101,100,103,95,116,111,112,8,101,100,103,95,108,101,102,116,
+  10,101,100,103,95,98,111,116,116,111,109,0,17,102,114,97,109,101,46,99,
+  111,108,111,114,99,108,105,101,110,116,4,230,255,252,0,13,102,114,97,109,
+  101,46,99,97,112,116,105,111,110,6,8,32,32,32,32,32,32,32,32,16,
+  102,114,97,109,101,46,99,97,112,116,105,111,110,112,111,115,7,7,99,112,
+  95,108,101,102,116,17,102,114,97,109,101,46,99,97,112,116,105,111,110,100,
+  105,115,116,2,3,16,102,114,97,109,101,46,102,111,110,116,46,99,111,108,
+  111,114,4,61,61,61,0,17,102,114,97,109,101,46,102,111,110,116,46,104,
+  101,105,103,104,116,2,10,15,102,114,97,109,101,46,102,111,110,116,46,110,
+  97,109,101,6,11,115,116,102,95,100,101,102,97,117,108,116,21,102,114,97,
+  109,101,46,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,9,
+  102,108,112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,116,
+  0,16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,
+  102,114,108,95,104,105,100,100,101,110,101,100,103,101,115,15,102,114,108,95,
+  99,111,108,111,114,99,108,105,101,110,116,0,17,102,114,97,109,101,46,108,
+  111,99,97,108,112,114,111,112,115,49,11,16,102,114,108,49,95,99,97,112,
+  116,105,111,110,100,105,115,116,0,16,102,114,97,109,101,46,111,117,116,101,
+  114,102,114,97,109,101,1,2,29,2,1,2,0,2,2,0,15,102,97,99,
+  101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,
+  116,101,109,112,108,97,116,101,7,21,109,97,105,110,102,111,46,116,102,97,
+  99,101,98,117,116,108,116,103,114,97,121,8,116,97,98,111,114,100,101,114,
+  2,7,4,104,105,110,116,6,36,32,76,105,110,107,32,108,101,102,116,32,
+  97,110,100,32,114,105,103,104,116,32,118,111,108,117,109,101,32,103,101,110,
+  101,114,97,108,32,8,98,111,117,110,100,115,95,120,2,17,8,98,111,117,
+  110,100,115,95,121,2,67,9,98,111,117,110,100,115,95,99,120,2,42,9,
+  98,111,117,110,100,115,95,99,121,2,15,8,115,116,97,116,102,105,108,101,
+  7,17,109,97,105,110,102,111,46,116,115,116,97,116,102,105,108,101,49,10,
+  99,111,108,111,114,103,108,121,112,104,4,74,74,74,0,5,118,97,108,117,
+  101,9,0,0,0,11,116,115,116,114,105,110,103,100,105,115,112,11,110,97,
+  109,101,112,108,97,121,101,114,115,5,99,111,108,111,114,4,3,0,0,128,
+  16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,0,17,
+  102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,11,0,14,
+  102,114,97,109,101,46,116,101,109,112,108,97,116,101,7,11,116,102,114,97,
+  109,101,99,111,109,112,50,15,102,97,99,101,46,108,111,99,97,108,112,114,
+  111,112,115,11,0,13,102,97,99,101,46,116,101,109,112,108,97,116,101,7,
+  23,109,97,105,110,102,111,46,116,102,97,99,101,112,108,97,121,101,114,108,
+  105,103,104,116,8,116,97,98,111,114,100,101,114,2,37,4,104,105,110,116,
+  6,8,80,108,97,121,101,114,32,49,8,98,111,117,110,100,115,95,120,2,
+  42,8,98,111,117,110,100,115,95,121,2,3,9,98,111,117,110,100,115,95,
+  99,120,2,32,9,98,111,117,110,100,115,95,99,121,2,14,10,102,111,110,
+  116,46,99,111,108,111,114,4,59,59,59,0,11,102,111,110,116,46,104,101,
+  105,103,104,116,2,10,9,102,111,110,116,46,110,97,109,101,6,11,115,116,
+  102,95,100,101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,108,
+  112,114,111,112,115,11,9,102,108,112,95,99,111,108,111,114,10,102,108,112,
+  95,104,101,105,103,104,116,0,9,116,101,120,116,102,108,97,103,115,11,12,
+  116,102,95,120,99,101,110,116,101,114,101,100,12,116,102,95,121,99,101,110,
+  116,101,114,101,100,0,5,118,97,108,117,101,6,5,80,108,97,121,49,13,
+  114,101,102,102,111,110,116,104,101,105,103,104,116,2,13,0,0,11,116,115,
+  116,114,105,110,103,100,105,115,112,12,110,97,109,101,112,108,97,121,101,114,
+  115,50,5,99,111,108,111,114,4,3,0,0,128,16,102,114,97,109,101,46,
+  108,111,99,97,108,112,114,111,112,115,11,0,17,102,114,97,109,101,46,108,
+  111,99,97,108,112,114,111,112,115,49,11,0,14,102,114,97,109,101,46,116,
+  101,109,112,108,97,116,101,7,11,116,102,114,97,109,101,99,111,109,112,50,
+  15,102,97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,
+  97,99,101,46,116,101,109,112,108,97,116,101,7,23,109,97,105,110,102,111,
+  46,116,102,97,99,101,112,108,97,121,101,114,108,105,103,104,116,8,116,97,
+  98,111,114,100,101,114,2,38,4,104,105,110,116,6,8,80,108,97,121,101,
+  114,32,50,8,98,111,117,110,100,115,95,120,3,192,0,8,98,111,117,110,
+  100,115,95,121,2,3,9,98,111,117,110,100,115,95,99,120,2,32,9,98,
+  111,117,110,100,115,95,99,121,2,14,10,102,111,110,116,46,99,111,108,111,
+  114,4,59,59,59,0,11,102,111,110,116,46,104,101,105,103,104,116,2,10,
+  9,102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100,101,102,97,
+  117,108,116,15,102,111,110,116,46,108,111,99,97,108,112,114,111,112,115,11,
+  9,102,108,112,95,99,111,108,111,114,10,102,108,112,95,104,101,105,103,104,
+  116,0,9,116,101,120,116,102,108,97,103,115,11,12,116,102,95,120,99,101,
+  110,116,101,114,101,100,12,116,102,95,121,99,101,110,116,101,114,101,100,0,
+  5,118,97,108,117,101,6,5,80,108,97,121,50,13,114,101,102,102,111,110,
+  116,104,101,105,103,104,116,2,13,0,0,0,9,116,102,97,99,101,99,111,
   109,112,10,116,102,97,99,101,99,111,109,112,55,23,116,101,109,112,108,97,
   116,101,46,102,97,100,101,95,112,111,115,46,99,111,117,110,116,2,2,23,
   116,101,109,112,108,97,116,101,46,102,97,100,101,95,112,111,115,46,105,116,
diff --git a/src/main.pas b/src/main.pas
index 7b469ce..3ae1bc7 100644
--- a/src/main.pas
+++ b/src/main.pas
@@ -2439,10 +2439,10 @@       EQEN.face.template := recorderfo.tfacerecorder;
     end;
 
     // commander
-    //   commanderfo.nameplayers.font.color := ltblack;
-    //   commanderfo.nameplayers2.font.color := ltblack;
+    commanderfo.nameplayers.font.color := ltblack;
+    commanderfo.nameplayers2.font.color := ltblack;
     commanderfo.namedrums.font.color  := ltblack;
-    // commanderfo.namegen.font.color    := ltblack;
+    commanderfo.namegen.font.color    := ltblack;
     commanderfo.nameinput.font.color  := ltblack;
     commanderfo.genleftvolvalue.font.color := ltblack;
     commanderfo.genrightvolvalue.font.color := ltblack;
@@ -3035,10 +3035,10 @@       // spect1.face.template := recorderfo.tfacerecorder;
     end;
 
     // commander
-    //  commanderfo.nameplayers.font.color := ltblack;
-    //  commanderfo.nameplayers2.font.color := ltblack;
+    commanderfo.nameplayers.font.color := ltblack;
+    commanderfo.nameplayers2.font.color := ltblack;
     commanderfo.namedrums.font.color        := ltblack;
-    //  commanderfo.namegen.font.color          := ltblack;
+    commanderfo.namegen.font.color          := ltblack;
     commanderfo.nameinput.font.color        := ltblack;
     commanderfo.genleftvolvalue.font.color  := ltblack;
     commanderfo.genrightvolvalue.font.color := ltblack;
@@ -3736,12 +3736,12 @@       // spect1.face.template := recorderfo.tfacerecorder;
     end;
 
     // commander
-    // commanderfo.nameplayers.font.color := ltblank;
-    // commanderfo.nameplayers2.font.color := ltblank;
+    commanderfo.nameplayers.font.color := ltblank;
+    commanderfo.nameplayers2.font.color := ltblank;
     commanderfo.namedrums.font.color := ltblank;
 
-    //commanderfo.namegen.font.color          := ltblank;
-    // commanderfo.nameinput.font.color        := ltblank;
+    commanderfo.namegen.font.color          := ltblank;
+    commanderfo.nameinput.font.color        := ltblank;
     commanderfo.genleftvolvalue.font.color  := ltblank;
     commanderfo.genrightvolvalue.font.color := ltblank;
 
diff --git a/src/strumpract.prj b/src/strumpract.prj
index 69dd32c..9a2d7a6 100644
--- a/src/strumpract.prj
+++ b/src/strumpract.prj
@@ -186,8 +186,8 @@ finddialog=8
  value=0
  [finddialogfo]
  stackedunder=
- x=908
- y=206
+ x=408
+ y=280
  cx=300
  cy=269
 replacedialog=33
@@ -842,15 +842,18 @@ settingsstorage=0
 settingsprojecttree=0
 settingsautoload=0
 settingsautosave=0
-modulenames=2
- SONGPLAYERFO
+modulenames=3
+ COMMANDERFO
  MAINFO
-moduletypes=2
- TSONGPLAYERFO
+ SONGPLAYERFO
+moduletypes=3
+ TCOMMANDERFO
  TMAINFO
-modulefiles=2
- /home/fred/strumpract/src/songplayer.mfm
+ TSONGPLAYERFO
+modulefiles=3
+ /home/fred/strumpract/src/commander.mfm
  /home/fred/strumpract/src/main.mfm
+ /home/fred/strumpract/src/songplayer.mfm
 befcommandon=0
 makeoptionson=12
  4095
@@ -1211,9 +1214,9 @@ line=33
  5721
  1600
  1467
- 284
+ 253
  319
- 529
+ 498
  553
  773
  785
@@ -1224,7 +1227,7 @@ line=33
  3572
  431
  5
- 747
+ 716
  1517
  163
  1471
@@ -1613,8 +1616,9 @@ envvarons=0
 [edit]
 hintwidth=314
 hintheight=200
-finddtext=edvolleft
+finddtext=nameplayers
 findhistory=20
+ nameplayers
  edvolleft
  reverse
  addfromf
@@ -1625,7 +1629,6 @@ findhistory=20
  guimix
  cbloop
  onexecbutlght
- nameplayers
  initcheck
  namegen
  AddIntoDevOut
@@ -1636,26 +1639,31 @@ findhistory=20
  commander.tbutton2
  initvolleft2
 findoptions=1
-editpos=4
+editpos=5
  0,-1073741823
- 0,277
- 0,-1073741823
- 0,4024
+ 0,261
+ 0,12
+ 0,2444
+ 65,11
 bookmarks0=0
 bookmarks1=0
 bookmarks2=0
 bookmarks3=0
-sourcefiles=4
+bookmarks4=0
+sourcefiles=5
  ${PROJECTDIR}/strumpract.pas
  ${PROJECTDIR}/songplayer.pas
  ${PROJECTDIR}/uos_flat.pas
  ${PROJECTDIR}/main.pas
-relpaths=4
+ ${PROJECTDIR}/commander.pas
+relpaths=5
  strumpract.pas
  songplayer.pas
  uos_flat.pas
  main.pas
-ismoduletexts=4
+ commander.pas
+ismoduletexts=5
+ 0
  0
  0
  0
@@ -1674,26 +1682,27 @@ moduleoptions=5
  0
 visiblemodules=5
  -1
- 0
+ -1
  0
  0
  -1
 nomenumodules=5
  0
- -1
+ 0
  -1
  -1
  0
 [sourcefo.files_tab]
-order=4
+order=5
  0
  1
- 3
+ 4
  2
+ 3
 firsttab=0
-index=2
+index=4
 [layout]
-windowlayout=665
+windowlayout=666
  [mainfo.basedock]
  splitdir=2
  useroptions=268450944
@@ -1707,8 +1716,8 @@ windowlayout=665
  ny=0
  ncx=0
  ncy=0
- x=29
- y=90
+ x=48
+ y=261
  cx=1224
  cy=621
  rcx=0
@@ -1838,7 +1847,7 @@ windowlayout=665
  sortdescend1=0
  sorted=0
  col=0
- row=9
+ row=1
  rowheight=16
  [stackfo]
  splitdir=0
@@ -1917,10 +1926,10 @@ windowlayout=665
  [breakpointsfo.bkptson]
  value=0
  [objectinspectorfo.grid]
- propcolwidthref=547
- width0=302
+ propcolwidthref=532
+ width0=294
  sortdescend0=0
- width1=239
+ width1=232
  sortdescend1=0
  [symbolfo]
  splitdir=0
@@ -2176,6 +2185,7 @@ windowlayout=665
  [debuggerfo.file_history]
  value=/home/fred/strumpract/src/main.pas
  history=20
+  /home/fred/strumpract/src/uos_flat.pas
   /home/fred/strumpract/src/songplayer.pas
   /home/fred/strumpract/src/strumpract.pas
   /home/fred/strumpract/src/main.pas
@@ -2195,7 +2205,6 @@ windowlayout=665
   /home/fred/strumpract/src/uos.pas
   /home/fred/uos/examples/uos.pas
   /home/fred/strumpract/src/define.inc
-  /home/fred/uos_blaazwave/src/uos.pas
  [debuggerfo.project_options]
  value=1
  [debuggerfo.hints]
@@ -2217,13 +2226,14 @@ windowlayout=665
  rcx=0
  rcy=0
  [sourcefo.files_tab]
- order=4
+ order=5
   0
   1
-  3
+  4
   2
+  3
  firsttab=0
- index=2
+ index=4
  [confideufo.fontname]
  value=stf_default
  [confideufo.usedefaulteditoroptions]
@@ -2267,7 +2277,7 @@ windowlayout=665
  [_mse_mainfo_mse_]
  splitdir=0
  useroptions=268451963
- stackedunder=mainfo
+ stackedunder=targetconsolefo
  parent=
  mdistate=3
  nx=0
@@ -2286,7 +2296,7 @@ windowlayout=665
  [_mse_commanderfo_mse_]
  splitdir=0
  useroptions=268451963
- stackedunder=confdebuggerfo
+ stackedunder=mainfo
  parent=
  mdistate=3
  nx=0
@@ -2301,11 +2311,11 @@ windowlayout=665
  rcy=0
  wsize=0
  active=0
- visible=0
+ visible=1
  [_mse_recorderfo_mse_]
  splitdir=0
  useroptions=268451963
- stackedunder=_mse_commanderfo_mse_
+ stackedunder=confdebuggerfo
  parent=
  mdistate=3
  nx=0