diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.java
index d79e9592..4771bda9 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.java
@@ -260,22 +260,22 @@ class FlatThemePreviewButtons
 		//---- label5 ----
 		label5.setText("regular");
 		label5.setFont(label5.getFont().deriveFont(label5.getFont().getSize() - 2f));
-		add(label5, "cell 1 3");
+		add(label5, "cell 1 3,alignx center,growx 0");
 
 		//---- label7 ----
 		label7.setText("default");
 		label7.setFont(label7.getFont().deriveFont(label7.getFont().getSize() - 2f));
-		add(label7, "cell 2 3");
+		add(label7, "cell 2 3,alignx center,growx 0");
 
 		//---- label6 ----
 		label6.setText("regular");
 		label6.setFont(label6.getFont().deriveFont(label6.getFont().getSize() - 2f));
-		add(label6, "cell 3 3");
+		add(label6, "cell 3 3,alignx center,growx 0");
 
 		//---- label8 ----
 		label8.setText("default");
 		label8.setFont(label8.getFont().deriveFont(label8.getFont().getSize() - 2f));
-		add(label8, "cell 4 3");
+		add(label8, "cell 4 3,alignx center,growx 0");
 
 		//---- label1 ----
 		label1.setText("none");
@@ -416,22 +416,22 @@ class FlatThemePreviewButtons
 		//---- label13 ----
 		label13.setText("unsel.");
 		label13.setFont(label13.getFont().deriveFont(label13.getFont().getSize() - 2f));
-		add(label13, "cell 1 11");
+		add(label13, "cell 1 11,alignx center,growx 0");
 
 		//---- label14 ----
 		label14.setText("selected");
 		label14.setFont(label14.getFont().deriveFont(label14.getFont().getSize() - 2f));
-		add(label14, "cell 2 11");
+		add(label14, "cell 2 11,alignx center,growx 0");
 
 		//---- label15 ----
 		label15.setText("unsel.");
 		label15.setFont(label15.getFont().deriveFont(label15.getFont().getSize() - 2f));
-		add(label15, "cell 3 11");
+		add(label15, "cell 3 11,alignx center,growx 0");
 
 		//---- label16 ----
 		label16.setText("selected");
 		label16.setFont(label16.getFont().deriveFont(label16.getFont().getSize() - 2f));
-		add(label16, "cell 4 11");
+		add(label16, "cell 4 11,alignx center,growx 0");
 
 		//---- label17 ----
 		label17.setText("none");
@@ -561,13 +561,13 @@ class FlatThemePreviewButtons
 		//---- testStateButton15 ----
 		testStateButton15.putClientProperty("JComponent.minimumWidth", 0);
 		testStateButton15.putClientProperty("JButton.buttonType", "help");
-		add(testStateButton15, "cell 1 19");
+		add(testStateButton15, "cell 1 19 2 1,alignx center,growx 0");
 
 		//---- testStateButton19 ----
 		testStateButton19.setStateFocused(true);
 		testStateButton19.putClientProperty("JComponent.minimumWidth", 0);
 		testStateButton19.putClientProperty("JButton.buttonType", "help");
-		add(testStateButton19, "cell 3 19");
+		add(testStateButton19, "cell 3 19 2 1,alignx center,growx 0");
 
 		//---- label23 ----
 		label23.setText("hover");
@@ -577,14 +577,14 @@ class FlatThemePreviewButtons
 		testStateButton16.setStateHover(true);
 		testStateButton16.putClientProperty("JComponent.minimumWidth", 0);
 		testStateButton16.putClientProperty("JButton.buttonType", "help");
-		add(testStateButton16, "cell 1 20");
+		add(testStateButton16, "cell 1 20 2 1,alignx center,growx 0");
 
 		//---- testStateButton20 ----
 		testStateButton20.setStateHover(true);
 		testStateButton20.setStateFocused(true);
 		testStateButton20.putClientProperty("JComponent.minimumWidth", 0);
 		testStateButton20.putClientProperty("JButton.buttonType", "help");
-		add(testStateButton20, "cell 3 20");
+		add(testStateButton20, "cell 3 20 2 1,alignx center,growx 0");
 
 		//---- label24 ----
 		label24.setText("pressed");
@@ -594,14 +594,14 @@ class FlatThemePreviewButtons
 		testStateButton17.setStatePressed(true);
 		testStateButton17.putClientProperty("JComponent.minimumWidth", 0);
 		testStateButton17.putClientProperty("JButton.buttonType", "help");
-		add(testStateButton17, "cell 1 21");
+		add(testStateButton17, "cell 1 21 2 1,alignx center,growx 0");
 
 		//---- testStateButton21 ----
 		testStateButton21.setStatePressed(true);
 		testStateButton21.setStateFocused(true);
 		testStateButton21.putClientProperty("JComponent.minimumWidth", 0);
 		testStateButton21.putClientProperty("JButton.buttonType", "help");
-		add(testStateButton21, "cell 3 21");
+		add(testStateButton21, "cell 3 21 2 1,alignx center,growx 0");
 
 		//---- label25 ----
 		label25.setText("disabled");
@@ -611,7 +611,7 @@ class FlatThemePreviewButtons
 		testStateButton18.setEnabled(false);
 		testStateButton18.putClientProperty("JComponent.minimumWidth", 0);
 		testStateButton18.putClientProperty("JButton.buttonType", "help");
-		add(testStateButton18, "cell 1 22");
+		add(testStateButton18, "cell 1 22 2 1,alignx center,growx 0");
 
 		//---- label26 ----
 		label26.setText("try me");
@@ -620,7 +620,7 @@ class FlatThemePreviewButtons
 		//---- button2 ----
 		button2.putClientProperty("JComponent.minimumWidth", 0);
 		button2.putClientProperty("JButton.buttonType", "help");
-		add(button2, "cell 1 23");
+		add(button2, "cell 1 23 2 1,alignx center,growx 0");
 
 		//---- buttonGroup1 ----
 		ButtonGroup buttonGroup1 = new ButtonGroup();
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.jfd b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.jfd
index bfd53d8b..b4cb937d 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.jfd
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewButtons.jfd
@@ -126,28 +126,28 @@ new FormModel {
 				"text": "regular"
 				"font": &SwingDerivedFont2 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 3"
+				"value": "cell 1 3,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label7"
 				"text": "default"
 				"font": #SwingDerivedFont2
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 3"
+				"value": "cell 2 3,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label6"
 				"text": "regular"
 				"font": #SwingDerivedFont2
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 3 3"
+				"value": "cell 3 3,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label8"
 				"text": "default"
 				"font": #SwingDerivedFont2
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 4 3"
+				"value": "cell 4 3,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label1"
@@ -338,28 +338,28 @@ new FormModel {
 				"text": "unsel."
 				"font": #SwingDerivedFont2
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 11"
+				"value": "cell 1 11,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label14"
 				"text": "selected"
 				"font": #SwingDerivedFont2
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 11"
+				"value": "cell 2 11,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label15"
 				"text": "unsel."
 				"font": #SwingDerivedFont2
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 3 11"
+				"value": "cell 3 11,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label16"
 				"text": "selected"
 				"font": #SwingDerivedFont2
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 4 11"
+				"value": "cell 4 11,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label17"
@@ -541,7 +541,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 19"
+				"value": "cell 1 19 2 1,alignx center,growx 0"
 			} )
 			add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewButtons$TestStateButton" ) {
 				name: "testStateButton19"
@@ -549,7 +549,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 3 19"
+				"value": "cell 3 19 2 1,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label23"
@@ -563,7 +563,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 20"
+				"value": "cell 1 20 2 1,alignx center,growx 0"
 			} )
 			add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewButtons$TestStateButton" ) {
 				name: "testStateButton20"
@@ -572,7 +572,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 3 20"
+				"value": "cell 3 20 2 1,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label24"
@@ -586,7 +586,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 21"
+				"value": "cell 1 21 2 1,alignx center,growx 0"
 			} )
 			add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewButtons$TestStateButton" ) {
 				name: "testStateButton21"
@@ -595,7 +595,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 3 21"
+				"value": "cell 3 21 2 1,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label25"
@@ -609,7 +609,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 22"
+				"value": "cell 1 22 2 1,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label26"
@@ -622,7 +622,7 @@ new FormModel {
 				"$client.JComponent.minimumWidth": 0
 				"$client.JButton.buttonType": "help"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 23"
+				"value": "cell 1 23 2 1,alignx center,growx 0"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 5, 0 )
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.java
index d31f8ece..775c7122 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.java
@@ -133,22 +133,22 @@ class FlatThemePreviewSwitches
 		//---- label23 ----
 		label23.setText("unsel.");
 		label23.setFont(label23.getFont().deriveFont(label23.getFont().getSize() - 2f));
-		add(label23, "cell 1 2");
+		add(label23, "cell 1 2,alignx center,growx 0");
 
 		//---- label28 ----
 		label28.setText("selected");
 		label28.setFont(label28.getFont().deriveFont(label28.getFont().getSize() - 2f));
-		add(label28, "cell 2 2");
+		add(label28, "cell 2 2,alignx center,growx 0");
 
 		//---- label24 ----
 		label24.setText("unsel.");
 		label24.setFont(label24.getFont().deriveFont(label24.getFont().getSize() - 2f));
-		add(label24, "cell 3 2");
+		add(label24, "cell 3 2,alignx center,growx 0");
 
 		//---- label29 ----
 		label29.setText("selected");
 		label29.setFont(label29.getFont().deriveFont(label29.getFont().getSize() - 2f));
-		add(label29, "cell 4 2");
+		add(label29, "cell 4 2,alignx center,growx 0");
 
 		//---- label17 ----
 		label17.setText("none");
@@ -274,22 +274,22 @@ class FlatThemePreviewSwitches
 		//---- label25 ----
 		label25.setText("unsel.");
 		label25.setFont(label25.getFont().deriveFont(label25.getFont().getSize() - 2f));
-		add(label25, "cell 1 10");
+		add(label25, "cell 1 10,alignx center,growx 0");
 
 		//---- label30 ----
 		label30.setText("selected");
 		label30.setFont(label30.getFont().deriveFont(label30.getFont().getSize() - 2f));
-		add(label30, "cell 2 10");
+		add(label30, "cell 2 10,alignx center,growx 0");
 
 		//---- label26 ----
 		label26.setText("unsel.");
 		label26.setFont(label26.getFont().deriveFont(label26.getFont().getSize() - 2f));
-		add(label26, "cell 3 10");
+		add(label26, "cell 3 10,alignx center,growx 0");
 
 		//---- label31 ----
 		label31.setText("selected");
 		label31.setFont(label31.getFont().deriveFont(label31.getFont().getSize() - 2f));
-		add(label31, "cell 4 10");
+		add(label31, "cell 4 10,alignx center,growx 0");
 
 		//---- label36 ----
 		label36.setText("none");
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.jfd b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.jfd
index 7851d64d..502633e0 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.jfd
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewSwitches.jfd
@@ -36,28 +36,28 @@ new FormModel {
 				"text": "unsel."
 				"font": &SwingDerivedFont1 new com.jformdesigner.model.SwingDerivedFont( null, 0, -2, false )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 2"
+				"value": "cell 1 2,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label28"
 				"text": "selected"
 				"font": #SwingDerivedFont1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 2"
+				"value": "cell 2 2,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label24"
 				"text": "unsel."
 				"font": #SwingDerivedFont1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 3 2"
+				"value": "cell 3 2,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label29"
 				"text": "selected"
 				"font": #SwingDerivedFont1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 4 2"
+				"value": "cell 4 2,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label17"
@@ -233,28 +233,28 @@ new FormModel {
 				"text": "unsel."
 				"font": #SwingDerivedFont1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 10"
+				"value": "cell 1 10,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label30"
 				"text": "selected"
 				"font": #SwingDerivedFont1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 10"
+				"value": "cell 2 10,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label26"
 				"text": "unsel."
 				"font": #SwingDerivedFont1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 3 10"
+				"value": "cell 3 10,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label31"
 				"text": "selected"
 				"font": #SwingDerivedFont1
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 4 10"
+				"value": "cell 4 10,alignx center,growx 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label36"