diff --git a/src/main/gui/net/sf/jailer/ui/CLIPanel.form b/src/main/gui/net/sf/jailer/ui/CLIPanel.form
index 5fbbd8cb7..bf9b8304e 100644
--- a/src/main/gui/net/sf/jailer/ui/CLIPanel.form
+++ b/src/main/gui/net/sf/jailer/ui/CLIPanel.form
@@ -61,6 +61,7 @@
                 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                   <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
                     <LineBorder roundedCorners="true"/>
+<Color PropertyName="color" blue="80" green="80" id="gray" palette="1" red="80" type="palette"/> 
                   </Border>
                 </Property>
                 <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
diff --git a/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form b/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form
index ca1abc7bf..89a617fe5 100644
--- a/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form
+++ b/src/main/gui/net/sf/jailer/ui/DataModelManagerDialog.form
@@ -1031,7 +1031,7 @@
                             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                               <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
                                 <LineBorder>
-                                  <Connection code="/* Renaming also in *.form! */ Colors.Color_204_204_204" type="code"/>
+                          	       <Color PropertyName="color" blue="cc" green="cc" red="cc" type="rgb"/>
                                 </LineBorder>
                               </Border>
                             </Property>
diff --git a/src/main/gui/net/sf/jailer/ui/NonModalConditionEditor.form b/src/main/gui/net/sf/jailer/ui/NonModalConditionEditor.form
index 81eff5275..d42c4f8db 100644
--- a/src/main/gui/net/sf/jailer/ui/NonModalConditionEditor.form
+++ b/src/main/gui/net/sf/jailer/ui/NonModalConditionEditor.form
@@ -28,7 +28,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
             <LineBorder roundedCorners="true">
-              <Connection code="/* Renaming also in *.form! */ Colors.Color_192_192_192" type="code"/>
+             <Color PropertyName="color" blue="c0" green="c0" id="lightGray" palette="1" red="c0" type="palette"/> 
             </LineBorder>
           </Border>
         </Property>
diff --git a/src/main/gui/net/sf/jailer/ui/StringSearchPanel.form b/src/main/gui/net/sf/jailer/ui/StringSearchPanel.form
index bb938f17d..e6bbb4aca 100644
--- a/src/main/gui/net/sf/jailer/ui/StringSearchPanel.form
+++ b/src/main/gui/net/sf/jailer/ui/StringSearchPanel.form
@@ -213,7 +213,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
             <LineBorder>
-              <Connection code="/* Renaming also in *.form! */ Colors.Color_192_192_192" type="code"/>
+              <Color PropertyName="color" blue="c0" green="c0" id="lightGray" palette="1" red="c0" type="palette"/> 
             </LineBorder>
           </Border>
         </Property>
@@ -231,7 +231,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
             <LineBorder roundedCorners="true">
-              <Connection code="/* Renaming also in *.form! */ Colors.Color_192_192_192" type="code"/>
+              <Color PropertyName="color" blue="c0" green="c0" id="lightGray" palette="1" red="c0" type="palette"/> 
             </LineBorder>
           </Border>
         </Property>
diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.form b/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.form
index dd25beec2..8eb8ab3f5 100644
--- a/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.form
+++ b/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.form
@@ -527,7 +527,7 @@
                                         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                                           <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
                                             <LineBorder roundedCorners="true">
-                                              <Connection code="/* Renaming also in *.form! */ Colors.Color_128_128_128" type="code"/>
+                                              <Color PropertyName="color" blue="80" green="80" id="gray" palette="1" red="80" type="palette"/>
                                             </LineBorder>
                                           </Border>
                                         </Property>
diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/DBConditionEditor.form b/src/main/gui/net/sf/jailer/ui/databrowser/DBConditionEditor.form
index 2b5cfdae2..b4b72c9a2 100644
--- a/src/main/gui/net/sf/jailer/ui/databrowser/DBConditionEditor.form
+++ b/src/main/gui/net/sf/jailer/ui/databrowser/DBConditionEditor.form
@@ -37,7 +37,7 @@
             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
               <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
                 <LineBorder roundedCorners="true">
-                  <Connection code="/* Renaming also in *.form! */ Colors.Color_192_192_192" type="code"/>
+                  <Color PropertyName="color" blue="c0" green="c0" id="lightGray" palette="1" red="c0" type="palette"/> 
                 </LineBorder>
               </Border>
             </Property>