diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WMultiFileWidgetAjaxExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WMultiFileWidgetAjaxExample.java
index 20dd1907e..935e42942 100755
--- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WMultiFileWidgetAjaxExample.java
+++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WMultiFileWidgetAjaxExample.java
@@ -102,7 +102,7 @@ public WMultiFileWidgetAjaxExample() {
 		paramsLayout.addField("Readonly", readonly);
 
 		WPanel split = new WPanel();
-		split.setLayout(new ColumnLayout(new int[]{50, 50}, 12, 0));
+		split.setLayout(new ColumnLayout(new int[]{50, 50}, Size.LARGE, Size.ZERO));
 		split.setHtmlClass(HtmlClassProperties.RESPOND);
 		add(split);
 
diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/layout/ColumnLayoutExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/layout/ColumnLayoutExample.java
index c3bf36334..df06fb103 100755
--- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/layout/ColumnLayoutExample.java
+++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/layout/ColumnLayoutExample.java
@@ -75,7 +75,7 @@ private void addResponsiveExample() {
 				+ "The columns have width and alignment and there is also a hgap and a vgap."));
 				WPanel panel = new WPanel();
 		panel.setLayout(new ColumnLayout(new int[]{33, 33, 33},
-				new Alignment[]{Alignment.LEFT, Alignment.CENTER, Alignment.RIGHT}, 12, 18));
+				new Alignment[]{Alignment.LEFT, Alignment.CENTER, Alignment.RIGHT}, Size.LARGE, Size.XL));
 		panel.setHtmlClass(HtmlClassProperties.RESPOND);
 		add(panel);
 		panel.add(new BoxComponent("Left"));
diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/picker/TreePicker.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/picker/TreePicker.java
index 39119ebd2..3b6726759 100755
--- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/picker/TreePicker.java
+++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/picker/TreePicker.java
@@ -70,11 +70,11 @@ public class TreePicker extends WContainer {
 	/**
 	 * column hgap.
 	 */
-	private static final int COL_HGAP = 12;
+	private static final Size COL_HGAP = Size.LARGE;
 	/**
 	 * column vgap.
 	 */
-	private static final int COL_VGAP = 0;
+	private static final Size COL_VGAP = Size.ZERO;
 
 	/**
 	 * Creates a TreePicker.
diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/TableLoadPerformance.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/TableLoadPerformance.java
index 9542fb94d..6a28e3021 100755
--- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/TableLoadPerformance.java
+++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/TableLoadPerformance.java
@@ -296,7 +296,7 @@ public void executeOnValid(final ActionEvent event) {
 
 		// Table layouts
 		root.add(tablePanel);
-		tableLayout.setLayout(new ColumnLayout(new int[]{50, 50}, 6, 6));
+		tableLayout.setLayout(new ColumnLayout(new int[]{50, 50}, Size.MEDIUM, Size.MEDIUM));
 		tableLayout.setMargin(new Margin(Size.LARGE, null, Size.LARGE, null));
 		tableLayout.setVisible(false);
 		tablePanel.add(tableLayout);
diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WLabelExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WLabelExample.java
index 1da08d598..0e0ebeaa1 100755
--- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WLabelExample.java
+++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WLabelExample.java
@@ -261,7 +261,7 @@ private void addAntiPatternExamples() {
 		WTextField myField = new WTextField();
 		WLabel myFieldLabel = new WLabel("I am not the label for my nested text field", myField);
 		nestingErrorPanel = new WPanel();
-		nestingErrorPanel.setLayout(new ColumnLayout(new int[]{50, 50}, 12, 6));
+		nestingErrorPanel.setLayout(new ColumnLayout(new int[]{50, 50}, Size.LARGE, Size.MEDIUM));
 		errorLayoutPanel.add(nestingErrorPanel);
 		nestingErrorPanel.add(myFieldLabel);
 		nestingErrorPanel.add(myField);