diff --git a/b6/commander4j.install4j b/b6/commander4j.install4j
index 6be2a921ea..0369266636 100644
--- a/b6/commander4j.install4j
+++ b/b6/commander4j.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.8" transformSequenceNumber="10">
   <directoryPresets config="./lib/db/auth" />
-  <application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="10.34" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
+  <application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="10.35" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
     <languages skipLanguageSelection="true">
       <additionalLanguages>
         <language id="nl" />
diff --git a/b6/commander4j.jar b/b6/commander4j.jar
index c1fa4ad891..7b27a2f14d 100644
Binary files a/b6/commander4j.jar and b/b6/commander4j.jar differ
diff --git a/b6/reports/users.jrxml b/b6/reports/users.jrxml
index b70ef67981..72fd94ef9a 100644
--- a/b6/reports/users.jrxml
+++ b/b6/reports/users.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="users" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="c2ffa8a4-03f8-40c4-9e57-cd4addc8abe6">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
@@ -15,7 +15,7 @@
 		<defaultValueExpression><![CDATA["Company Name"]]></defaultValueExpression>
 	</parameter>
 	<queryString language="SQL">
-		<![CDATA[select * from SYS_USERS order by user_id]]>
+		<![CDATA[select * from SYS_USERS WHERE ACCOUNT_ENABLED = 'Y' order by user_id]]>
 	</queryString>
 	<field name="USER_ID" class="java.lang.String">
 		<fieldDescription><![CDATA[]]></fieldDescription>
diff --git a/b6/reports/users2.jrxml b/b6/reports/users2.jrxml
index 1773e7709e..701b8a1fda 100644
--- a/b6/reports/users2.jrxml
+++ b/b6/reports/users2.jrxml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<!-- Created with Jaspersoft Studio version 6.21.2.final using JasperReports Library version 6.21.2-8434a0bd7c3bbc37cbf916f2968d35e4b165821a  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="user2" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="c2ffa8a4-03f8-40c4-9e57-cd4addc8abe6">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="2.0"/>
 	<property name="ireport.x" value="411"/>
 	<property name="ireport.y" value="0"/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="MySQL"/>
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
@@ -17,6 +16,9 @@
 	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="mySQL"/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="237"/>
+	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w2" value="757"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
@@ -24,7 +26,7 @@
 		<defaultValueExpression><![CDATA["Company Name"]]></defaultValueExpression>
 	</parameter>
 	<queryString language="SQL">
-		<![CDATA[select * from SYS_USERS WHERE USER_ID NOT IN ('ADMIN','INTERFACE') order by last_logon]]>
+		<![CDATA[select * from SYS_USERS WHERE USER_ID NOT IN ('ADMIN','INTERFACE') AND ACCOUNT_ENABLED = 'Y' order by last_logon DESC]]>
 	</queryString>
 	<field name="USER_ID" class="java.lang.String">
 		<fieldDescription><![CDATA[]]></fieldDescription>
diff --git a/b6/src/com/commander4j/app/JVersion.java b/b6/src/com/commander4j/app/JVersion.java
index dcd4873bf3..6c27189ab6 100644
--- a/b6/src/com/commander4j/app/JVersion.java
+++ b/b6/src/com/commander4j/app/JVersion.java
@@ -31,7 +31,7 @@ public class JVersion
 {
 
 	public static String getProgramVersion() {
-		return "10.34";
+		return "10.35";
 	}
 
 	public static Double getProgramVersionValue() {
diff --git a/b6/src/com/commander4j/clone/JFrameCloneDB.java b/b6/src/com/commander4j/clone/JFrameCloneDB.java
index 8466ec1a87..31736defd8 100755
--- a/b6/src/com/commander4j/clone/JFrameCloneDB.java
+++ b/b6/src/com/commander4j/clone/JFrameCloneDB.java
@@ -44,6 +44,7 @@
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JDesktopPane;
 import javax.swing.JFrame;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
@@ -105,8 +106,8 @@ public class JFrameCloneDB extends JFrame
 	private String sessionTo = JUnique.getUniqueID();
 	private String hostIDFrom = "";
 	private String hostIDTo = "";
-	String lastError="";
-	String currentError="";
+	String lastError = "";
+	String currentError = "";
 
 	public static void main(String[] args)
 	{
@@ -118,7 +119,8 @@ public void run()
 				{
 					JFrameCloneDB frame = new JFrameCloneDB();
 					frame.setVisible(true);
-				} catch (Exception e)
+				}
+				catch (Exception e)
 				{
 					e.printStackTrace();
 				}
@@ -222,7 +224,8 @@ private void getHostDataFrom()
 			hstFrom = (JHost) jListHostFrom.getModel().getElementAt(j);
 			hostIDFrom = hstFrom.getSiteNumber();
 
-		} else
+		}
+		else
 		{
 
 		}
@@ -236,7 +239,8 @@ private void setStatusBarText(String tzt)
 		try
 		{
 			Thread.sleep(10);
-		} catch (InterruptedException ie)
+		}
+		catch (InterruptedException ie)
 		{
 		}
 	}
@@ -250,7 +254,8 @@ private void getHostDataTo()
 			hstTo = (JHost) jListHostTo.getModel().getElementAt(j);
 			hostIDTo = hstTo.getSiteNumber();
 
-		} else
+		}
+		else
 		{
 
 		}
@@ -262,7 +267,8 @@ private void enableClone()
 		if (hostIDFrom.equals(hostIDTo) == false)
 		{
 			jButtonClone.setEnabled(true);
-		} else
+		}
+		else
 		{
 			jButtonClone.setEnabled(false);
 		}
@@ -323,216 +329,234 @@ public void actionPerformed(ActionEvent evt)
 					String schemaTo = "";
 					JDBControl ctrl;
 
-					// Source & Destination must be different Hosts//
-					setStatusBarText("Validating selected hosts");
-					if (hostIDFrom.equals(hostIDTo) == false)
+					JUtility.errorBeep();
+					int dialogResult = JOptionPane.showConfirmDialog(JFrameCloneDB.this, "Replace the contents of destination database\n\n"+hstTo.getSiteDescription()+"\n\nwith source database\n\n"+hstFrom.getSiteDescription()+" ?\n\nData in "+hstTo.getSiteDescription()+" will be erased !", "Warning", JOptionPane.YES_NO_OPTION, 0, Common.icon_confirm_16x16);
+
+					if (dialogResult == JOptionPane.YES_OPTION)
 					{
 
-						// Check we can connect to Source //
-						setStatusBarText("Connecting to source...");
-						if (hstFrom.connect(sessionFrom, hostIDFrom))
+						// Source & Destination must be different Hosts//
+						setStatusBarText("Validating selected hosts");
+						if (hostIDFrom.equals(hostIDTo) == false)
 						{
 
-							// Check we can connect to Destination //
-							setStatusBarText("Connecting to destination...");
-							if (hstTo.connect(sessionTo, hostIDTo))
+							// Check we can connect to Source //
+							setStatusBarText("Connecting to source...");
+							if (hstFrom.connect(sessionFrom, hostIDFrom))
 							{
 
-								// Check Application Schema Versions are the
-								// same in Source and Destination //
-								setStatusBarText("Checking schema versions...");
-								ctrl = new JDBControl(hostIDFrom, sessionFrom);
-								schemaFrom = ctrl.getKeyValue("SCHEMA VERSION");
-								ctrl = new JDBControl(hostIDTo, sessionTo);
-								schemaTo = ctrl.getKeyValue("SCHEMA VERSION");
-
-								if (schemaFrom.equals(schemaTo))
+								// Check we can connect to Destination //
+								setStatusBarText("Connecting to destination...");
+								if (hstTo.connect(sessionTo, hostIDTo))
 								{
-									// OK //
-									setStatusBarText("Getting source table names...");
-									int tableCountFrom = 0;
-									JDBStructure strucFrom = new JDBStructure(hostIDFrom, sessionFrom);
-									LinkedList<String> tablesFrom = strucFrom.getTableNames();
-									tableCountFrom = tablesFrom.size();
-									progressBar.setMinimum(1);
-									progressBar.setMaximum(tableCountFrom);
-
-									setStatusBarText("Getting destination table names...");
-									int tableCountTo = 0;
-									JDBStructure strucTo = new JDBStructure(hostIDTo, sessionTo);
-									LinkedList<String> tablesTo = strucTo.getTableNames();
-									tableCountTo = tablesTo.size();
-
-									if (tableCountFrom == tableCountTo)
+
+									// Check Application Schema Versions are the
+									// same in Source and Destination //
+									setStatusBarText("Checking schema versions...");
+									ctrl = new JDBControl(hostIDFrom, sessionFrom);
+									schemaFrom = ctrl.getKeyValue("SCHEMA VERSION");
+									ctrl = new JDBControl(hostIDTo, sessionTo);
+									schemaTo = ctrl.getKeyValue("SCHEMA VERSION");
+
+									if (schemaFrom.equals(schemaTo))
 									{
-										String table = "";
-										for (int tf = 0; tf < tableCountFrom; tf++)
+										// OK //
+										setStatusBarText("Getting source table names...");
+										int tableCountFrom = 0;
+										JDBStructure strucFrom = new JDBStructure(hostIDFrom, sessionFrom);
+										LinkedList<String> tablesFrom = strucFrom.getTableNames();
+										tableCountFrom = tablesFrom.size();
+										progressBar.setMinimum(1);
+										progressBar.setMaximum(tableCountFrom);
+
+										setStatusBarText("Getting destination table names...");
+										int tableCountTo = 0;
+										JDBStructure strucTo = new JDBStructure(hostIDTo, sessionTo);
+										LinkedList<String> tablesTo = strucTo.getTableNames();
+										tableCountTo = tablesTo.size();
+
+										if (tableCountFrom == tableCountTo)
 										{
-											table = tablesFrom.get(tf);
-											//table = "APP_QM_ANALYSIS";
-											progressBar.setValue(tf + 1);
-											progressBar.paintImmediately(progressBar.getVisibleRect());
-											if (tablesTo.contains(table))
+											String table = "";
+											for (int tf = 0; tf < tableCountFrom; tf++)
 											{
-
-												// GET FIELDS FOR CURRENT TABLE
-												setStatusBarText("Getting field names for " + table);
-												LinkedList<JDBField> fieldNames = strucFrom.getFieldNames(table);
-												JWait.milliSec(100);
-
-												// CREATE INSERT STATEMENT FOR
-												// TARGET DATABASE //
-												setStatusBarText("Generating insert SQL for " + table);
-												String insertTable = "insert into " + table;
-												String insertFields = "";
-												String insertPlaceMarkers = "";
-												String comma = "";
-
-												for (int temp = 0; temp < fieldNames.size(); temp++)
+												table = tablesFrom.get(tf);
+												// table = "APP_QM_ANALYSIS";
+												progressBar.setValue(tf + 1);
+												progressBar.paintImmediately(progressBar.getVisibleRect());
+												if (tablesTo.contains(table))
 												{
-													if (temp == 0)
-													{
-														comma = "";
-													} else
+
+													// GET FIELDS FOR CURRENT
+													// TABLE
+													setStatusBarText("Getting field names for " + table);
+													LinkedList<JDBField> fieldNames = strucFrom.getFieldNames(table);
+													JWait.milliSec(100);
+
+													// CREATE INSERT STATEMENT
+													// FOR
+													// TARGET DATABASE //
+													setStatusBarText("Generating insert SQL for " + table);
+													String insertTable = "insert into " + table;
+													String insertFields = "";
+													String insertPlaceMarkers = "";
+													String comma = "";
+
+													for (int temp = 0; temp < fieldNames.size(); temp++)
 													{
-														comma = ",";
+														if (temp == 0)
+														{
+															comma = "";
+														}
+														else
+														{
+															comma = ",";
+														}
+														insertFields = insertFields + comma + fieldNames.get(temp).getfieldName();
+														insertPlaceMarkers = insertPlaceMarkers + comma + "?";
 													}
-													insertFields = insertFields + comma + fieldNames.get(temp).getfieldName();
-													insertPlaceMarkers = insertPlaceMarkers + comma + "?";
-												}
 
-												String insertStatement = insertTable + " (" + insertFields + ") values (" + insertPlaceMarkers + ")";
+													String insertStatement = insertTable + " (" + insertFields + ") values (" + insertPlaceMarkers + ")";
 
-												// SELECT ALL SOURCE RECORDS //
-												setStatusBarText("Copying table " + table);
-												Long recordsCopied = (long) 0;
-												try
-												{
-													hstFrom.getConnection(sessionFrom).setAutoCommit(false);
-													hstTo.getConnection(sessionTo).setAutoCommit(false);
-													PreparedStatement truncateData = hstTo.getConnection(sessionTo).prepareStatement("truncate table " + table);
-													PreparedStatement destinationData = hstTo.getConnection(sessionTo).prepareStatement(insertStatement);
-													PreparedStatement sourceData = hstFrom.getConnection(sessionFrom).prepareStatement("select * from " + table);
-													sourceData.setFetchDirection(ResultSet.FETCH_FORWARD);
-													destinationData.setFetchDirection(ResultSet.FETCH_FORWARD);
-													sourceData.setFetchSize(1);
-													destinationData.setFetchSize(1);
-													truncateData.setFetchSize(1);
-													ResultSet sourceResultset = sourceData.executeQuery();
-
-													truncateData.execute();
-													truncateData.close();
-													truncateData = null;
-
-													while (sourceResultset.next())
+													// SELECT ALL SOURCE RECORDS
+													// //
+													setStatusBarText("Copying table " + table);
+													Long recordsCopied = (long) 0;
+													try
 													{
-														for (int fldfrom = 0; fldfrom < fieldNames.size(); fldfrom++)
+														hstFrom.getConnection(sessionFrom).setAutoCommit(false);
+														hstTo.getConnection(sessionTo).setAutoCommit(false);
+														PreparedStatement truncateData = hstTo.getConnection(sessionTo).prepareStatement("truncate table " + table);
+														PreparedStatement destinationData = hstTo.getConnection(sessionTo).prepareStatement(insertStatement);
+														PreparedStatement sourceData = hstFrom.getConnection(sessionFrom).prepareStatement("select * from " + table);
+														sourceData.setFetchDirection(ResultSet.FETCH_FORWARD);
+														destinationData.setFetchDirection(ResultSet.FETCH_FORWARD);
+														sourceData.setFetchSize(1);
+														destinationData.setFetchSize(1);
+														truncateData.setFetchSize(1);
+														ResultSet sourceResultset = sourceData.executeQuery();
+
+														truncateData.execute();
+														truncateData.close();
+														truncateData = null;
+
+														while (sourceResultset.next())
 														{
-															JDBField field = fieldNames.get(fldfrom);
-															if (field.getfieldType().toLowerCase().equals("varchar"))
-															{
-																String value;
-																value = JUtility.replaceNullStringwithBlank(sourceResultset.getString(field.getfieldName()));
-																destinationData.setString(fldfrom + 1, value);
-
-															}
-															if (field.getfieldType().toLowerCase().equals("nvarchar"))
+															for (int fldfrom = 0; fldfrom < fieldNames.size(); fldfrom++)
 															{
-																String value;
-																value = JUtility.replaceNullStringwithBlank(sourceResultset.getString(field.getfieldName()));
-																destinationData.setString(fldfrom + 1, value);
-
+																JDBField field = fieldNames.get(fldfrom);
+																if (field.getfieldType().toLowerCase().equals("varchar"))
+																{
+																	String value;
+																	value = JUtility.replaceNullStringwithBlank(sourceResultset.getString(field.getfieldName()));
+																	destinationData.setString(fldfrom + 1, value);
+
+																}
+																if (field.getfieldType().toLowerCase().equals("nvarchar"))
+																{
+																	String value;
+																	value = JUtility.replaceNullStringwithBlank(sourceResultset.getString(field.getfieldName()));
+																	destinationData.setString(fldfrom + 1, value);
+
+																}
+																if ((field.getfieldType().toLowerCase().equals("decimal")) | (field.getfieldType().toLowerCase().equals("numeric")) | (field.getfieldType().toLowerCase().equals("float")))
+																{
+																	BigDecimal value;
+																	value = sourceResultset.getBigDecimal(field.getfieldName());
+																	destinationData.setBigDecimal(fldfrom + 1, value);
+
+																}
+																if (field.getfieldType().toLowerCase().equals("datetime"))
+																{
+																	Timestamp value;
+																	value = sourceResultset.getTimestamp(field.getfieldName());
+																	destinationData.setTimestamp(fldfrom + 1, value);
+
+																}
+																if ((field.getfieldType().toLowerCase().equals("int")) | (field.getfieldType().toLowerCase().equals("bigint")))
+																{
+																	Integer value;
+																	value = sourceResultset.getInt(field.getfieldName());
+																	destinationData.setInt(fldfrom + 1, value);
+
+																}
+																field = null;
 															}
-															if ((field.getfieldType().toLowerCase().equals("decimal")) | (field.getfieldType().toLowerCase().equals("numeric")) | (field.getfieldType().toLowerCase().equals("float")))
+															try
 															{
-																BigDecimal value;
-																value = sourceResultset.getBigDecimal(field.getfieldName());
-																destinationData.setBigDecimal(fldfrom + 1, value);
+																destinationData.execute();
+																hstTo.getConnection(sessionTo).commit();
+																destinationData.clearParameters();
+																recordsCopied++;
 
 															}
-															if (field.getfieldType().toLowerCase().equals("datetime"))
+															catch (Exception ex)
 															{
-																Timestamp value;
-																value = sourceResultset.getTimestamp(field.getfieldName());
-																destinationData.setTimestamp(fldfrom + 1, value);
 
-															}
-															if ((field.getfieldType().toLowerCase().equals("int")) | (field.getfieldType().toLowerCase().equals("bigint")))
-															{
-																Integer value;
-																value = sourceResultset.getInt(field.getfieldName());
-																destinationData.setInt(fldfrom + 1, value);
-	
-															}
-															field = null;
-														}
-														try
-														{
-															destinationData.execute();
-															hstTo.getConnection(sessionTo).commit();
-															destinationData.clearParameters();
-															recordsCopied++;
-
-														} catch (Exception ex)
-														{
-															
-															currentError = table+ " "+ex.getMessage();
-															if (currentError.equals(lastError)==false)
-															{
-																setStatusBarText(currentError);
-																logger.debug(currentError);
-																lastError = currentError;
+																currentError = table + " " + ex.getMessage();
+																if (currentError.equals(lastError) == false)
+																{
+																	setStatusBarText(currentError);
+																	logger.debug(currentError);
+																	lastError = currentError;
+																}
 															}
 														}
-													}
 
-													sourceResultset.close();
-													sourceResultset = null;
-													destinationData.close();
-													destinationData = null;
-													sourceData.close();
-													sourceData = null;
+														sourceResultset.close();
+														sourceResultset = null;
+														destinationData.close();
+														destinationData = null;
+														sourceData.close();
+														sourceData = null;
 
-													setStatusBarText("Copying complete");
+														setStatusBarText("Copying complete");
 
+													}
+													catch (SQLException e)
+													{
+														logger.error("Error reading " + table + " [" + e.getMessage() + "]");
+														labelCommand.setText("Error reading " + table + " [" + e.getMessage() + "]");
+													}
 
-												} catch (SQLException e)
+												}
+												else
 												{
-													logger.error("Error reading " + table + " ["+e.getMessage()+"]");
-													labelCommand.setText("Error reading " + table+ " ["+e.getMessage()+"]");
+													labelCommand.setText("Table " + table + " does not exist in destination");
 												}
 
-											} else
-											{
-												labelCommand.setText("Table " + table + " does not exist in destination");
 											}
+										}
+										else
+										{
 
+											labelCommand.setText("Number of tables mismatch " + String.valueOf(tableCountFrom) + "/" + String.valueOf(tableCountTo));
 										}
-									} else
-									{
 
-										labelCommand.setText("Number of tables mismatch " + String.valueOf(tableCountFrom) + "/" + String.valueOf(tableCountTo));
+									}
+									else
+									{
+										labelCommand.setText("Schema version mismatch " + String.valueOf(schemaFrom) + "/" + String.valueOf(schemaTo));
 									}
 
-								} else
+								}
+								else
 								{
-									labelCommand.setText("Schema version mismatch " + String.valueOf(schemaFrom) + "/" + String.valueOf(schemaTo));
+									labelCommand.setText("Cannot connect to destination.");
 								}
 
-							} else
+							}
+							else
 							{
-								labelCommand.setText("Cannot connect to destination.");
+								labelCommand.setText("Cannot connect to source.");
 							}
-
-						} else
+							hstFrom.disconnectAll();
+							hstTo.disconnectAll();
+						}
+						else
 						{
-							labelCommand.setText("Cannot connect to source.");
+							labelCommand.setText("Cannot clone to self.");
 						}
-						hstFrom.disconnectAll();
-						hstTo.disconnectAll();
-					} else
-					{
-						labelCommand.setText("Cannot clone to self.");
 					}
 				}
 			});
@@ -577,7 +601,8 @@ public void actionPerformed(ActionEvent evt)
 			label4j_std_1.setBounds(295, 15, 248, 21);
 			desktopPane.add(label4j_std_1);
 
-		} catch (Exception e)
+		}
+		catch (Exception e)
 		{
 			e.printStackTrace();
 		}
diff --git a/b6/xml/barcode/barcode4j-code128.dtd b/b6/xml/barcode/barcode4j-code128.dtd
new file mode 100644
index 0000000000..01070e9c23
--- /dev/null
+++ b/b6/xml/barcode/barcode4j-code128.dtd
@@ -0,0 +1,38 @@
+<?xml encoding="UTF-8"?>
+
+<!ELEMENT barcode (code128)>
+<!ATTLIST barcode
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT code128 (height,module-width,quiet-zone,human-readable)>
+<!ATTLIST code128
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT height (#PCDATA)>
+<!ATTLIST height
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT module-width (#PCDATA)>
+<!ATTLIST module-width
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT quiet-zone (#PCDATA)>
+<!ATTLIST quiet-zone
+  xmlns CDATA #FIXED ''
+  enabled CDATA #REQUIRED>
+
+<!ELEMENT human-readable (placement,font-name,font-size)>
+<!ATTLIST human-readable
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT placement (#PCDATA)>
+<!ATTLIST placement
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT font-name (#PCDATA)>
+<!ATTLIST font-name
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT font-size (#PCDATA)>
+<!ATTLIST font-size
+  xmlns CDATA #FIXED ''>
diff --git a/b6/xml/barcode/barcode4j-ean128.dtd b/b6/xml/barcode/barcode4j-ean128.dtd
new file mode 100644
index 0000000000..04a52782ec
--- /dev/null
+++ b/b6/xml/barcode/barcode4j-ean128.dtd
@@ -0,0 +1,14 @@
+<!ELEMENT barcode ( ean-128 ) >
+<!ELEMENT check-digit-marker ( #PCDATA ) >
+<!ELEMENT ean-128 ( height, module-width, check-digit-marker, group-separator, template, quiet-zone, human-readable ) >
+<!ELEMENT font-name ( #PCDATA ) >
+<!ELEMENT font-size ( #PCDATA ) >
+<!ELEMENT group-separator ( #PCDATA ) >
+<!ELEMENT height ( #PCDATA ) >
+<!ELEMENT human-readable ( placement, font-name, font-size, omit-brackets ) >
+<!ELEMENT module-width ( #PCDATA ) >
+<!ELEMENT omit-brackets ( #PCDATA ) >
+<!ELEMENT placement ( #PCDATA ) >
+<!ELEMENT quiet-zone ( #PCDATA ) >
+<!ATTLIST quiet-zone enabled NMTOKEN #REQUIRED >
+<!ELEMENT template ( #PCDATA ) >
diff --git a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar
index c1fa4ad891..7b27a2f14d 100644
Binary files a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar differ
diff --git a/b6web_t10_android_eb3/WebContent/xml/barcode/barcode4j-ean128.dtd b/b6web_t10_android_eb3/WebContent/xml/barcode/barcode4j-ean128.dtd
old mode 100755
new mode 100644
diff --git a/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war b/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war
index 9a604949ff..66e69711cb 100644
Binary files a/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war and b/b6web_t10_android_eb3/dist/b6web_t10_android_eb3.war differ
diff --git a/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar
index 4830c7a411..7b27a2f14d 100644
Binary files a/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_react/WebContent/WEB-INF/lib/commander4j.jar differ
diff --git a/b6web_t10_react/WebContent/xml/barcode/barcode4j-ean128.dtd b/b6web_t10_react/WebContent/xml/barcode/barcode4j-ean128.dtd
old mode 100755
new mode 100644
diff --git a/b6web_t10_react/dist/b6web_t10_react.war b/b6web_t10_react/dist/b6web_t10_react.war
index 68c9ee5b34..736911277c 100644
Binary files a/b6web_t10_react/dist/b6web_t10_react.war and b/b6web_t10_react/dist/b6web_t10_react.war differ
diff --git a/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar
index c1fa4ad891..7b27a2f14d 100644
Binary files a/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar and b/b6web_t10_wm_eb18/WebContent/WEB-INF/lib/commander4j.jar differ
diff --git a/b6web_t10_wm_eb18/WebContent/xml/barcode/barcode4j-ean128.dtd b/b6web_t10_wm_eb18/WebContent/xml/barcode/barcode4j-ean128.dtd
old mode 100755
new mode 100644
diff --git a/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war b/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war
index 7b322bf74d..fb4a5529eb 100644
Binary files a/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war and b/b6web_t10_wm_eb18/dist/b6web_t10_wm_eb18.war differ
diff --git a/c4jWS/src/main/webapp/panel/admin.html b/c4jWS/src/main/webapp/panel/admin.html
index d035e6211f..e719e88895 100755
--- a/c4jWS/src/main/webapp/panel/admin.html
+++ b/c4jWS/src/main/webapp/panel/admin.html
@@ -1,8 +1,9 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/menu.html b/c4jWS/src/main/webapp/panel/menu.html
index b284d8e076..83c18191f7 100755
--- a/c4jWS/src/main/webapp/panel/menu.html
+++ b/c4jWS/src/main/webapp/panel/menu.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/panelEdit.html b/c4jWS/src/main/webapp/panel/panelEdit.html
index 18fb2c6c3e..e33cac42ec 100755
--- a/c4jWS/src/main/webapp/panel/panelEdit.html
+++ b/c4jWS/src/main/webapp/panel/panelEdit.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/panels.html b/c4jWS/src/main/webapp/panel/panels.html
index 849a287637..ccf988ba16 100755
--- a/c4jWS/src/main/webapp/panel/panels.html
+++ b/c4jWS/src/main/webapp/panel/panels.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/resultPanelSelect.html b/c4jWS/src/main/webapp/panel/resultPanelSelect.html
index d83f7cb62e..9c477ede9c 100755
--- a/c4jWS/src/main/webapp/panel/resultPanelSelect.html
+++ b/c4jWS/src/main/webapp/panel/resultPanelSelect.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/resultSampleSelect.html b/c4jWS/src/main/webapp/panel/resultSampleSelect.html
index 1bd6513a51..4032fbfe48 100755
--- a/c4jWS/src/main/webapp/panel/resultSampleSelect.html
+++ b/c4jWS/src/main/webapp/panel/resultSampleSelect.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/resultTraySelect.html b/c4jWS/src/main/webapp/panel/resultTraySelect.html
index f6e6287c4a..03646d7848 100755
--- a/c4jWS/src/main/webapp/panel/resultTraySelect.html
+++ b/c4jWS/src/main/webapp/panel/resultTraySelect.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/resultUserSelect.html b/c4jWS/src/main/webapp/panel/resultUserSelect.html
index 3f9d897e57..68581cbd4c 100755
--- a/c4jWS/src/main/webapp/panel/resultUserSelect.html
+++ b/c4jWS/src/main/webapp/panel/resultUserSelect.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/samples.html b/c4jWS/src/main/webapp/panel/samples.html
index 6430041a0d..def4158a49 100755
--- a/c4jWS/src/main/webapp/panel/samples.html
+++ b/c4jWS/src/main/webapp/panel/samples.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
@@ -56,7 +56,6 @@ <h2 style="text-align:center">Samples</h2>
 		<tbody id="sampleTable-output">
 		</tbody>
 	</table>
-	
 	<table id="sampleScan" width="100px">
 		<tr>
 			<td><input type="text" id="scanData" name="scanData" maxlength="10" autofocus></td>
diff --git a/c4jWS/src/main/webapp/panel/scriptPanels.js b/c4jWS/src/main/webapp/panel/scriptPanels.js
index 5421188dcd..b3a694cb71 100755
--- a/c4jWS/src/main/webapp/panel/scriptPanels.js
+++ b/c4jWS/src/main/webapp/panel/scriptPanels.js
@@ -11,7 +11,7 @@
 				window.location='panelEdit.html';
 			}
 		}
-	};
+	}
 	
 	function getStatusColour(status)
 	{
@@ -44,7 +44,7 @@
 		
 		window.location='panels.html';
 
-	};
+	}
 	
 	function loadTrays() {
 		
@@ -57,7 +57,7 @@
 				window.location='trays.html';
 			}
 		}
-	};
+	}
 			
 	function updatePanel(plant,description,status)
 	{
@@ -81,14 +81,14 @@
 			method: "PUT",
 			body: JSON.stringify(payload)
 		})
-		.then(function(res){ console.log(res) })
-		.catch(function(res){ console.log(res) });
+		.then(function(res){ console.log(res); })
+		.catch(function(res){ console.log(res); });
 		
-		panelListSave("selectedPanelPlant",plant)
+		panelListSave("selectedPanelPlant",plant);
 		
 		refreshPanel();
 	
-	};
+	}
 	
 	function panelListSave(key,val) 
 	{
@@ -99,7 +99,7 @@
 		console.log('panelListSave key='+key);
 		console.log('panelListSave value='+val);
 		sessionStorage.setItem(key, val);
-	};
+	}
 	
 	function panelListGet(key,val) 
 	{
@@ -118,7 +118,7 @@
 		console.log('panelListGet checkedOrNot [' + checkedOrNot + ']');
 	
 		return checkedOrNot;
-	};	
+	}	
 	
 	async function newPanel() {
 	
@@ -152,13 +152,13 @@
 		
 		window.location='panelEdit.html';
 		
-	};
+	}
 	
 	function refreshPanel()
 	{
 		console.log('refreshPanel'); 
 		location.reload();
-	};
+	}
 	
 	function formatDate(isoDate)
 	{
@@ -215,4 +215,4 @@
 			}
 		
 		}
-	};
+	}
diff --git a/c4jWS/src/main/webapp/panel/scriptResults.js b/c4jWS/src/main/webapp/panel/scriptResults.js
index 5f87e11f0b..723070db85 100755
--- a/c4jWS/src/main/webapp/panel/scriptResults.js
+++ b/c4jWS/src/main/webapp/panel/scriptResults.js
@@ -31,6 +31,6 @@
 	
 		console.log(response);
 	
-	};
+	}
 	
 
diff --git a/c4jWS/src/main/webapp/panel/scriptSamples.js b/c4jWS/src/main/webapp/panel/scriptSamples.js
index ba8541dd77..9a0e9e51ff 100755
--- a/c4jWS/src/main/webapp/panel/scriptSamples.js
+++ b/c4jWS/src/main/webapp/panel/scriptSamples.js
@@ -14,32 +14,32 @@
 				window.location='samples.html';
 			}
 		}
-	};
+	}
 	
 	function sampleMenu() {
 		
 		window.location='samples.html';
 
-	};
+	}
 	
 	function trayEdit() {
 		
 		window.location='trayEdit.html';
 	
-	};
+	}
 	
 	function trayMenu() {
 		
 		window.location='trays.html';
 
-	};
+	}
 				
 	function sampleListSave(key,val) 
 	{
 		console.log('sampleListSave key='+key);
 		console.log('sampleListSave value='+val);
 		sessionStorage.setItem(key, val);
-	};
+	}
 	
 	function sampleListGet(key,val) 
 	{
@@ -58,7 +58,7 @@
 		console.log('sampleListGet checkedOrNot [' + checkedOrNot + ']');
 	
 		return checkedOrNot;
-	};	
+	}	
 	
 	async function newSample(sampleID) {
 	
@@ -94,13 +94,13 @@
 		refreshSample();
 		
 		window.location='samples.html';
-	};
+	}
 	
 	function refreshSample()
 	{
 		console.log('refreshSample'); 
 		location.reload();
-	};
+	}
 	
 	async function deleteSample() {
 	
@@ -130,4 +130,4 @@
 		refreshSample();
 		
 		window.location='samples.html';
-	};
+	}
diff --git a/c4jWS/src/main/webapp/panel/scriptTrays.js b/c4jWS/src/main/webapp/panel/scriptTrays.js
index 9c3b071558..94d2e884eb 100755
--- a/c4jWS/src/main/webapp/panel/scriptTrays.js
+++ b/c4jWS/src/main/webapp/panel/scriptTrays.js
@@ -14,25 +14,25 @@
 				window.location='trayEdit.html';
 			}
 		}
-	};
+	}
 	
 	function trayMenu() {
 		
 		window.location='trays.html';
 
-	};
+	}
 	
 	function panelEdit() {
 		
 		window.location='panelEdit.html';
 	
-	};
+	}
 	
 	function panelMenu() {
 		
 		window.location='panels.html';
 
-	};
+	}
 	
 	function formatDate(isoDate)
 	{
@@ -69,12 +69,12 @@
 			method: "PUT",
 			body: JSON.stringify(payload)
 		})
-		.then(function(res){ console.log(res) })
-		.catch(function(res){ console.log(res) });
+		.then(function(res){ console.log(res); })
+		.catch(function(res){ console.log(res); });
 		
 		refreshTray();
 	
-	};
+	}
 	
 	function trayListSave(key,val) 
 	{
@@ -85,7 +85,7 @@
 		console.log('trayListSave key='+key);
 		console.log('trayListSave value='+val);
 		sessionStorage.setItem(key, val);
-	};
+	}
 	
 	function trayListGet(key,val) 
 	{
@@ -104,7 +104,7 @@
 		console.log('trayListGet checkedOrNot [' + checkedOrNot + ']');
 	
 		return checkedOrNot;
-	};	
+	}	
 	
 	async function newTray() {
 	
@@ -141,7 +141,7 @@
 		refreshTray();
 		
 		window.location='trayEdit.html';
-	};
+	}
 	
 	function sampleMenu()
 	{
@@ -154,13 +154,13 @@
 				window.location='samples.html';
 			}
 		}
-	};
+	}
 	
 	function refreshTray()
 	{
 		console.log('refreshTray'); 
 		location.reload();
-	};
+	}
 	
 	async function deleteTray() {
 	
@@ -194,4 +194,4 @@
 		refreshTray();
 		
 		window.location='trays.html';
-	};
+	}
diff --git a/c4jWS/src/main/webapp/panel/scriptUsers.js b/c4jWS/src/main/webapp/panel/scriptUsers.js
index 2e0b9ee5c0..2b93188345 100755
--- a/c4jWS/src/main/webapp/panel/scriptUsers.js
+++ b/c4jWS/src/main/webapp/panel/scriptUsers.js
@@ -9,13 +9,13 @@
 			console.debug('editUserRecord  selected user ='+selectedUser);
 			window.location='userEdit.html';
 		}
-	};
+	}
 	
 	function userMenu() {
 		
 		window.location='users.html';
 
-	};
+	}
 	
 	
 	function formatDate(isoDate)
@@ -76,10 +76,10 @@
 			method: "PUT",
 			body: JSON.stringify(payload)
 		})
-		.then(function(res){ console.log(res) })
-		.catch(function(res){ console.log(res) });
+		.then(function(res){ console.log(res); })
+		.catch(function(res){ console.log(res); });
 	
-	};
+	}
 	
 	function userListSave(key,val) 
 	{
@@ -90,7 +90,7 @@
 		console.log('userListSave key='+key);
 		console.log('userListSave value='+val);
 		sessionStorage.setItem(key, val);
-	};
+	}
 	
 	function userListGet(key,val) 
 	{
@@ -109,7 +109,7 @@
 		console.log('userListGet checkedOrNot [' + checkedOrNot + ']');
 	
 		return checkedOrNot;
-	};	
+	}	
 	
 	async function saveUser(userID,firstname,surname,enabled) {
 	
@@ -147,14 +147,14 @@
 		refreshUser();
 		
 		window.location='userEdit.html';
-	};
+	}
 	
 	
 	function refreshUser()
 	{
 		console.log('refreshUser'); 
 		location.reload();
-	};
+	}
 	
 	async function newUser() {
 	
@@ -193,5 +193,5 @@
 		refreshUser();
 		
 		window.location='userEdit.html';
-	};
+	}
 	
diff --git a/c4jWS/src/main/webapp/panel/trayEdit.html b/c4jWS/src/main/webapp/panel/trayEdit.html
index 1edcb2e9e8..4ce1a430f8 100755
--- a/c4jWS/src/main/webapp/panel/trayEdit.html
+++ b/c4jWS/src/main/webapp/panel/trayEdit.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/trays.html b/c4jWS/src/main/webapp/panel/trays.html
index 1ef333b16e..17e50d2781 100755
--- a/c4jWS/src/main/webapp/panel/trays.html
+++ b/c4jWS/src/main/webapp/panel/trays.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/userEdit.html b/c4jWS/src/main/webapp/panel/userEdit.html
index 074945d76e..28e8facf92 100755
--- a/c4jWS/src/main/webapp/panel/userEdit.html
+++ b/c4jWS/src/main/webapp/panel/userEdit.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/panel/users.html b/c4jWS/src/main/webapp/panel/users.html
index 114a956acf..cd1dfdff24 100755
--- a/c4jWS/src/main/webapp/panel/users.html
+++ b/c4jWS/src/main/webapp/panel/users.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<!-- Setting the pages character encoding -->
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<meta http-equiv="cache-control" content="max-age=0">
 	<meta http-equiv="cache-control" content="no-cache">
 	<meta http-equiv="expires" content="-1">
diff --git a/c4jWS/src/main/webapp/xml/barcode/barcode4j-code128.dtd b/c4jWS/src/main/webapp/xml/barcode/barcode4j-code128.dtd
new file mode 100644
index 0000000000..01070e9c23
--- /dev/null
+++ b/c4jWS/src/main/webapp/xml/barcode/barcode4j-code128.dtd
@@ -0,0 +1,38 @@
+<?xml encoding="UTF-8"?>
+
+<!ELEMENT barcode (code128)>
+<!ATTLIST barcode
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT code128 (height,module-width,quiet-zone,human-readable)>
+<!ATTLIST code128
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT height (#PCDATA)>
+<!ATTLIST height
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT module-width (#PCDATA)>
+<!ATTLIST module-width
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT quiet-zone (#PCDATA)>
+<!ATTLIST quiet-zone
+  xmlns CDATA #FIXED ''
+  enabled CDATA #REQUIRED>
+
+<!ELEMENT human-readable (placement,font-name,font-size)>
+<!ATTLIST human-readable
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT placement (#PCDATA)>
+<!ATTLIST placement
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT font-name (#PCDATA)>
+<!ATTLIST font-name
+  xmlns CDATA #FIXED ''>
+
+<!ELEMENT font-size (#PCDATA)>
+<!ATTLIST font-size
+  xmlns CDATA #FIXED ''>
diff --git a/c4jWS/src/main/webapp/xml/barcode/barcode4j-ean128.dtd b/c4jWS/src/main/webapp/xml/barcode/barcode4j-ean128.dtd
new file mode 100644
index 0000000000..04a52782ec
--- /dev/null
+++ b/c4jWS/src/main/webapp/xml/barcode/barcode4j-ean128.dtd
@@ -0,0 +1,14 @@
+<!ELEMENT barcode ( ean-128 ) >
+<!ELEMENT check-digit-marker ( #PCDATA ) >
+<!ELEMENT ean-128 ( height, module-width, check-digit-marker, group-separator, template, quiet-zone, human-readable ) >
+<!ELEMENT font-name ( #PCDATA ) >
+<!ELEMENT font-size ( #PCDATA ) >
+<!ELEMENT group-separator ( #PCDATA ) >
+<!ELEMENT height ( #PCDATA ) >
+<!ELEMENT human-readable ( placement, font-name, font-size, omit-brackets ) >
+<!ELEMENT module-width ( #PCDATA ) >
+<!ELEMENT omit-brackets ( #PCDATA ) >
+<!ELEMENT placement ( #PCDATA ) >
+<!ELEMENT quiet-zone ( #PCDATA ) >
+<!ATTLIST quiet-zone enabled NMTOKEN #REQUIRED >
+<!ELEMENT template ( #PCDATA ) >
diff --git a/c4jWS/target/c4jWS.war b/c4jWS/target/c4jWS.war
index bbb447ab8f..26591f4298 100644
Binary files a/c4jWS/target/c4jWS.war and b/c4jWS/target/c4jWS.war differ